Merge branch 'main' into renovate/packageurl-dotnet-1.x

Author: JamieMagee

.editorconfig

@@ -1,40 +1,32 @@
 <Project>
 
-    <PropertyGroup Label="Build">
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <LangVersion>latest</LangVersion>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <TreatWarningsAsErrors Condition="'$(OFFICIAL_BUILD)' == 'True'">true</TreatWarningsAsErrors>
-    </PropertyGroup>
+  <PropertyGroup Label="Build">
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+  </PropertyGroup>
 
-    <PropertyGroup Label="Package">
-        <Authors>Microsoft</Authors>
-        <Company>Microsoft</Company>
-        <Copyright>Copyright © Microsoft Corporation. All rights reserved.</Copyright>
-        <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageProjectUrl>https://github.com/microsoft/component-detection</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/microsoft/component-detection.git</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <PackageReleaseNotes>https://github.com/microsoft/component-detection/releases</PackageReleaseNotes>
-    </PropertyGroup>
+  <PropertyGroup Label="Package">
+    <Authors>Microsoft</Authors>
+    <Company>Microsoft</Company>
+    <Copyright>Copyright © Microsoft Corporation. All rights reserved.</Copyright>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/microsoft/component-detection</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/microsoft/component-detection.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageReleaseNotes>https://github.com/microsoft/component-detection/releases</PackageReleaseNotes>
+  </PropertyGroup>
 
-    <ItemGroup Label="Package References">
-        <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" PrivateAssets="all"/>
-        <PackageReference Include="MinVer" PrivateAssets="all"/>
-        <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all"/>
-    </ItemGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="all"/>
+    <PackageReference Include="MinVer" PrivateAssets="all"/>
+    <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all"/>
+  </ItemGroup>
 
-    <PropertyGroup>
-        <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)analyzers.ruleset</CodeAnalysisRuleSet>
-        <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-        <NoWarn>NU1608,NU5119</NoWarn>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(OFFICIAL_BUILD)'=='True'">
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    </PropertyGroup>
-
-    <ItemGroup Label="Package References">
-        <PackageReference Include="MinVer" PrivateAssets="all"/>
-    </ItemGroup>
 </Project>

.tours/add-a-telemetry-record.tour

@@ -9,17 +9,17 @@
 
     <ItemGroup>
         <PackageVersion Include="CommandLineParser" Version="2.9.1"/>
-        <PackageVersion Include="coverlet.msbuild" Version="2.9.0"/>
-        <PackageVersion Include="Docker.DotNet" Version="3.125.5"/>
+        <PackageVersion Include="coverlet.msbuild" Version="3.1.2"/>
+        <PackageVersion Include="Docker.DotNet" Version="3.125.10"/>
         <PackageVersion Include="FluentAssertions" Version="6.7.0"/>
         <PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0"/>
-        <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.26" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.11.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.27" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.0"/>
         <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1"/>
-        <PackageVersion Include="DotNet.Glob" Version="2.1.4"/>
-        <PackageVersion Include="MinVer" Version="2.5.0"/>
-        <PackageVersion Include="Moq" Version="4.18.1"/>
+        <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.3.44"/>
+        <PackageVersion Include="DotNet.Glob" Version="2.1.1"/>
+        <PackageVersion Include="MinVer" Version="4.1.0"/>
+        <PackageVersion Include="Moq" Version="4.18.2"/>
         <PackageVersion Include="morelinq" Version="3.3.2"/>
         <PackageVersion Include="MSTest.TestAdapter" Version="2.2.10"/>
         <PackageVersion Include="MSTest.TestFramework" Version="2.2.10"/>
@@ -29,8 +29,8 @@
         <PackageVersion Include="NuGet.Versioning" Version="5.11.2"/>
         <PackageVersion Include="packageurl-dotnet" Version="1.1.0"/>
         <PackageVersion Include="Polly" Version="7.2.3"/>
-        <PackageVersion Include="Semver" Version="2.0.6"/>
-        <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118"/>
+        <PackageVersion Include="Semver" Version="2.2.0"/>
+        <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435"/>
         <PackageVersion Include="System.Composition.AttributedModel" Version="1.4.1"/>
         <PackageVersion Include="System.Composition.Convention" Version="1.4.1"/>
         <PackageVersion Include="System.Composition.Hosting" Version="1.4.1"/>