Skip to content

Commit

Permalink
Refactor supported TFMs names (#3973)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Evangelink
Evangelink authored Aug 26, 2022
1 parent 48aade0 commit c37fde3
Show file tree
Hide file tree
Showing 72 changed files with 136 additions and 135 deletions.
5 changes: 3 additions & 2 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion playground/TestPlatform.Playground/TestPlatform.Playground.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\Microsoft.TestPlatform.TestHostProvider\bin\$(Configuration)\$(TargetNetFxVersion)\ $(TargetDir)\vstest.console\Extensions\&#xD;&#xA;REM copy net462, net47, net471, net472 and net48 testhosts&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\$(TargetNetFxVersion)\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\$(TargetNetFxVersion)\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net47\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net47\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net471\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net471\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net472\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net472\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net48\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;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\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\Microsoft.TestPlatform.TestHostProvider\bin\$(Configuration)\$(NetFrameworkMinimum)\ $(TargetDir)\vstest.console\Extensions\&#xD;&#xA;REM copy net462, net47, net471, net472 and net48 testhosts&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\$(NetFrameworkMinimum)\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\$(NetFrameworkMinimum)\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net47\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net47\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net471\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net471\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net472\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net472\win7-x64 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;xcopy /i /y /f $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net48\win7-x86 $(TargetDir)\vstest.console\TestHostNetFramework\&#xD;&#xA;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>
4 changes: 2 additions & 2 deletions samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...tPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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" />
Expand Down
8 changes: 4 additions & 4 deletions samples/UnitTestProject/UnitTestProject.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions scripts/build/TestAssets.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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' "/>
Expand Down
2 changes: 1 addition & 1 deletion src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/DataCollectors/DumpMinitool/DumpMinitool.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...m.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions ....TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions ...ft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions ...soft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
Loading

0 comments on commit c37fde3

Please sign in to comment.