Merge branch 'main' into Net8ChangesSecondAttempt
authorViktor Hofer <viktor.hofer@microsoft.com>
Tue, 29 Nov 2022 14:21:43 +0000 (15:21 +0100)
committerGitHub <noreply@github.com>
Tue, 29 Nov 2022 14:21:43 +0000 (15:21 +0100)
1  2 
eng/Versions.props
eng/packaging.targets
src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj
src/libraries/System.Text.Json/src/System.Text.Json.csproj
src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj

Simple merge
Simple merge
@@@ -26,9 -26,9 +26,9 @@@
                        PrivateAssets="all"
                        Private="true"
                        IncludeReferenceAssemblyInPackage="true" />
 -    <!-- Only include the 4.4 version in the ref pack, since targeting net7.0 requires Roslyn 4.4 -->
 +    <!-- Only include the 4.4 version in the ref pack, since targeting net7.0 or greater requires Roslyn 4.4 -->
-     <AnalyzerReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.Roslyn4.4.csproj"
-                        Pack="true"
-                        ReferenceAnalyzer="false" />
+     <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.Roslyn4.4.csproj"
+                       ReferenceOutputAssembly="false"
+                       PackAsAnalyzer="true" />
    </ItemGroup>
  </Project>