From e2f90597bca68f74b1b2b6f893820f5e21e99900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com> Date: Fri, 26 Aug 2022 10:12:51 +0200 Subject: [PATCH] Refactor supported TFMs names Match microsoft/testfx and dotnet/runtime naming --- Directory.Build.props | 5 +++-- .../TestPlatform.Playground.csproj | 2 +- .../Microsoft.TestPlatform.E2ETest.csproj | 4 ++-- .../Microsoft.TestPlatform.Protocol.csproj | 2 +- ...Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj | 4 ++-- samples/UnitTestProject/UnitTestProject.csproj | 8 ++++---- scripts/build/TestAssets.props | 4 ++-- .../DumpMinitool.arm64/DumpMinitool.arm64.csproj | 2 +- .../DumpMinitool.x86/DumpMinitool.x86.csproj | 2 +- src/DataCollectors/DumpMinitool/DumpMinitool.csproj | 2 +- ...osoft.TestPlatform.Extensions.EventLogCollector.csproj | 2 +- .../Microsoft.TestPlatform.AdapterUtilities.csproj | 4 ++-- .../Microsoft.TestPlatform.Client.csproj | 4 ++-- .../Microsoft.TestPlatform.Common.csproj | 4 ++-- .../Microsoft.TestPlatform.CommunicationUtilities.csproj | 4 ++-- .../Microsoft.TestPlatform.CoreUtilities.csproj | 6 +++--- .../Microsoft.TestPlatform.CrossPlatEngine.csproj | 4 ++-- .../Microsoft.TestPlatform.Extensions.HtmlLogger.csproj | 4 ++-- .../Microsoft.TestPlatform.Extensions.TrxLogger.csproj | 4 ++-- .../Microsoft.TestPlatform.ObjectModel.csproj | 4 ++-- .../Microsoft.TestPlatform.PlatformAbstractions.csproj | 6 +++--- .../Microsoft.TestPlatform.TestHostProvider.csproj | 4 ++-- .../Microsoft.TestPlatform.Utilities.csproj | 4 ++-- ...oft.TestPlatform.VsTestConsole.TranslationLayer.csproj | 4 ++-- src/SettingsMigrator/SettingsMigrator.csproj | 6 +++--- src/datacollector/datacollector.csproj | 4 ++-- src/package/VSIXProject/TestPlatform.csproj | 2 +- src/package/nuspec/Microsoft.TestPlatform.CLI.csproj | 2 +- src/package/package/package.csproj | 6 +++--- src/package/sign/sign.csproj | 4 ++-- src/testhost.arm64/testhost.arm64.csproj | 6 +++--- src/testhost.x86/testhost.x86.csproj | 6 +++--- src/testhost/testhost.csproj | 6 +++--- src/vstest.console/vstest.console.csproj | 8 ++++---- .../AppDomainGetAssembliesTestProject.csproj | 2 +- .../BlameUnitTestProject/BlameUnitTestProject.csproj | 2 +- test/TestAssets/CUITTestProject/CUITTestProject.csproj | 2 +- test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj | 4 ++-- .../TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj | 2 +- test/TestAssets/ConsoleRunners/ConsoleRunners.csproj | 2 +- .../CoverletCoverageTestProject.csproj | 2 +- .../CrashingOnDebugAssertTestProject.csproj | 6 +++--- .../DisableAppdomainTest1/DisableAppdomainTest1.csproj | 4 ++-- .../DisableAppdomainTest2/DisableAppdomainTest2.csproj | 4 ++-- .../DiscoveryTestProject/DiscoveryTestProject.csproj | 6 +++--- .../EnvironmentVariablesTestProject.csproj | 2 +- .../EventLogUnitTestProject.csproj | 4 ++-- .../LegacySettingsUnitTestProject.csproj | 2 +- test/TestAssets/MSTestProject1/MSTestProject1.csproj | 4 ++-- test/TestAssets/MSTestProject2/MSTestProject2.csproj | 4 ++-- .../MstestV1UnitTestProject.csproj | 2 +- .../MultitargetedNetFrameworkProject.csproj | 4 ++-- test/TestAssets/NUTestProject/NUTestProject.csproj | 2 +- .../NewtonSoftDependency/NewtonSoftDependency.csproj | 4 ++-- .../OutOfProcDataCollector/OutOfProcDataCollector.csproj | 2 +- .../ParametrizedTestProject.csproj | 4 ++-- test/TestAssets/PerfTestProject/PerfTestProject.csproj | 6 +++--- .../ProjectFileRunSettingsTestProject.csproj | 4 ++-- .../SampleProjectWithOldTestHost.csproj | 2 +- .../SimpleClassLibrary/SimpleClassLibrary.csproj | 8 ++++---- .../SimpleDataCollector/SimpleDataCollector.csproj | 2 +- .../TestAssets/SimpleTestProject/SimpleTestProject.csproj | 4 ++-- .../SimpleTestProject2/SimpleTestProject2.csproj | 4 ++-- .../SimpleTestProject3/SimpleTestProject3.csproj | 6 +++--- .../SimpleTestProjectARM/SimpleTestProjectARM.csproj | 2 +- .../SimpleTestProjectMessedUpTargetFramework.csproj | 2 +- .../SimpleTestProjectx86/SimpleTestProjectx86.csproj | 2 +- .../TestAssets/XUPerfTestProject/XUPerfTestProject.csproj | 8 ++++---- test/TestAssets/XUTestProject/XUTestProject.csproj | 2 +- test/TestAssets/child-hang/child-hang.csproj | 2 +- test/TestAssets/crash/crash.csproj | 2 +- test/TestAssets/timeout/timeout.csproj | 2 +- 72 files changed, 136 insertions(+), 135 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 24d5af8dd0..124b8ffea5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,8 @@ <!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the MIT license. See License.txt in the project root for license information. --> <Project> <PropertyGroup> - <TargetNetFxVersion>net462</TargetNetFxVersion> - <TargetNetCoreVersion>netcoreapp3.1</TargetNetCoreVersion> + <!-- Naming is based on dotnet/runtime one --> + <NetFrameworkMinimum>net462</NetFrameworkMinimum> + <NetCoreAppMinimum>netcoreapp3.1</NetCoreAppMinimum> </PropertyGroup> </Project> diff --git a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj index da1ab55244..b187eeec85 100644 --- a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj +++ b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj @@ -35,7 +35,7 @@ </ItemGroup> <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(OS)' == 'WINDOWS_NT' "> - <Exec Command="xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\vstest.console\bin\$(Configuration)\$(TargetNetFxVersion)\ $(TargetDir)\vstest.console\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\Microsoft.TestPlatform.TestHostProvider\bin\$(Configuration)\$(TargetNetFxVersion)\ $(TargetDir)\vstest.console\Extensions\
REM copy net462, net47, net471, net472 and net48 testhosts
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\$(TargetNetFxVersion)\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\$(TargetNetFxVersion)\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net47\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net47\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net471\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net471\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net472\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net472\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net48\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net48\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\" /> + <Exec Command="xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\vstest.console\bin\$(Configuration)\$(NetFrameworkMinimum)\ $(TargetDir)\vstest.console\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\Microsoft.TestPlatform.TestHostProvider\bin\$(Configuration)\$(NetFrameworkMinimum)\ $(TargetDir)\vstest.console\Extensions\
REM copy net462, net47, net471, net472 and net48 testhosts
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\$(NetFrameworkMinimum)\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\$(NetFrameworkMinimum)\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net47\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net47\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net471\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net471\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net472\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net472\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net48\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\
xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net48\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\" /> </Target> <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" /> </Project> diff --git a/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj b/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj index 718a7183c1..696bb6fd64 100644 --- a/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj +++ b/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj @@ -6,7 +6,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Dependencies.props" /> <PropertyGroup> <VersionPrefix>15.0.0</VersionPrefix> - <TargetFramework>$(TargetNetFxVersion)</TargetFramework> + <TargetFramework>$(NetFrameworkMinimum)</TargetFramework> <AssemblyName>Microsoft.TestPlatform.E2ETest</AssemblyName> <OutputType>Exe</OutputType> <RuntimeIdentifier>win7-x64</RuntimeIdentifier> @@ -19,7 +19,7 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <ProjectReference Include="..\UnitTestProject\UnitTestProject.csproj" /> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> diff --git a/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj b/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj index 07d761dce9..0e8eafc6c5 100644 --- a/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj +++ b/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>$(TargetNetCoreVersion)</TargetFramework> + <TargetFramework>$(NetCoreAppMinimum)</TargetFramework> <OutputType>Exe</OutputType> </PropertyGroup> <ItemGroup> diff --git a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj index f781d22e7d..279e0d3a75 100644 --- a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj +++ b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>$(TargetNetFxVersion)</TargetFramework> + <TargetFramework>$(NetFrameworkMinimum)</TargetFramework> <AssemblyName>Microsoft.TestPlatform.TranslationLayer.E2ETest</AssemblyName> <OutputType>Exe</OutputType> <RuntimeIdentifier>win7-x64</RuntimeIdentifier> @@ -14,7 +14,7 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <ProjectReference Include="..\UnitTestProject\UnitTestProject.csproj" /> <Reference Include="System" /> <Reference Include="System.Runtime" /> diff --git a/samples/UnitTestProject/UnitTestProject.csproj b/samples/UnitTestProject/UnitTestProject.csproj index 30d3885a17..9357ee9e70 100644 --- a/samples/UnitTestProject/UnitTestProject.csproj +++ b/samples/UnitTestProject/UnitTestProject.csproj @@ -2,9 +2,9 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="..\..\scripts\build\TestPlatform.Dependencies.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion);net7.0;net6.0;</TargetFrameworks> - <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(TargetNetCoreVersion)</TargetFrameworks> - <OutputType Condition=" '$(TargetFramework)' != '$(TargetNetFxVersion)' ">Exe</OutputType> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum);net7.0;net6.0;</TargetFrameworks> + <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCoreAppMinimum)</TargetFrameworks> + <OutputType Condition=" '$(TargetFramework)' != '$(NetFrameworkMinimum)' ">Exe</OutputType> <AssemblyName>UnitTestProject</AssemblyName> <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute> <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute> @@ -20,7 +20,7 @@ <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Runtime" /> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> diff --git a/scripts/build/TestAssets.props b/scripts/build/TestAssets.props index a5a7ecd8b1..8be98c9fd6 100644 --- a/scripts/build/TestAssets.props +++ b/scripts/build/TestAssets.props @@ -4,8 +4,8 @@ <!-- Not able to add TargetFrameworks here due to: https://github.com/dotnet/sdk/issues/1110 --> <NetCoreAppTargetFramework Condition="'$(TargetFramework)' != '' AND $(TargetFramework.StartsWith('netcoreapp'))">true</NetCoreAppTargetFramework> <CheckEolTargetFramework>false</CheckEolTargetFramework> - <TargetNetFxVersion Condition=" '$(TargetNetFxVersion)' == '' ">net462</TargetNetFxVersion> - <TargetNetCoreVersion Condition=" '$(TargetNetCoreVersion)' == '' ">netcoreapp3.1</TargetNetCoreVersion> + <NetFrameworkMinimum Condition=" '$(NetFrameworkMinimum)' == '' ">net462</NetFrameworkMinimum> + <NetCoreAppMinimum Condition=" '$(NetCoreAppMinimum)' == '' ">netcoreapp3.1</NetCoreAppMinimum> </PropertyGroup> <Import Project="$(MSBuildThisFileDirectory)TestPlatform.Dependencies.props" Condition=" '$(DependencyVersionsImported)' != 'true' "/> diff --git a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj index 78857ecb68..88f927cc74 100644 --- a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj +++ b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj @@ -5,7 +5,7 @@ </PropertyGroup> <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> - <TargetFrameworks>net7.0;net6.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;net6.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFrameworks> <PlatformTarget>AnyCPU</PlatformTarget> <Prefer32Bit>false</Prefer32Bit> diff --git a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj index 3e2ae466ae..1f1f3ce8ce 100644 --- a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj +++ b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj @@ -5,7 +5,7 @@ </PropertyGroup> <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> - <TargetFrameworks>net7.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFrameworks> <PlatformTarget>AnyCPU</PlatformTarget> <Prefer32Bit>true</Prefer32Bit> diff --git a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj index c0bbbe14f2..cdfce59449 100644 --- a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj +++ b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj @@ -5,7 +5,7 @@ </PropertyGroup> <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> - <TargetFrameworks>net7.0;net6.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;net6.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFrameworks> <PlatformTarget>AnyCPU</PlatformTarget> <Prefer32Bit>false</Prefer32Bit> diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj index 5534492c44..72a588f38d 100644 --- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj +++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj @@ -6,7 +6,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.TestPlatform.Extensions.EventLogCollector</AssemblyName> - <TargetFrameworks>net7.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFrameworks> <IsTestProject>false</IsTestProject> <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers> diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj index 2131752716..823c57a93c 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj @@ -5,13 +5,13 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> - <TargetFrameworks>net6.0;net7.0;netstandard2.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net6.0;net7.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFrameworks> <AssemblyName>Microsoft.TestPlatform.AdapterUtilities</AssemblyName> <RootNamespace>Microsoft.TestPlatform.AdapterUtilities</RootNamespace> </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetNetFxVersion)'"> + <PropertyGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'"> <RuntimeIdentifier>any</RuntimeIdentifier> <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects> </PropertyGroup> diff --git a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj index 628557e922..9657b83db6 100644 --- a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj +++ b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj @@ -6,7 +6,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.VisualStudio.TestPlatform.Client</AssemblyName> - <TargetFrameworks>net7.0;netstandard2.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFrameworks> <IsTestProject>false</IsTestProject> </PropertyGroup> @@ -24,7 +24,7 @@ <FromP2P>true</FromP2P> </ProjectReference> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Serialization" /> diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj index f30e942145..74ef3a0458 100644 --- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj +++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj @@ -6,7 +6,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.VisualStudio.TestPlatform.Common</AssemblyName> - <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFrameworks> <IsTestProject>false</IsTestProject> <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers> @@ -17,7 +17,7 @@ <ItemGroup> <EmbeddedResource Include="Resources\Resources.resx" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Configuration" /> <Reference Include="System.IO" /> diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj index 9f3fe059aa..f112af3a01 100644 --- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj +++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj @@ -5,7 +5,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.TestPlatform.CommunicationUtilities</AssemblyName> - <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFrameworks> <IsTestProject>false</IsTestProject> </PropertyGroup> @@ -20,7 +20,7 @@ <Version>$(JsonNetVersion)</Version> </PackageReference> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Runtime" /> </ItemGroup> diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj index 354e7b4be8..48704d31f8 100644 --- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj +++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj @@ -6,7 +6,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.TestPlatform.CoreUtilities</AssemblyName> - <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <IsTestProject>false</IsTestProject> </PropertyGroup> @@ -15,7 +15,7 @@ <EmbeddedResource Include="Resources\Resources.resx" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Configuration" /> <Reference Include="System" /> <Reference Include="System.IO" /> @@ -24,7 +24,7 @@ <Reference Include="Microsoft.CSharp" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' != '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' != '$(NetFrameworkMinimum)' "> <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" /> <PackageReference Include="Microsoft.Win32.Registry" Version="4.0.0" /> </ItemGroup> diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj index 3edd07c71f..10da2c411e 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj @@ -6,7 +6,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.TestPlatform.CrossPlatEngine</AssemblyName> - <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <IsTestProject>false</IsTestProject> </PropertyGroup> @@ -25,7 +25,7 @@ <FromP2P>true</FromP2P> </ProjectReference> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Runtime" /> <Reference Include="System.Xml" /> diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj index 935cd5af48..b144c24f59 100644 --- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj +++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj @@ -6,7 +6,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger</AssemblyName> - <TargetFrameworks>net7.0;netstandard2.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <IsTestProject>false</IsTestProject> <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers> @@ -15,7 +15,7 @@ <EmbeddedResource Include="Resources\Resources.resx" /> <EmbeddedResource Include="Html.xslt" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Runtime" /> <Reference Include="System.Xml" /> diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj index 95b58f7d57..643f4a2ca8 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj @@ -6,14 +6,14 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger</AssemblyName> - <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <EmbeddedResource Include="Resources\TrxResource.resx" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Runtime" /> <Reference Include="System.Xml" /> diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj index dcab739485..c783f0769b 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj +++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj @@ -7,7 +7,7 @@ <PropertyGroup> <AssemblyName>Microsoft.VisualStudio.TestPlatform.ObjectModel</AssemblyName> - <TargetFrameworks>net7.0;$(TargetNetFxVersion);$(TargetNetCoreVersion);netstandard2.0;</TargetFrameworks> + <TargetFrameworks>net7.0;$(NetFrameworkMinimum);$(NetCoreAppMinimum);netstandard2.0;</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <PackageId>Microsoft.TestPlatform.ObjectModel</PackageId> </PropertyGroup> @@ -16,7 +16,7 @@ <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Xml" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime" /> diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj index fbc3b7888f..65c9680996 100644 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj @@ -7,13 +7,13 @@ <PropertyGroup> <AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName> <RootNamespace>Microsoft.TestPlatform.PlatformAbstractions</RootNamespace> - <TargetFrameworks>net7.0;$(TargetNetFxVersion);$(TargetNetCoreVersion);netstandard2.0;net6.0</TargetFrameworks> + <TargetFrameworks>net7.0;$(NetFrameworkMinimum);$(NetCoreAppMinimum);netstandard2.0;net6.0</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <IsTestProject>false</IsTestProject> <NoWarn>$(NoWarn);NU1605</NoWarn> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetCoreVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetCoreAppMinimum)' "> <PackageReference Include="System.Threading.Thread" Version="4.0.0" /> <PackageReference Include="System.Diagnostics.Process" Version="4.1.0" /> <PackageReference Include="System.Diagnostics.TextWriterTraceListener" Version="4.0.0" /> @@ -23,7 +23,7 @@ <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Configuration" /> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj index 7e25baa267..bb2fa22e0e 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj +++ b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj @@ -6,13 +6,13 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.TestPlatform.TestHostRuntimeProvider</AssemblyName> - <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <DefineConstants Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(DefineConstants);DOTNET_BUILD_FROM_SOURCE</DefineConstants> <IsTestProject>false</IsTestProject> <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Runtime" /> <Reference Include="System.Configuration" /> diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj index 60c5ac5ed7..10da311374 100644 --- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj +++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj @@ -6,11 +6,11 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.TestPlatform.Utilities</AssemblyName> - <TargetFrameworks>net7.0;netstandard2.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <IsTestProject>false</IsTestProject> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(TargetNetFxVersion)'"> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'"> <Reference Include="System" /> <Reference Include="System.Runtime" /> <Reference Include="System.Xml" /> diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj index 42db158dc2..910be60624 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj @@ -6,7 +6,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>Microsoft.TestPlatform.VsTestConsole.TranslationLayer</AssemblyName> - <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;net6.0;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <IsTestProject>false</IsTestProject> </PropertyGroup> @@ -19,7 +19,7 @@ <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" /> <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Xml" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System" /> diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj index ab06081b04..30777d34ed 100644 --- a/src/SettingsMigrator/SettingsMigrator.csproj +++ b/src/SettingsMigrator/SettingsMigrator.csproj @@ -6,20 +6,20 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>SettingsMigrator</AssemblyName> - <TargetFrameworks>net7.0;$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <OutputType>Exe</OutputType> <PlatformTarget>AnyCPU</PlatformTarget> <IsTestProject>false</IsTestProject> <Prefer32Bit>true</Prefer32Bit> </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetNetFxVersion)'"> + <PropertyGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'"> <RuntimeIdentifier>win7-x64</RuntimeIdentifier> </PropertyGroup> <ItemGroup> <EmbeddedResource Include="Resources\Resources.resx" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.IO" /> <Reference Include="System.Runtime" /> diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj index 88b2c2557a..a1fe4b00ee 100644 --- a/src/datacollector/datacollector.csproj +++ b/src/datacollector/datacollector.csproj @@ -11,9 +11,9 @@ <PropertyGroup> <AssemblyName>datacollector</AssemblyName> <AssemblyName Condition=" '$(RuntimeIdentifier)' == 'win10-arm64' ">datacollector.arm64</AssemblyName> - <TargetFrameworks>$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(OS)' == 'WINDOWS_NT' ">$(TargetFrameworks);net472</TargetFrameworks> - <TargetFrameworks Condition=" '$(OS)' != 'WINDOWS_NT' ">$(TargetFrameworks);$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks Condition=" '$(OS)' != 'WINDOWS_NT' ">$(TargetFrameworks);$(NetFrameworkMinimum)</TargetFrameworks> <TargetFrameworks>$(TargetFrameworks);net7.0;net6.0;</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFrameworks> <PlatformTarget Condition=" $(TargetFramework.StartsWith('net4')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget> diff --git a/src/package/VSIXProject/TestPlatform.csproj b/src/package/VSIXProject/TestPlatform.csproj index 66c2411daa..8dd1f876fb 100644 --- a/src/package/VSIXProject/TestPlatform.csproj +++ b/src/package/VSIXProject/TestPlatform.csproj @@ -27,7 +27,7 @@ <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory> <DeployExtension>False</DeployExtension> <IsProductComponent>true</IsProductComponent> - <VsixInputFileLocation>$(TestPlatformRoot)artifacts\$(Configuration)\$(TargetNetFxVersion)\win7-x64</VsixInputFileLocation> + <VsixInputFileLocation>$(TestPlatformRoot)artifacts\$(Configuration)\$(NetFrameworkMinimum)\win7-x64</VsixInputFileLocation> <OutputPath>$(TestPlatformRoot)artifacts\$(Configuration)\VSIX</OutputPath> <ExtensionInstallationFolder>TestPlatform</ExtensionInstallationFolder> <ExtensionInstallationRelativeToVS>[installDir]\Common7\IDE\Extensions\TestPlatform</ExtensionInstallationRelativeToVS> diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj index 852b7e97cd..df5819e8dd 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj +++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">$(TargetNetCoreVersion)</TargetFramework> + <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">$(NetCoreAppMinimum)</TargetFramework> <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFramework> <CheckEolTargetFramework>false</CheckEolTargetFramework> <NuspecFile>TestPlatform.CLI.nuspec</NuspecFile> diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj index 0ad3344694..082b9160b0 100644 --- a/src/package/package/package.csproj +++ b/src/package/package/package.csproj @@ -5,7 +5,7 @@ </PropertyGroup> <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0</TargetFrameworks> <AssemblyName>package</AssemblyName> <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> @@ -28,10 +28,10 @@ <IsTestProject>false</IsTestProject> </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetNetFxVersion)'"> + <PropertyGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'"> <RuntimeIdentifier>win7-x64</RuntimeIdentifier> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> </ItemGroup> diff --git a/src/package/sign/sign.csproj b/src/package/sign/sign.csproj index 76bab86510..0eb8586ff9 100644 --- a/src/package/sign/sign.csproj +++ b/src/package/sign/sign.csproj @@ -1,6 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>$(TargetNetFxVersion)</TargetFramework> + <TargetFramework>$(NetFrameworkMinimum)</TargetFramework> <AssemblyName>sign</AssemblyName> <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers> </PropertyGroup> @@ -11,7 +11,7 @@ </PackageReference> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> </ItemGroup> diff --git a/src/testhost.arm64/testhost.arm64.csproj b/src/testhost.arm64/testhost.arm64.csproj index d5ec8961c1..ce3656741f 100644 --- a/src/testhost.arm64/testhost.arm64.csproj +++ b/src/testhost.arm64/testhost.arm64.csproj @@ -10,16 +10,16 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>testhost.arm64</AssemblyName> - <TargetFrameworks>net7.0;$(TargetNetCoreVersion);$(TargetNetFxVersion);net47;net471;net472;net48</TargetFrameworks> + <TargetFrameworks>net7.0;$(NetCoreAppMinimum);$(NetFrameworkMinimum);net47;net471;net472;net48</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <OutputType>Exe</OutputType> <IsTestProject>false</IsTestProject> <ApplicationManifest>app.manifest</ApplicationManifest> </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)' != '$(TargetNetCoreVersion)' AND '$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net7.0' "> + <PropertyGroup Condition="'$(TargetFramework)' != '$(NetCoreAppMinimum)' AND '$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net7.0' "> <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' != 'true'">win10-arm64</RuntimeIdentifier> <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects> - <TargetName Condition="'$(TargetFramework)' != '$(TargetNetFxVersion)'">$(AssemblyName.Replace('.arm64', '')).$(TargetFramework).arm64</TargetName> + <TargetName Condition="'$(TargetFramework)' != '$(NetFrameworkMinimum)'">$(AssemblyName.Replace('.arm64', '')).$(TargetFramework).arm64</TargetName> </PropertyGroup> <ItemGroup> <Compile Include="..\testhost.x86\DebugAssertException.cs" Link="DebugAssertException.cs" /> diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj index a9c4b6b7b6..cc055cc44c 100644 --- a/src/testhost.x86/testhost.x86.csproj +++ b/src/testhost.x86/testhost.x86.csproj @@ -10,7 +10,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>testhost.x86</AssemblyName> - <TargetFrameworks>net7.0;$(TargetNetCoreVersion);$(TargetNetFxVersion);net47;net471;net472;net48</TargetFrameworks> + <TargetFrameworks>net7.0;$(NetCoreAppMinimum);$(NetFrameworkMinimum);net47;net471;net472;net48</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <PlatformTarget>AnyCPU</PlatformTarget> <Prefer32Bit>true</Prefer32Bit> @@ -18,10 +18,10 @@ <IsTestProject>false</IsTestProject> <ApplicationManifest>app.manifest</ApplicationManifest> </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)' != '$(TargetNetCoreVersion)' AND '$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net7.0' "> + <PropertyGroup Condition="'$(TargetFramework)' != '$(NetCoreAppMinimum)' AND '$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net7.0' "> <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' != 'true'">win7-x86</RuntimeIdentifier> <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects> - <TargetName Condition="'$(TargetFramework)' != '$(TargetNetFxVersion)'">$(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86</TargetName> + <TargetName Condition="'$(TargetFramework)' != '$(NetFrameworkMinimum)'">$(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86</TargetName> </PropertyGroup> <ItemGroup> <None Include="app.config" /> diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj index a1dd931da3..48148f8c1f 100644 --- a/src/testhost/testhost.csproj +++ b/src/testhost/testhost.csproj @@ -10,16 +10,16 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>testhost</AssemblyName> - <TargetFrameworks>net7.0;$(TargetNetCoreVersion);$(TargetNetFxVersion);net47;net471;net472;net48</TargetFrameworks> + <TargetFrameworks>net7.0;$(NetCoreAppMinimum);$(NetFrameworkMinimum);net47;net471;net472;net48</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <OutputType>Exe</OutputType> <IsTestProject>false</IsTestProject> <ApplicationManifest>app.manifest</ApplicationManifest> </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)' != '$(TargetNetCoreVersion)' AND '$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net7.0' "> + <PropertyGroup Condition="'$(TargetFramework)' != '$(NetCoreAppMinimum)' AND '$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net7.0' "> <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' != 'true'">win7-x64</RuntimeIdentifier> <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects> - <TargetName Condition="'$(TargetFramework)' != '$(TargetNetFxVersion)'">$(AssemblyName).$(TargetFramework)</TargetName> + <TargetName Condition="'$(TargetFramework)' != '$(NetFrameworkMinimum)'">$(AssemblyName).$(TargetFramework)</TargetName> </PropertyGroup> <ItemGroup> <Compile Include="..\testhost.x86\DebugAssertException.cs" Link="DebugAssertException.cs" /> diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj index 5a186f01ab..4addecf096 100644 --- a/src/vstest.console/vstest.console.csproj +++ b/src/vstest.console/vstest.console.csproj @@ -8,12 +8,12 @@ <PropertyGroup> <AssemblyName>vstest.console</AssemblyName> <AssemblyName Condition=" '$(RuntimeIdentifier)' == 'win10-arm64' ">vstest.console.arm64</AssemblyName> - <TargetFrameworks>net7.0;$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>net7.0;$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net7.0;</TargetFrameworks> <OutputType>Exe</OutputType> <RollForward>Major</RollForward> <IsTestProject>false</IsTestProject> - <PlatformTarget Condition="'$(TargetFramework)' == '$(TargetNetFxVersion)' AND '$(RuntimeIdentifier)' == '' " >AnyCPU</PlatformTarget> + <PlatformTarget Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)' AND '$(RuntimeIdentifier)' == '' " >AnyCPU</PlatformTarget> <ApplicationManifest>app.manifest</ApplicationManifest> <RootNamespace>Microsoft.VisualStudio.TestPlatform.CommandLine</RootNamespace> <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers> @@ -27,13 +27,13 @@ $(MSBuildWarningsAsMessages);MSB3276; </MSBuildWarningsAsMessages> </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetNetFxVersion)'"> + <PropertyGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimum)'"> <RuntimeIdentifiers>win7-x64;win10-arm64</RuntimeIdentifiers> </PropertyGroup> <ItemGroup> <EmbeddedResource Include="Resources\Resources.resx" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.IO" /> <Reference Include="System.Runtime" /> diff --git a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj index 17753315d1..feec48e788 100644 --- a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj +++ b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> diff --git a/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj b/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj index daa24cbc97..f6fe543c16 100644 --- a/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj +++ b/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj @@ -11,7 +11,7 @@ <PropertyGroup> <AssemblyName>BlameUnitTestProject</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType> </PropertyGroup> diff --git a/test/TestAssets/CUITTestProject/CUITTestProject.csproj b/test/TestAssets/CUITTestProject/CUITTestProject.csproj index f66d004f92..8d97acd4ab 100644 --- a/test/TestAssets/CUITTestProject/CUITTestProject.csproj +++ b/test/TestAssets/CUITTestProject/CUITTestProject.csproj @@ -12,7 +12,7 @@ <PropertyGroup> <AssemblyName>CUITTestProject</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks> <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType> </PropertyGroup> diff --git a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj index a5bcc5564b..58d5e8bcc6 100644 --- a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj +++ b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj @@ -5,7 +5,7 @@ <PropertyGroup> <AssemblyName>CodeCoverageTest</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> </PropertyGroup> @@ -21,7 +21,7 @@ <Version>$(NETTestSdkVersion)</Version> </PackageReference> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Runtime" /> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> diff --git a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj index e943d1497b..66a22c8791 100644 --- a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj +++ b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj @@ -4,7 +4,7 @@ <PropertyGroup> <AssemblyName>ConsoleManagedApp</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <OutputType>Exe</OutputType> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> diff --git a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj index a499b4f98c..0e564eafd8 100644 --- a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj +++ b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj @@ -3,7 +3,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <IsPackable>false</IsPackable> </PropertyGroup> diff --git a/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj b/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj index 3a474a1188..ab862c9cc9 100644 --- a/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj +++ b/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj @@ -3,7 +3,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFramework>$(TargetNetCoreVersion)</TargetFramework> + <TargetFramework>$(NetCoreAppMinimum)</TargetFramework> <IsPackable>false</IsPackable> </PropertyGroup> diff --git a/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj b/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj index 9a8099af59..242c0ac8ff 100644 --- a/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj +++ b/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj @@ -4,16 +4,16 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|$(TargetNetCoreVersion)|AnyCPU'"> + <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|$(NetCoreAppMinimum)|AnyCPU'"> <DefineConstants>DEBUG;TRACE</DefineConstants> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|$(TargetNetCoreVersion)|AnyCPU'"> + <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|$(NetCoreAppMinimum)|AnyCPU'"> <DefineConstants>DEBUG;TRACE</DefineConstants> <Optimize>false</Optimize> </PropertyGroup> diff --git a/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj b/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj index dc736baf7b..baee136d69 100644 --- a/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj +++ b/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj @@ -12,12 +12,12 @@ <PropertyGroup> <AssemblyName>DisableAppdomainTest1</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks> <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Runtime" /> <Reference Include="Microsoft.CSharp" /> diff --git a/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj b/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj index cc11497dca..6c6e3cca9b 100644 --- a/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj +++ b/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj @@ -12,12 +12,12 @@ <PropertyGroup> <AssemblyName>DisableAppDomainTest2</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks> <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Runtime" /> <Reference Include="Microsoft.CSharp" /> diff --git a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj index cbcf572b5e..e9cefb5852 100644 --- a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj +++ b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj @@ -5,8 +5,8 @@ <PropertyGroup> <AssemblyName>DiscoveryTestProject</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> - <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> + <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCoreAppMinimum)</TargetFrameworks> <PlatformTarget>x64</PlatformTarget> </PropertyGroup> @@ -15,7 +15,7 @@ <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Runtime" /> <Reference Include="System.Windows.Forms" /> </ItemGroup> diff --git a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj index 9f8022f438..2c82df2479 100644 --- a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj +++ b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> diff --git a/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj b/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj index 3513c70f4b..0ff852836c 100644 --- a/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj +++ b/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj @@ -12,11 +12,11 @@ <PropertyGroup> <AssemblyName>EventLogUnitTestProject</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks> <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Runtime" /> <Reference Include="Microsoft.CSharp" /> diff --git a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj index fd6123da6e..37d46cd471 100644 --- a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj +++ b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj @@ -8,7 +8,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> <OutputType>library</OutputType> - <TargetFramework>$(TargetNetFxVersion)</TargetFramework> + <TargetFramework>$(NetFrameworkMinimum)</TargetFramework> <AssemblyName>LegacySettingsUnitTestProject</AssemblyName> </PropertyGroup> <ItemGroup> diff --git a/test/TestAssets/MSTestProject1/MSTestProject1.csproj b/test/TestAssets/MSTestProject1/MSTestProject1.csproj index 8de654950a..fe08afb0c3 100644 --- a/test/TestAssets/MSTestProject1/MSTestProject1.csproj +++ b/test/TestAssets/MSTestProject1/MSTestProject1.csproj @@ -3,7 +3,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> <LangVersion>Preview</LangVersion> @@ -20,7 +20,7 @@ <Version>$(NETTestSdkVersion)</Version> </PackageReference> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Runtime" /> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> diff --git a/test/TestAssets/MSTestProject2/MSTestProject2.csproj b/test/TestAssets/MSTestProject2/MSTestProject2.csproj index 8de654950a..fe08afb0c3 100644 --- a/test/TestAssets/MSTestProject2/MSTestProject2.csproj +++ b/test/TestAssets/MSTestProject2/MSTestProject2.csproj @@ -3,7 +3,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> <LangVersion>Preview</LangVersion> @@ -20,7 +20,7 @@ <Version>$(NETTestSdkVersion)</Version> </PackageReference> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Runtime" /> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj index 6c2a077d11..19c9ff6f86 100644 --- a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj +++ b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj @@ -9,7 +9,7 @@ <PropertyGroup> <OutputType>library</OutputType> - <TargetFramework>$(TargetNetFxVersion)</TargetFramework> + <TargetFramework>$(NetFrameworkMinimum)</TargetFramework> <AssemblyName>MstestV1UnitTestProject</AssemblyName> </PropertyGroup> <ItemGroup> diff --git a/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj b/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj index 533e02812b..846b1e52a6 100644 --- a/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj +++ b/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj @@ -4,11 +4,11 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);net47;net471;net472;net48</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);net47;net471;net472;net48</TargetFrameworks> <TestProject>true</TestProject> <IsTestProject>true</IsTestProject> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|$(TargetNetFxVersion)|AnyCPU'"> + <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|$(NetFrameworkMinimum)|AnyCPU'"> <DefineConstants>TRACE</DefineConstants> </PropertyGroup> diff --git a/test/TestAssets/NUTestProject/NUTestProject.csproj b/test/TestAssets/NUTestProject/NUTestProject.csproj index a45aa6bb32..26c521d1c8 100644 --- a/test/TestAssets/NUTestProject/NUTestProject.csproj +++ b/test/TestAssets/NUTestProject/NUTestProject.csproj @@ -4,7 +4,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> <AssemblyName>NUTestProject</AssemblyName> diff --git a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj index d0689f553f..852efd73fc 100644 --- a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj +++ b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj @@ -11,12 +11,12 @@ <PropertyGroup> <AssemblyName>NewtonSoftDependency</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks> <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System" /> <Reference Include="System.Runtime" /> <Reference Include="Microsoft.CSharp" /> diff --git a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj index 03f0f11dfc..a9d3be5a17 100644 --- a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj +++ b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj @@ -1,6 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> <Version>15.0.0.0</Version> diff --git a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj index 684f5d8c5f..f45d8aeb02 100644 --- a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj +++ b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj @@ -5,7 +5,7 @@ <PropertyGroup> <AssemblyName>ParametrizedTestProject</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> </PropertyGroup> @@ -21,7 +21,7 @@ <Version>$(NETTestSdkVersion)</Version> </PackageReference> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Runtime" /> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> diff --git a/test/TestAssets/PerfTestProject/PerfTestProject.csproj b/test/TestAssets/PerfTestProject/PerfTestProject.csproj index b38b2ab663..2b3e0c4f86 100644 --- a/test/TestAssets/PerfTestProject/PerfTestProject.csproj +++ b/test/TestAssets/PerfTestProject/PerfTestProject.csproj @@ -7,16 +7,16 @@ </PropertyGroup> <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.Settings.targets" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType> <CheckEolTargetFramework>false</CheckEolTargetFramework> <AssemblyName>PerfTestProject</AssemblyName> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == '$(TargetNetCoreVersion)' "> + <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetCoreAppMinimum)' "> <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)'"> + <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)'"> <DebugType>full</DebugType> </PropertyGroup> <ItemGroup> diff --git a/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj b/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj index 1753dec764..3db45c0384 100644 --- a/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj +++ b/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj @@ -4,7 +4,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> <PlatformTarget>x64</PlatformTarget> @@ -15,7 +15,7 @@ <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Runtime" /> <Reference Include="System.Windows.Forms" /> </ItemGroup> diff --git a/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj b/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj index da7ef9caac..19bed3f6e4 100644 --- a/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj +++ b/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj @@ -3,7 +3,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppMinimum)</TargetFrameworks> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <IsPackable>false</IsPackable> </PropertyGroup> diff --git a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj index dd0f34f660..15e1008390 100644 --- a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj +++ b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj @@ -3,8 +3,8 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> - <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> + <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCoreAppMinimum)</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> </PropertyGroup> @@ -18,10 +18,10 @@ <PropertyGroup Condition="$(NetCoreAppTargetFramework) == 'true' and $(Configuration) == 'Release'"> <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' and $(Configuration) == 'Debug'"> + <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' and $(Configuration) == 'Debug'"> <DebugType>full</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' and $(Configuration) == 'Release'"> + <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' and $(Configuration) == 'Release'"> <DebugType>portable</DebugType> </PropertyGroup> </Project> diff --git a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj index b7b3853460..136f4a13bd 100644 --- a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj +++ b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj @@ -10,7 +10,7 @@ <Version>15.0.0.0</Version> <FileVersion>15.0.0.0</FileVersion> <ProductVersion>15.0.0.0</ProductVersion> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> <WarningsAsErrors>true</WarningsAsErrors> diff --git a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj index 61734ec351..2b277d6ac0 100644 --- a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj +++ b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj @@ -5,7 +5,7 @@ <PropertyGroup> <AssemblyName>SimpleTestProject</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> </PropertyGroup> @@ -21,7 +21,7 @@ <Version>$(NETTestSdkVersion)</Version> </PackageReference> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Runtime" /> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> diff --git a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj index 1e7c285f67..d145a83118 100644 --- a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj +++ b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj @@ -12,7 +12,7 @@ <PropertyGroup> <AssemblyName>SimpleTestProject2</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> <OutputType Condition="$(NetCoreAppTargetFrameWork) == 'true' ">Exe</OutputType> @@ -24,7 +24,7 @@ <PropertyGroup Condition="$(NetCoreAppTargetFrameWork) == 'true' "> <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)'"> + <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)'"> <DebugType>full</DebugType> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> diff --git a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj index 43edbdd780..460854d2ac 100644 --- a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj +++ b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj @@ -4,7 +4,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> <OutputType Condition="$(NetCoreAppTargetFrameWork) == 'true' ">Exe</OutputType> @@ -16,11 +16,11 @@ <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <Reference Include="System.Runtime" /> <Reference Include="System.Windows.Forms" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <PackageReference Include="System.Memory" Version="4.5.3"/> </ItemGroup> <ItemGroup> diff --git a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj b/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj index f77b04d899..1816e33c2e 100644 --- a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj +++ b/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj @@ -13,7 +13,7 @@ <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> <AssemblyName>SimpleTestProjectARM</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> <OutputType Condition="$(NetCoreAppTargetFrameWork) == 'true' ">Exe</OutputType> diff --git a/test/TestAssets/SimpleTestProjectMessedUpTargetFramework/SimpleTestProjectMessedUpTargetFramework.csproj b/test/TestAssets/SimpleTestProjectMessedUpTargetFramework/SimpleTestProjectMessedUpTargetFramework.csproj index 7bfa841924..f8298df87f 100644 --- a/test/TestAssets/SimpleTestProjectMessedUpTargetFramework/SimpleTestProjectMessedUpTargetFramework.csproj +++ b/test/TestAssets/SimpleTestProjectMessedUpTargetFramework/SimpleTestProjectMessedUpTargetFramework.csproj @@ -4,7 +4,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppMinimum)</TargetFrameworks> <TestProject>true</TestProject> <IsTestProject>true</IsTestProject> </PropertyGroup> diff --git a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj index 115c0b7d7c..02618593ad 100644 --- a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj +++ b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj @@ -13,7 +13,7 @@ <PropertyGroup> <AssemblyName>SimpleTestProjectx86</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> <OutputType Condition="$(NetCoreAppTargetFrameWork) == 'true' ">Exe</OutputType> diff --git a/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj b/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj index 9a9b385b4e..9dc8f440ba 100644 --- a/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj +++ b/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj @@ -12,18 +12,18 @@ </PropertyGroup> <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> - <OutputType Condition=" '$(TargetFramework)' != '$(TargetNetFxVersion)' ">Exe</OutputType> + <OutputType Condition=" '$(TargetFramework)' != '$(NetFrameworkMinimum)' ">Exe</OutputType> <AssemblyName>XUPerfTestProject</AssemblyName> <SignAssembly>false</SignAssembly> <PublicSign>false</PublicSign> <DelaySign>false</DelaySign> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' != '$(TargetNetFxVersion)' "> + <PropertyGroup Condition=" '$(TargetFramework)' != '$(NetFrameworkMinimum)' "> <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == '$(TargetNetFxVersion)' "> + <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' "> <DebugType>full</DebugType> </PropertyGroup> <ItemGroup> diff --git a/test/TestAssets/XUTestProject/XUTestProject.csproj b/test/TestAssets/XUTestProject/XUTestProject.csproj index 8c54e75c2c..ec49c45948 100644 --- a/test/TestAssets/XUTestProject/XUTestProject.csproj +++ b/test/TestAssets/XUTestProject/XUTestProject.csproj @@ -4,7 +4,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> <AssemblyName>XUTestProject</AssemblyName> - <TargetFrameworks>$(TargetNetFxVersion);$(TargetNetCoreVersion)</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> </PropertyGroup> diff --git a/test/TestAssets/child-hang/child-hang.csproj b/test/TestAssets/child-hang/child-hang.csproj index fd2070c4b2..2ffa0eb1eb 100644 --- a/test/TestAssets/child-hang/child-hang.csproj +++ b/test/TestAssets/child-hang/child-hang.csproj @@ -8,7 +8,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);net472;net48;$(TargetNetCoreVersion);net7.0;net6.0;net5.0</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net7.0;net6.0;net5.0</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <RootNamespace>child_hang</RootNamespace> <IsPackable>false</IsPackable> diff --git a/test/TestAssets/crash/crash.csproj b/test/TestAssets/crash/crash.csproj index 1cf0041859..a58fc73ce0 100644 --- a/test/TestAssets/crash/crash.csproj +++ b/test/TestAssets/crash/crash.csproj @@ -8,7 +8,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);net472;net48;$(TargetNetCoreVersion);net7.0;net6.0;net5.0</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net7.0;net6.0;net5.0</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework> diff --git a/test/TestAssets/timeout/timeout.csproj b/test/TestAssets/timeout/timeout.csproj index 4f9b22714d..59f1ed9f46 100644 --- a/test/TestAssets/timeout/timeout.csproj +++ b/test/TestAssets/timeout/timeout.csproj @@ -9,7 +9,7 @@ <Import Project="..\..\..\scripts\build\TestAssets.props" /> <PropertyGroup> - <TargetFrameworks>$(TargetNetFxVersion);net472;net48;$(TargetNetCoreVersion);net7.0;net6.0;net5.0</TargetFrameworks> + <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net7.0;net6.0;net5.0</TargetFrameworks> <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks> <CheckEolTargetFramework>false</CheckEolTargetFramework>