Skip to content

Commit 792ade5

Browse files
author
Timothy Mothra
authored
Refactor test frameworks (#2699)
1 parent 4394cd0 commit 792ade5

File tree

15 files changed

+45
-17
lines changed

15 files changed

+45
-17
lines changed

‎.props/Test.props‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,17 @@
1919
- net6.0 (EoL Nov 2024)
2020
- net7.0 (GA Nov 2022)
2121
-->
22-
<TargetFrameworks>net462;net472;net480;net481;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
23-
<TargetFrameworks Condition="$(OS) != 'Windows_NT'">netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
22+
23+
<SupportedFrameworks_NetCore>net7.0;net6.0;netcoreapp3.1;</SupportedFrameworks_NetCore>
24+
<SupportedFrameworks_NetFx Condition="$(OS) == 'Windows_NT'">net481;net480;net472;</SupportedFrameworks_NetFx>
25+
<LegacyFrameworks_NetFx Condition="$(OS) == 'Windows_NT'">net462;net46;net452;</LegacyFrameworks_NetFx>
26+
27+
<TargetFrameworks>$(SupportedFrameworks_NetCore)$(SupportedFrameworks_NetFx)</TargetFrameworks>
28+
<TargetFrameworks_WithLegacy>$(SupportedFrameworks_NetCore)$(SupportedFrameworks_NetFx)$(LegacyFrameworks_NetFx)</TargetFrameworks_WithLegacy>
29+
<TargetFrameworks_NetCoreOnly>$(SupportedFrameworks_NetCore)</TargetFrameworks_NetCoreOnly>
30+
<TargetFrameworks_NetFrameworkOnly>$(SupportedFrameworks_NetFx)$(LegacyFrameworks_NetFx)</TargetFrameworks_NetFrameworkOnly>
31+
32+
<TargetFrameworks_LatestNetFramework>net481</TargetFrameworks_LatestNetFramework>
2433
</PropertyGroup>
2534

2635
<PropertyGroup>

‎BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
<PropertyGroup>
55
<!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
6-
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">net452;net46;net461;$(TargetFrameworks)</TargetFrameworks>
6+
<TargetFrameworks>$(TargetFrameworks_WithLegacy)</TargetFrameworks>
7+
78
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
89
</PropertyGroup>
910

‎BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33

44
<PropertyGroup>
55
<!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
6+
<TargetFrameworks>$(TargetFrameworks_LatestNetFramework)</TargetFrameworks>
7+
68
<ProjectGuid>{21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC}</ProjectGuid>
7-
<TargetFrameworks>net480</TargetFrameworks>
89
<AssemblyName>TelemetryChannel.Nuget.Tests</AssemblyName>
910
</PropertyGroup>
1011

‎BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
6-
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">net452;net46;net461;$(TargetFrameworks)</TargetFrameworks>
6+
<TargetFrameworks>$(TargetFrameworks_WithLegacy)</TargetFrameworks>
77

88
<AssemblyName>Microsoft.ApplicationInsights.TelemetryChannel.Tests</AssemblyName>
99
</PropertyGroup>

‎NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$(PropsRoot)\Test.props" />
33

4+
45
<PropertyGroup>
6+
<!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
7+
<TargetFrameworks>$(TargetFrameworks_NetCoreOnly)</TargetFrameworks>
8+
59
<VersionPrefix>2.0.0</VersionPrefix>
6-
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
710
<PreserveCompilationContext>true</PreserveCompilationContext>
811
<AssemblyName>FunctionalTests.MVC.Tests</AssemblyName>
912
<PackageId>FunctionalTests.MVC.Tests</PackageId>

‎NETCORE/test/FunctionalTests.Utils/FunctionalTests.Utils.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<Import Project="$(PropsRoot)\Test.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
5+
<!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
6+
<TargetFrameworks>$(TargetFrameworks_NetCoreOnly)</TargetFrameworks>
7+
68
<PreserveCompilationContext>true</PreserveCompilationContext>
79
<AssemblyName>FunctionalTests.Utils</AssemblyName>
810
<PackageId>FunctionalTests.Utils</PackageId>

‎NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<Import Project="$(PropsRoot)\Test.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
5+
<!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
6+
<TargetFrameworks>$(TargetFrameworks_NetCoreOnly)</TargetFrameworks>
7+
68
<AssemblyName>FunctionalTests.WebApi.Tests</AssemblyName>
79
<PackageId>FunctionalTests.WebApi.Tests</PackageId>
810
</PropertyGroup>

‎NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
-->
1111

1212
<PropertyGroup>
13-
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
13+
<!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
14+
<TargetFrameworks>$(TargetFrameworks_NetCoreOnly)</TargetFrameworks>
1415
</PropertyGroup>
1516

1617
<ItemGroup>
@@ -32,6 +33,10 @@
3233
</None>
3334
</ItemGroup>
3435

36+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
37+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.*-*,8.0)" />
38+
</ItemGroup>
39+
3540
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
3641
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0" />
3742
</ItemGroup>

‎NETCORE/test/IntegrationTests.WebApp/IntegrationTests.WebApp.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<Import Project="$(PropsRoot)\Test.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
5+
<!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
6+
<TargetFrameworks>$(TargetFrameworks_NetCoreOnly)</TargetFrameworks>
67
</PropertyGroup>
78

89
<ItemGroup>

‎NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
6-
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
6+
<TargetFrameworks>$(TargetFrameworks_NetCoreOnly)</TargetFrameworks>
77
</PropertyGroup>
88

99
<ItemGroup>

0 commit comments

Comments
 (0)