Skip to content

Commit 73c4601

Browse files
dmillerdmiller
committed
CLJCLR-187: Include .NET 10 as a target framework
1 parent deada78 commit 73c4601

File tree

10 files changed

+35
-27
lines changed

10 files changed

+35
-27
lines changed

‎Clojure/Clojure.Compile/Clojure.Compile.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net462;net481;net9.0</TargetFrameworks>
6-
<LangVersion>12.0</LangVersion>
5+
<TargetFrameworks>net462;net481;net9.0;net10.0</TargetFrameworks>
6+
<LangVersion>14.0</LangVersion>
77
<StartupObject>BootstrapCompile.Compile</StartupObject>
88
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
9+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
910
</PropertyGroup>
1011

1112
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -24,7 +25,7 @@
2425
</ItemGroup>
2526

2627

27-
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'net9.0' ">
28+
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0'">
2829
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net481' ">
2930
<TargetCmdline Condition=" $(TargetCmdline) == '' ">$(TargetPath)</TargetCmdline>
3031
<TargetCmdline Condition=" '$(OS)' == 'Unix' ">mono $(TargetPath)</TargetCmdline>

‎Clojure/Clojure.Main/Clojure.Main.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
6-
<LangVersion>12.0</LangVersion>
5+
<TargetFrameworks>net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
6+
<LangVersion>14.0</LangVersion>
77
<StartupObject>Clojure.CljMain</StartupObject>
88
<PackAsTool>true</PackAsTool>
99
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
10+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
1011
</PropertyGroup>
1112

1213
<PropertyGroup>

‎Clojure/Clojure.Main461/Clojure.Main461.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net462;net481</TargetFrameworks>
6-
<LangVersion>12.0</LangVersion>
5+
<TargetFrameworks>net462;net481;net9.0;net10.0</TargetFrameworks>
6+
<LangVersion>14.0</LangVersion>
77
<StartupObject>Clojure.CljMain</StartupObject>
88
<PackAsTool>true</PackAsTool>
99
</PropertyGroup>

‎Clojure/Clojure.Samples/Clojure.Samples.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net462;net481;net6.0;net8.0;net9.0</TargetFrameworks>
5-
4+
<TargetFrameworks>net462;net481;net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
5+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
66
</PropertyGroup>
77

88
<ItemGroup>

‎Clojure/Clojure.Source/Clojure.Source.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net462;net481;net6.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net481;net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<RootNamespace></RootNamespace>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
7+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
78
</PropertyGroup>
89

910
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

‎Clojure/Clojure.Tests.Support/Clojure.Tests.Support.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0;net9.0;net462;net481</TargetFrameworks>
5-
<LangVersion>12.0</LangVersion>
4+
<TargetFrameworks>net6.0;net8.0;net9.0;net10.0;net462;net481</TargetFrameworks>
5+
<LangVersion>14.0</LangVersion>
6+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
67
</PropertyGroup>
78

89
<ItemGroup>

‎Clojure/Clojure.Tests/Clojure.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0;net9.0;net462;net481</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0;net9.0;net10.0;net462;net481</TargetFrameworks>
55
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
6+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
67
</PropertyGroup>
78

89
<ItemGroup>
@@ -279,13 +280,13 @@
279280

280281
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
281282
<PackageReference Include="System.Runtime.Serialization.Formatters">
282-
<Version>9.0.8</Version>
283+
<Version>9.0.10</Version>
283284
</PackageReference>
284285
</ItemGroup>
285286

286287
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
287288
<PackageReference Include="System.Runtime.Serialization.Formatters">
288-
<Version>9.0.8</Version>
289+
<Version>9.0.10</Version>
289290
</PackageReference>
290291
</ItemGroup>
291292

‎Clojure/Clojure/Clojure.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0;net9.0;net462;net481</TargetFrameworks>
5-
<LangVersion>12.0</LangVersion>
4+
<TargetFrameworks>net6.0;net8.0;net9.0;net10.0;net462;net481</TargetFrameworks>
5+
<LangVersion>14.0</LangVersion>
66
<NeutralLanguage></NeutralLanguage>
77
<RootNamespace>clojure.lang</RootNamespace>
88
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
9+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
910
</PropertyGroup>
1011

1112
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -22,7 +23,7 @@
2223
<PackageReference Include="clojure.spec.alpha" Version="0.5.238" />
2324
<PackageReference Include="clojure.tools.reader" Version="1.5.0" />
2425
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.5" />
25-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.10" />
2627
</ItemGroup>
2728

2829
<ItemGroup>
@@ -31,8 +32,8 @@
3132
</EmbeddedResource>
3233
</ItemGroup>
3334

34-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' ">
35-
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.3" />
35+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0' ">
36+
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.10" />
3637
</ItemGroup>
3738

3839

‎Clojure/ConsoleApp1/ConsoleApp1.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
8+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
89
</PropertyGroup>
910

1011
<ItemGroup>

‎Clojure/Csharp.Tests/Csharp.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
5-
<LangVersion>12.0</LangVersion>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
5+
<LangVersion>14.0</LangVersion>
66
<IsPackable>false</IsPackable>
77
<IsTestProject>true</IsTestProject>
8+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
89
</PropertyGroup>
910

1011
<ItemGroup>
1112
<PackageReference Include="clojure.core.specs.alpha" Version="0.4.74" />
1213
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.5" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
14-
<PackageReference Include="NExpect" Version="2.0.116" />
15-
<PackageReference Include="NUnit" Version="4.3.2" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
15+
<PackageReference Include="NExpect" Version="2.0.123" />
16+
<PackageReference Include="NUnit" Version="4.4.0" />
17+
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0">
1718
<PrivateAssets>all</PrivateAssets>
1819
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1920
</PackageReference>

0 commit comments

Comments
 (0)