Fix compilation errors for xUnit v3 migration

Directory.Build.props

@@ -99,7 +99,7 @@
       Run tests with the VS Test Runner (dotnet test) instead of the XUnit Test runner (dotnet exec).
       This is needed to produce Cobertura code coverage. See the targets file to more information.
     -->
-    <UseVSTestRunner>true</UseVSTestRunner>
+    <UseVSTestRunner Condition="'$(TestRunnerName)' != 'XUnitV3'">true</UseVSTestRunner>
   </PropertyGroup>
 
   <!-- Enable the Evaluation report builds on all CI builds -->

eng/MSBuild/LegacySupport.props

@@ -1,89 +1,89 @@
 <Project>
-  <ItemGroup Condition="'$(InjectCompilerFeatureRequiredOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectCompilerFeatureRequiredOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\CompilerFeatureRequiredAttribute\*.cs" LinkBase="LegacySupport\CompilerFeatureRequiredAttribute" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectRequiredMemberOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectRequiredMemberOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\RequiredMemberAttribute\*.cs" LinkBase="LegacySupport\RequiredMemberAttribute" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectSystemIndexOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectSystemIndexOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\SystemIndex\*.cs" LinkBase="LegacySupport\SystemIndex" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectDiagnosticAttributesOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectDiagnosticAttributesOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp' AND '$(TargetFramework)' != 'netstandard2.1'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\DiagnosticAttributes\*.cs" LinkBase="LegacySupport\DiagnosticAttributes" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectIsExternalInitOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="('$(InjectIsExternalInitOnLegacy)' == 'true' or '$(InjectCompilerFeatureRequiredOnLegacy)' == 'true') AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\IsExternalInit\*.cs" LinkBase="LegacySupport\IsExternalInit" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectTrimAttributesOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectTrimAttributesOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\TrimAttributes\*.cs" LinkBase="LegacySupport\TrimAttributes" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectCallerAttributesOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1')">
+  <ItemGroup Condition="'$(InjectCallerAttributesOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\CallerAttributes\*.cs" LinkBase="LegacySupport\CallerAttributes" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectSkipLocalsInitAttributeOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectSkipLocalsInitAttributeOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\SkipLocalsInitAttribute\*.cs" LinkBase="LegacySupport\SkipLocalsInitAttribute" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectStringHashOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0')">
+  <ItemGroup Condition="'$(InjectStringHashOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\StringHash\*.cs" LinkBase="LegacySupport\StringHash" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectBitOperationsOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0')">
+  <ItemGroup Condition="'$(InjectBitOperationsOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\BitOperations\*.cs" LinkBase="LegacySupport\BitOperations" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectStringBuilderOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0')">
+  <ItemGroup Condition="'$(InjectStringBuilderOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\StringBuilderExtensions\*.cs" LinkBase="LegacySupport\StringBuilderExtensions" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectStringSyntaxAttributeOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0')">
+  <ItemGroup Condition="'$(InjectStringSyntaxAttributeOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\StringSyntaxAttribute\*.cs" LinkBase="LegacySupport\StringSyntaxAttribute" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectGetOrAddOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0')">
+  <ItemGroup Condition="'$(InjectGetOrAddOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\GetOrAdd\*.cs" LinkBase="LegacySupport\GetOrAdd" />
   </ItemGroup>
 
-   <ItemGroup Condition="'$(InjectDictionaryExtensionsOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0')">
+   <ItemGroup Condition="'$(InjectDictionaryExtensionsOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\DictionaryExtensions\*.cs" LinkBase="LegacySupport\DictionaryExtensions" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectTaskWaitAsyncOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectTaskWaitAsyncOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\TaskWaitAsync\*.cs" LinkBase="LegacySupport\TaskWaitAsync" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectExperimentalAttributeOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0')">
+  <ItemGroup Condition="'$(InjectExperimentalAttributeOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\ExperimentalAttribute\*.cs" LinkBase="LegacySupport\ExperimentalAttribute" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectObsoleteAttributeOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectObsoleteAttributeOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\ObsoleteAttribute\*.cs" LinkBase="LegacySupport\ObsoleteAttribute" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectPlatformAttributesOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectPlatformAttributesOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\PlatformAttributes\*.cs" LinkBase="LegacySupport\PlatformAttributes" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectCollectionBuilderAttributesOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectCollectionBuilderAttributesOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\CollectionBuilder\*.cs" LinkBase="LegacySupport\CollectionBuilder" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectMediaTypeMapOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net10.0')">
+  <ItemGroup Condition="'$(InjectMediaTypeMapOnLegacy)' == 'true'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\MediaTypeMap\*.cs" LinkBase="LegacySupport\MediaTypeMap" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectNullabilityInfoContextOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <ItemGroup Condition="'$(InjectNullabilityInfoContextOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\NullabilityInfoContext\*.cs" LinkBase="LegacySupport\NullabilityInfoContext" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(InjectUnreachableExceptionOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0')">
+  <ItemGroup Condition="'$(InjectUnreachableExceptionOnLegacy)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\UnreachableException\*.cs" LinkBase="LegacySupport\UnreachableException" />
   </ItemGroup>
 

eng/Versions.props

@@ -216,15 +216,10 @@
     <!-- Compatibility with VS 17.8/.NET SDK 8.0.1xx -->
     <MicrosoftCodeAnalysisVersion>4.8.0</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
-    <!--
-      xUnit version is configured by the Arcade SDK.
-      https://github.com/dotnet/arcade/blob/f5a7c5d5c56197b09715dece7541ca06beb94eb0/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnit/XUnit.targets#L9
-     -->
-    <XUnitVersion>2.9.3</XUnitVersion>
-    <!--
-      Starting with 3.0.0, xunit.runner.visualstudio only supports net472, but we target net462
-     -->
-    <XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
+    <!-- xUnit v3 version is configured by the Arcade SDK (TestRunnerName=XUnitV3). -->
+    <XUnitV3Version>3.2.2</XUnitV3Version>
+    <XUnitRunnerVisualStudioVersion>3.1.5</XUnitRunnerVisualStudioVersion>
+    <MicrosoftTestingPlatformVersion>1.9.1</MicrosoftTestingPlatformVersion>
     <!-- MEVD is still part of the Semantic Kernel repo -->
     <MicrosoftExtensionsVectorDataAbstractionsVersion>9.7.0</MicrosoftExtensionsVectorDataAbstractionsVersion>
     <MarkdigSignedVersion>0.43.0</MarkdigSignedVersion>

eng/packages/General.props

@@ -41,7 +41,7 @@
     <PackageVersion Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <PackageVersion Include="Microsoft.AspNetCore.Http.Features" Version="2.2.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageVersion Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />

eng/packages/Tests.props

@@ -33,11 +33,8 @@
     <PackageVersion Include="SharpFuzz" Version="2.1.1" />
     <PackageVersion Include="StrongNamer" Version="0.2.5" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
-    <PackageVersion Include="Verify.Xunit" Version="28.15.0" />
-    <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
-    <PackageVersion Include="xunit" Version="$(XUnitVersion)" />
-    <PackageVersion Include="xunit.extensibility.execution" Version="$(XUnitVersion)" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
+    <PackageVersion Include="Verify.XunitV3" Version="31.20.0" />
+    <PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
   </ItemGroup>
 
   <ItemGroup Label="IntegrationTestReferences">
@@ -49,7 +46,7 @@
     <PackageVersion Include="PdfPig" Version="0.1.10" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <PackageVersion Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.3" />
   </ItemGroup>

eng/xunit.runner.json

@@ -1,5 +1,5 @@
 {
+  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
   "diagnosticMessages": true,
-  "longRunningTestSeconds": 300,
-  "shadowCopy": false
+  "longRunningTestSeconds": 300
 }

scripts/Slngen.ps1

@@ -169,10 +169,6 @@ Push-Location $RepositoryPath
 try {
     [System.Collections.ArrayList]$Globs = @()
 
-    if (!$OnlySources) {
-        $Globs += "test/TestUtilities/TestUtilities.csproj"
-    }
-
     if (!$All) {
         foreach ($Keyword in $Keywords) {
             $Globs += "src/**/*$($Keyword)*/**/*.*sproj"

test/Directory.Build.props

@@ -2,12 +2,19 @@
   <PropertyGroup>
     <!-- Do not generate documentation, and do not warn about enabling /doc for tests. -->
     <GenerateDocumentationFile Condition="'$(GenerateDocumentationFile)' == ''">false</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);RT0000</NoWarn>
+    <!-- xUnit1051: methods accepting CancellationToken should use TestContext.Current.CancellationToken.
+         Fixing it would require updating thousands of call sites; suppress it repo-wide instead. -->
+    <NoWarn>$(NoWarn);RT0000;xUnit1051</NoWarn>
+    <!-- Use xUnit v3 test runner -->
+    <TestRunnerName>XUnitV3</TestRunnerName>
+    <!-- xUnit v3 requires test projects to be executable -->
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
     <TargetFrameworks>$(LatestTargetFramework)</TargetFrameworks>
+    <ConditionalNet472 Condition="'$(IsWindowsBuild)' == 'true' AND ('$(CustomTargetFrameworks)' == '' OR $(CustomTargetFrameworks.Contains('net462')))">;net472</ConditionalNet472>
   </PropertyGroup>
 </Project>

test/Directory.Build.targets

@@ -1,17 +1,20 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
+  <PropertyGroup>
+    <XUnitCoreSettingsFile>$(MSBuildThisFileDirectory)\..\eng\xunit.runner.json</XUnitCoreSettingsFile>
+    <XUnitDesktopSettingsFile>$(MSBuildThisFileDirectory)\..\eng\xunit.runner.json</XUnitDesktopSettingsFile>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="AutoFixture.AutoMoq" />
     <PackageReference Include="autofixture" />
     <PackageReference Include="AwesomeAssertions" />
     <PackageReference Include="Moq.AutoMock" />
     <PackageReference Include="Moq" />
     <PackageReference Include="StrongNamer" Condition="'$(SignArtifacts)' == 'true' " />
-    <PackageReference Include="Verify.Xunit" />
+    <PackageReference Include="Verify.XunitV3" />
     <PackageReference Include="Xunit.Combinatorial" />
-
-    <Content Include="$(MSBuildThisFileDirectory)\..\eng\xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Visible="false" />
   </ItemGroup>
 
 </Project>

test/Directory.Packages.props

@@ -3,4 +3,10 @@
 
   <!-- Import package versions used for tests and benchmarks -->
   <Import Project="$(MSBuildThisFileDirectory)..\eng\packages\Tests.props" />
+
+  <ItemGroup>
+    <!-- Used only to suppress xunit v2 types from TemplateVerifier transitive dependencies -->
+    <PackageVersion Include="xunit.core" Version="2.9.3" />
+    <PackageVersion Include="xunit.extensibility.core" Version="2.9.3" />
+  </ItemGroup>
 </Project>

test/Generators/Microsoft.Gen.ComplianceReports/Unit/GeneratorTests.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
@@ -12,7 +12,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Gen.Shared;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Gen.ComplianceReports.Tests;
 

test/Generators/Microsoft.Gen.ContextualOptions/Generated/Microsoft.Gen.ContextualOptions.Generated.Tests.csproj

@@ -5,8 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>$(TestNetCoreTargetFrameworks)</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(IsWindowsBuild)' == 'true' ">$(TestNetCoreTargetFrameworks)$(ConditionalNet462)</TargetFrameworks>
+    <TargetFrameworks>$(TestNetCoreTargetFrameworks)$(ConditionalNet472)</TargetFrameworks>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <InjectIsExternalInitOnLegacy>true</InjectIsExternalInitOnLegacy>
     <InjectSharedNumericExtensions>true</InjectSharedNumericExtensions>

test/Generators/Microsoft.Gen.Logging/Generated/Microsoft.Gen.Logging.Generated.Tests.csproj

@@ -5,8 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>$(TestNetCoreTargetFrameworks)</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(IsWindowsBuild)' == 'true' ">$(TestNetCoreTargetFrameworks)$(ConditionalNet462)</TargetFrameworks>
+    <TargetFrameworks>$(TestNetCoreTargetFrameworks)$(ConditionalNet472)</TargetFrameworks>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <InjectIsExternalInitOnLegacy>true</InjectIsExternalInitOnLegacy>
     <InjectSharedNumericExtensions>true</InjectSharedNumericExtensions>

test/Generators/Microsoft.Gen.Logging/HelperLibrary/Microsoft.Gen.Logging.HelperLibrary.csproj

@@ -2,11 +2,12 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.Gen.Logging.Test</RootNamespace>
     <Description>Test classes for Microsoft.Gen.Logging.Generated.Tests.</Description>
+    <OutputType>Library</OutputType>
+    <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>$(TestNetCoreTargetFrameworks)</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(IsWindowsBuild)' == 'true' ">$(TestNetCoreTargetFrameworks)$(ConditionalNet462)</TargetFrameworks>
+    <TargetFrameworks>$(TestNetCoreTargetFrameworks)$(ConditionalNet472)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

test/Generators/Microsoft.Gen.MetadataExtractor/Unit/GeneratorTests.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
@@ -15,7 +15,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Gen.Shared;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Gen.MetadataExtractor.Unit.Tests;