Skip to content

Commit a51efde

Browse files
committed
Remove .NET 8 TFM from all projects
1 parent 8b94722 commit a51efde

File tree

17 files changed

+18
-30
lines changed

17 files changed

+18
-30
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,14 @@ jobs:
3434

3535
# Test solution #
3636

37-
# Run .NET 8 unit tests
37+
# Run .NET 8 unit tests
3838
- script: dotnet test --no-build -c $(Build.Configuration) -f net8.0 -l "trx;LogFileName=VSTestResults_net8.0.trx"
3939
displayName: Run .NET 8 unit tests
4040

4141
# Run .NET 7 unit tests
4242
- script: dotnet test --no-build -c $(Build.Configuration) -f net7.0 -l "trx;LogFileName=VSTestResults_net7.0.trx"
4343
displayName: Run .NET 7 unit tests
4444

45-
# Run .NET 6 unit tests
46-
- script: dotnet test --no-build -c $(Build.Configuration) -f net6.0 -l "trx;LogFileName=VSTestResults_net6.0.trx"
47-
displayName: Run .NET 6 unit tests
48-
4945
# Run .NET Framework 4.7.2 unit tests
5046
- script: dotnet test --no-build -c $(Build.Configuration) -f net472 -l "trx;LogFileName=VSTestResults_net472.trx"
5147
displayName: Run .NET Framework 4.7.2 unit tests

src/CommunityToolkit.Common/CommunityToolkit.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>

src/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>

src/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>

src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.FeatureSwitches.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
<!--
1717
Configuration for the feature switches (to support IL trimming).
1818
See the 'ILLink.Substitutions.xml' file for more details on that.
19-
We only include these on .NET 6 and above (no .xml file otherwise).
19+
We only include these on .NET 8 and above (no .xml file otherwise).
2020
-->
21-
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
21+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
2222

2323
<!-- MVVMTOOLKIT_ENABLE_INOTIFYPROPERTYCHANGING_SUPPORT switch -->
2424
<RuntimeHostConfigurationOption Include="MVVMTOOLKIT_ENABLE_INOTIFYPROPERTYCHANGING_SUPPORT"

src/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0;net8.0-windows10.0.17763.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net8.0-windows10.0.17763.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<!--
@@ -55,7 +55,7 @@
5555
</ItemGroup>
5656

5757
<!-- Include the ILLink file (to properly trim configuration switches in publish builds) -->
58-
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
58+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
5959
<EmbeddedResource Include="Properties\ILLink.Substitutions.xml" LogicalName="ILLink.Substitutions.xml" />
6060
</ItemGroup>
6161

src/Directory.Build.targets

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
88
</PropertyGroup>
99

10-
<!-- Configure trimming for projects on .NET 6 and above -->
11-
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
12-
<IsTrimmable>true</IsTrimmable>
13-
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
14-
<EnableAotAnalyzer>true</EnableAotAnalyzer>
15-
<EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
16-
</PropertyGroup>
17-
1810
<!-- Set the AOT property directly on .NET 8 and above -->
1911
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
2012
<IsAotCompatible>true</IsAotCompatible>

tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net7.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net7.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net7.0;net8.0</TargetFrameworks>
55
<EnablePreviewFeatures>true</EnablePreviewFeatures>
66
<NoWarn>$(NoWarn);CA2252</NoWarn>
77
</PropertyGroup>

0 commit comments

Comments
 (0)