Skip to content

Commit c5e9c02

Browse files
committed
Remove NET6/NET7 and add NET10
1 parent 4675f05 commit c5e9c02

File tree

2 files changed

+138
-272
lines changed

2 files changed

+138
-272
lines changed

Directory.Build.props

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,28 @@
4141
<NoWarn Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">$(NoWarn);SYSLIB0011</NoWarn>
4242
<!-- Enable Usage of BinaryFormatter in test projects -->
4343
<EnableUnsafeBinaryFormatterSerialization
44-
Condition="'$(TargetFramework)'=='net8.0' AND $(MSBuildProjectName.Contains('Tests')) == 'true'">true</EnableUnsafeBinaryFormatterSerialization>
44+
Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">true</EnableUnsafeBinaryFormatterSerialization>
45+
</PropertyGroup>
46+
47+
<!-- Debug-NET10, Release-NET10 are mostly for development convenience -->
48+
<PropertyGroup Condition = "$(Configuration.Contains('NET10')) == 'true'">
49+
<!-- hard binding to net10, no property and env variable allowed-->
50+
<TargetFrameworks>net10.0</TargetFrameworks>
4551
</PropertyGroup>
4652

4753
<!-- Debug-NET8, Release-NET8 are mostly for development convenience -->
4854
<PropertyGroup Condition = "$(Configuration.Contains('NET8')) == 'true'">
4955
<!-- hard binding to net8, no property and env variable allowed-->
5056
<TargetFrameworks>net8.0</TargetFrameworks>
5157
</PropertyGroup>
52-
53-
<!-- Debug-NET7, Release-NET7 are mostly for development convenience -->
54-
<PropertyGroup Condition = "$(Configuration.Contains('NET7')) == 'true'">
55-
<!-- hard binding to net7, no property and env variable allowed-->
56-
<TargetFrameworks>net7.0</TargetFrameworks>
57-
</PropertyGroup>
58-
59-
<!-- Debug-NET6, Release-NET6 are mostly for development convenience -->
60-
<PropertyGroup Condition = "$(Configuration.Contains('NET6')) == 'true'">
61-
<!-- hard binding to net6, no property and env variable allowed -->
62-
<TargetFrameworks>net6.0</TargetFrameworks>
63-
</PropertyGroup>
6458

6559
<!--Release and Debug are for final builds, builds on build server, etc. Target frameworks are configurable here -->
6660
<PropertyGroup Label="Defaults"
67-
Condition="$(Configuration.Contains('NET8')) == 'false' AND $(Configuration.Contains('NET7')) == 'false' AND $(Configuration.Contains('NET6')) == 'false'">
61+
Condition="$(Configuration.Contains('NET10')) == 'false' AND $(Configuration.Contains('NET8')) == 'false'">
6862
<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
6963
<TargetFrameworks>$(TargetFrameworks)</TargetFrameworks> <!-- the property -->
7064
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">$(DO_TargetFrameworks)</TargetFrameworks> <!-- env var -->
71-
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net8.0;net7.0;net6.0</TargetFrameworks> <!-- fallback to default -->
65+
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net8.0;net10.0</TargetFrameworks> <!-- fallback to default -->
7266
</PropertyGroup>
7367

7468
<PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">
@@ -100,7 +94,7 @@
10094
<ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
10195
<ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(TargetFramework)\$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
10296
<OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
103-
<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
97+
<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
10498
</PropertyGroup>
10599

106100
<!-- Populate standard properties. -->

0 commit comments

Comments
 (0)