Skip to content

Commit 3edff47

Browse files
dmillerdmiller
committed
Update all projects and build steps to work with .NET 11 (preview).
1 parent 42a137a commit 3edff47

File tree

11 files changed

+64
-29
lines changed

11 files changed

+64
-29
lines changed

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

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net462;net481;net9.0;net10.0</TargetFrameworks>
5+
<TargetFrameworks>net462;net481;net9.0;net10.0;net11.0</TargetFrameworks>
66
<LangVersion>14.0</LangVersion>
77
<StartupObject>BootstrapCompile.Compile</StartupObject>
88
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
@@ -25,27 +25,27 @@
2525
</ItemGroup>
2626

2727

28-
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0'">
28+
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0' OR '$(TargetFramework)' == 'net11.0'">
2929
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net481' ">
3030
<TargetCmdline Condition=" $(TargetCmdline) == '' ">$(TargetPath)</TargetCmdline>
3131
<TargetCmdline Condition=" '$(OS)' == 'Unix' ">mono $(TargetPath)</TargetCmdline>
3232
</PropertyGroup>
33-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0'">
33+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0' OR '$(TargetFramework)' == 'net11.0'">
3434
<TargetCmdline Condition=" $(TargetCmdline) == '' ">$(TargetDir)$(TargetName).exe</TargetCmdline>
3535
<TargetCmdline Condition=" '$(OS)' == 'Unix' ">mono $(TargetPath)</TargetCmdline>
3636
</PropertyGroup>
3737
<Message Importance="high" Text="TargetCmdLine = '$(TargetCmdLine)'"/>
3838
<Exec Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net481'" Command="$(TargetCmdline) clojure.core clojure.core.protocols clojure.core.server clojure.core.reducers clojure.main clojure.set clojure.zip clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect clojure.edn clojure.datafy clojure.instant clojure.uuid clojure.math clojure.clr.basis.impl clojure.clr.basis clojure.clr.process clojure.tools.deps.interop clojure.repl.deps" WorkingDirectory="$(OutDir)" />
39-
<Exec Condition=" '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0'" Command="$(TargetCmdline) clojure.core clojure.core.protocols clojure.core.server clojure.core.reducers clojure.main clojure.set clojure.zip clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect clojure.edn clojure.datafy clojure.instant clojure.uuid clojure.math clojure.clr.basis.impl clojure.clr.basis clojure.clr.process clojure.tools.deps.interop clojure.repl.deps" WorkingDirectory="$(OutDir)" />
39+
<Exec Condition=" '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0' OR '$(TargetFramework)' == 'net11.0'" Command="$(TargetCmdline) clojure.core clojure.core.protocols clojure.core.server clojure.core.reducers clojure.main clojure.set clojure.zip clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect clojure.edn clojure.datafy clojure.instant clojure.uuid clojure.math clojure.clr.basis.impl clojure.clr.basis clojure.clr.process clojure.tools.deps.interop clojure.repl.deps" WorkingDirectory="$(OutDir)" />
4040
<ItemGroup>
4141
<CljCoreBin Include="$(ProjectDir)$(OutDir)clojure*.dll" />
4242
</ItemGroup>
4343
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\$(OutDir)" Condition=" '$(TargetFramework)' == 'net462' "/>
4444
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\Content\$(OutDir)" Condition=" '$(TargetFramework)' == 'net462' "/>
4545
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\$(OutDir)" Condition=" '$(TargetFramework)' == 'net481' "/>
4646
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\Content\$(OutDir)" Condition=" '$(TargetFramework)' == 'net481' "/>
47-
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main\$(OutDir)" Condition=" '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0'"/>
48-
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main\Content\$(OutDir)" Condition=" '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0'"/>
47+
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main\$(OutDir)" Condition=" '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0' OR '$(TargetFramework)' == 'net11.0'"/>
48+
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main\Content\$(OutDir)" Condition=" '$(TargetFramework)' == 'net9.0' OR '$(TargetFramework)' == 'net10.0' OR '$(TargetFramework)' == 'net11.0'"/>
4949
</Target>
5050

5151

‎Clojure/Clojure.Compile/Compile.cs‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
* Author: David Miller
1313
**/
1414

15+
using clojure.lang;
1516
using System;
1617
using System.Diagnostics;
1718
using System.IO;
18-
using clojure.lang;
19+
using System.Runtime.InteropServices;
1920

2021
namespace BootstrapCompile
2122
{
@@ -37,7 +38,7 @@ static void Main(string[] args)
3738

3839
path = path ?? ".";
3940

40-
string warnVal = Environment.GetEnvironmentVariable(REFLECTION_WARNING_PROP);
41+
string warnVal = Environment.GetEnvironmentVariable(REFLECTION_WARNING_PROP);
4142
bool warnOnReflection = warnVal == null ? false : warnVal.Equals("true");
4243
string mathVal = Environment.GetEnvironmentVariable(UNCHECKED_MATH_PROP);
4344
object uncheckedMath = false;
@@ -46,18 +47,20 @@ static void Main(string[] args)
4647
uncheckedMath = true;
4748
else if ("warn-on-boxed".Equals(mathVal))
4849
uncheckedMath = Keyword.intern("warn-on-boxed");
49-
50+
5051

5152
// Force load to avoid transitive compilation during lazy load
5253
Compiler.EnsureMacroCheck();
5354

5455
#if NETFRAMEWORK
55-
Console.WriteLine("BootstrapCompile: .NET Framework detected.");
56+
//Console.WriteLine("BootstrapCompile: .NET Framework detected.");
5657
var which = "Framework";
5758
#else
58-
Console.WriteLine("BootstrapCompile: .NET Core detected.");
59+
//Console.WriteLine("BootstrapCompile: .NET Core detected.");
5960
var which = "Core";
6061
#endif
62+
Console.WriteLine($"Runtime: {RuntimeInformation.FrameworkDescription}");
63+
Console.WriteLine($"CLR Version: {Environment.Version}");
6164

6265
try
6366
{
@@ -89,18 +92,19 @@ static void Main(string[] args)
8992
finally
9093
{
9194
Var.popThreadBindings();
92-
try {
95+
try
96+
{
9397
outTW.Flush();
9498
}
95-
catch ( IOException e)
99+
catch (IOException e)
96100
{
97101
errTW.WriteLine(e.StackTrace);
98102
errTW.Flush();
99103
}
100104
}
101105

102-
103-
106+
107+
104108
}
105109
}
106110
}

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

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
66
<LangVersion>14.0</LangVersion>
77
<StartupObject>Clojure.CljMain</StartupObject>
88
<PackAsTool>true</PackAsTool>

‎Clojure/Clojure.Samples/Clojure.Samples.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>net462;net481;net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net481;net6.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
55
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
66
</PropertyGroup>
77

‎Clojure/Clojure.Source/Clojure.Source.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>net462;net481;net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net481;net6.0;net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
55
<RootNamespace></RootNamespace>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
77
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>

‎Clojure/Clojure.Tests.Support/Clojure.Tests.Support.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>net6.0;net8.0;net9.0;net10.0;net462;net481</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0;net9.0;net10.0;net11.0;net462;net481</TargetFrameworks>
55
<LangVersion>14.0</LangVersion>
66
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
77
</PropertyGroup>

‎Clojure/Clojure.Tests/Clojure.Tests.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>net6.0;net8.0;net9.0;net10.0;net462;net481</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0;net9.0;net10.0;net11.0;net462;net481</TargetFrameworks>
55
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
66
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
77
</PropertyGroup>

‎Clojure/Clojure/Clojure.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>net6.0;net8.0;net9.0;net10.0;net462;net481</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0;net9.0;net10.0;net11.0;net462;net481</TargetFrameworks>
55
<LangVersion>14.0</LangVersion>
66
<NeutralLanguage></NeutralLanguage>
77
<RootNamespace>clojure.lang</RootNamespace>

‎Clojure/ConsoleApp1/ConsoleApp1.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net10.0</TargetFramework>
5+
<TargetFrameworks>net10.0</TargetFrameworks>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>

‎Clojure/Csharp.Tests/Csharp.Tests.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>net8.0;net9.0;net10.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
55
<LangVersion>14.0</LangVersion>
66
<IsPackable>false</IsPackable>
77
<IsTestProject>true</IsTestProject>

0 commit comments

Comments
 (0)