Skip to content

Commit e1aa5b0

Browse files
dmillerdmiller
committed
Added Framework 4.8.1 build. (4.6.2 does not support AppContext.GetData required for new type autoload feature)
1 parent 125469b commit e1aa5b0

File tree

10 files changed

+91
-35
lines changed

10 files changed

+91
-35
lines changed

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

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net462;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net462;net481;net9.0</TargetFrameworks>
66
<LangVersion>12.0</LangVersion>
77
<StartupObject>BootstrapCompile.Compile</StartupObject>
88
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
@@ -24,8 +24,8 @@
2424
</ItemGroup>
2525

2626

27-
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net9.0' ">
28-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' ">
27+
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'net9.0' ">
28+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net481' ">
2929
<TargetCmdline Condition=" $(TargetCmdline) == '' ">$(TargetPath)</TargetCmdline>
3030
<TargetCmdline Condition=" '$(OS)' == 'Unix' ">mono $(TargetPath)</TargetCmdline>
3131
</PropertyGroup>
@@ -41,6 +41,8 @@
4141
</ItemGroup>
4242
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\$(OutDir)" Condition=" '$(TargetFramework)' == 'net462' "/>
4343
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\Content\$(OutDir)" Condition=" '$(TargetFramework)' == 'net462' "/>
44+
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\$(OutDir)" Condition=" '$(TargetFramework)' == 'net481' "/>
45+
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\Content\$(OutDir)" Condition=" '$(TargetFramework)' == 'net481' "/>
4446
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main\$(OutDir)" Condition=" '$(TargetFramework)' == 'net9.0' "/>
4547
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main\Content\$(OutDir)" Condition=" '$(TargetFramework)' == 'net462' "/>
4648
</Target>

‎Clojure/Clojure.Main461/Clojure.Main461.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>net462</TargetFrameworks>
5+
<TargetFrameworks>net462;net481</TargetFrameworks>
66
<LangVersion>12.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;net6.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net481;net6.0;net8.0;net9.0</TargetFrameworks>
55

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;net6.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net481;net6.0;net8.0;net9.0</TargetFrameworks>
55
<RootNamespace></RootNamespace>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
77
</PropertyGroup>

‎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;net462</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0;net9.0;net462;net481</TargetFrameworks>
55
<LangVersion>12.0</LangVersion>
66
</PropertyGroup>
77

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

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

‎Clojure/Clojure/Lib/RT.cs‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
using System.Text.RegularExpressions;
2626
using System.Threading;
2727
using RTProperties = clojure.runtime.Properties;
28-
using Microsoft.Extensions.DependencyModel;
2928

3029

3130
namespace clojure.lang
@@ -2765,23 +2764,23 @@ public static string PrintToConsole(object x)
27652764
#region Locating types
27662765

27672766
// Cache for all runtime library assembly names, loaded once on demand.
2768-
private static readonly Lazy<List<AssemblyName>> _runtimeAssemblyNames = new Lazy<List<AssemblyName>>(() =>
2767+
private static readonly Lazy<List<AssemblyName>> _runtimeAssemblyNames = new(() =>
27692768
{
27702769
var names = new List<AssemblyName>();
2771-
2770+
27722771
try
27732772
{
27742773
// DependencyContext.Default can be null in some scenarios (like unit tests or static initializers).
27752774
// Loading the context from a known assembly is more robust.
27762775
var entryAssembly = Assembly.GetEntryAssembly();
2777-
2776+
27782777
// If there's no entry assembly (e.g., when hosted in a non-standard way),
27792778
// fall back to the assembly that contains the RT class itself (Clojure.dll).
27802779
if (entryAssembly == null)
27812780
{
27822781
entryAssembly = typeof(RT).Assembly;
27832782
}
2784-
2783+
27852784
var context = Microsoft.Extensions.DependencyModel.DependencyContext.Load(entryAssembly);
27862785

27872786
if (context != null)
@@ -2801,11 +2800,15 @@ public static string PrintToConsole(object x)
28012800
}
28022801
}
28032802
catch { }
2804-
2803+
28052804
// Also include shared runtime libraries from TRUSTED_PLATFORM_ASSEMBLIES
28062805
try
28072806
{
2807+
#if (NET48_OR_GREATER || !NETFRAMEWORK)
28082808
var trustedAssemblies = AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES") as string;
2809+
#else
2810+
var trustedAssemblies = "";
2811+
#endif
28092812
if (!string.IsNullOrEmpty(trustedAssemblies))
28102813
{
28112814
var paths = trustedAssemblies.Split(Path.PathSeparator);
@@ -2824,7 +2827,7 @@ public static string PrintToConsole(object x)
28242827
}
28252828
}
28262829
catch { }
2827-
2830+
28282831
return names;
28292832
});
28302833

@@ -2930,7 +2933,7 @@ public static Type classForName(string p)
29302933
}
29312934

29322935
// Search by simple type name (slow path).
2933-
List<Type> candidateTypes = new List<Type>();
2936+
List<Type> candidateTypes = new();
29342937
foreach (Assembly assy1 in loadedAssemblies)
29352938
{
29362939
Type t1 = null;

‎Clojure/build.proj‎

Lines changed: 65 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<TestTargetFramework Condition=" '$(TestTargetFramework)' == '' ">net9.0</TestTargetFramework>
2828

29-
<Error Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net9.0' AND '$(TestTargetFramework)' != 'net8.0' AND '$(TestTargetFramework)' != 'net6.0'"/>
29+
<Error Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net481' AND '$(TestTargetFramework)' != 'net9.0' AND '$(TestTargetFramework)' != 'net8.0' AND '$(TestTargetFramework)' != 'net6.0'"/>
3030

3131
<!--
3232
<TestLibraryFramework Condition=" '$(TestTargetFramework)' == 'net462' ">netstandard2.0</TestLibraryFramework>
@@ -39,11 +39,11 @@
3939

4040
<TestDir>$(RootDir)Test\$(Configuration)\$(TestTargetFramework)</TestDir>
4141

42-
<ClojureMainBinDir Condition=" '$(TestTargetFramework)' == 'net462' ">$(RootDir)Clojure.Main461\bin\$(Configuration)\$(TestTargetFramework)</ClojureMainBinDir>
43-
<ClojureMainBinDir Condition=" '$(TestTargetFramework)' != 'net462' ">$(RootDir)Clojure.Main\bin\$(Configuration)\$(TestTargetFramework)</ClojureMainBinDir>
44-
<clji Condition=" '$(TestTargetFramework)' == 'net462' ">Clojure.Main461.exe</clji>
45-
<clji Condition=" '$(TestTargetFramework)' != 'net462' ">Clojure.Main.exe</clji>
46-
<clji Condition=" '$(TestTargetFramework)' != 'net462' And '$(MSBuildRuntimeType)' == 'Core' ">dotnet run --project $(RootDir)Clojure.Main --framework $(TestTargetFramework) -c $(Configuration) --</clji>
42+
<ClojureMainBinDir Condition=" '$(TestTargetFramework)' == 'net462' OR '$(TestTargetFramework)' == 'net481' ">$(RootDir)Clojure.Main461\bin\$(Configuration)\$(TestTargetFramework)</ClojureMainBinDir>
43+
<ClojureMainBinDir Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net481' ">$(RootDir)Clojure.Main\bin\$(Configuration)\$(TestTargetFramework)</ClojureMainBinDir>
44+
<clji Condition=" '$(TestTargetFramework)' == 'net462' OR '$(TestTargetFramework)' == 'net481' ">Clojure.Main461.exe</clji>
45+
<clji Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net481' ">Clojure.Main.exe</clji>
46+
<clji Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net481' And '$(MSBuildRuntimeType)' == 'Core' ">dotnet run --project $(RootDir)Clojure.Main --framework $(TestTargetFramework) -c $(Configuration) --</clji>
4747

4848
<ClojureCompileBinDir>$(RootDir)Clojure.Compile\bin\$(Configuration)\$(TestTargetFramework)</ClojureCompileBinDir>
4949
<cljc>Clojure.Compile.exe</cljc>
@@ -131,6 +131,7 @@
131131
<RemoveDir Directories="$(RootDir)Clojure.Main461\bin;$(RootDir)Clojure.Main461\obj;$(RootDir)Clojure.Main461\Content"/>
132132
<RemoveDir Directories="$(RootDir)Clojure.Compile\bin;$(RootDir)Clojure.Compile\obj"/>
133133
<RemoveDir Directories="$(RootDir)Clojure.Tests\bin;$(RootDir)Clojure.Tests\obj"/>
134+
<RemoveDir Directories="$(RootDir)Clojure.Tests.Support\bin;$(RootDir)Clojure.Tests.Support\obj"/>
134135
<RemoveDir Directories="$(RootDir)Clojure.Samples\bin;$(RootDir)Clojure.Samples\obj"/>
135136
<RemoveDir Directories="$(RootDir)CSharp.Tests\bin;$(RootDir)CSharp.Tests\obj"/>
136137
</Target>
@@ -157,7 +158,7 @@
157158
DestinationFolder="$(TestDir)\%(RecursiveDir)" />
158159
</Target>
159160

160-
<Target Name="CompileTest" DependsOnTargets="StageTest" Condition="'$(TestTargetFramework)' == 'net462' OR '$(TestTargetFramework)' == 'net9.0'">
161+
<Target Name="CompileTest" DependsOnTargets="StageTest" Condition="'$(TestTargetFramework)' == 'net462' OR '$(TestTargetFramework)' == 'net481' OR '$(TestTargetFramework)' == 'net9.0'">
161162
<Exec Command="$(cljc) clojure.test-clojure.genclass.examples clojure.test-clojure.protocols.examples clojure.test-clojure.proxy.examples clojure.test-clojure.attributes clojure.test-clojure.compilation.load-ns clojure.test-clojure.compilation.line-number-examples"
162163
WorkingDirectory="$(TestDir)"
163164
Condition=" '$(Runtime)' == '.Net' "/>
@@ -171,10 +172,10 @@
171172

172173
<Target Name="Test" DependsOnTargets="StageTest;CompileTest">
173174
<Copy SkipUnchangedFiles="true" SourceFiles="Clojure.Tests\clojure\run_test.clj" DestinationFolder="$(TestDir)" />
174-
<SetEnvironmentVariable Condition="'$(TestTargetFramework)' == 'net462' OR '$(TestTargetFramework)' == 'net9.0'"
175+
<SetEnvironmentVariable Condition="'$(TestTargetFramework)' == 'net462' OR '$(TestTargetFramework)' == 'net481' OR '$(TestTargetFramework)' == 'net9.0'"
175176
Name="clojure.test-clojure.exclude-namespaces"
176177
Value="#{clojure.test-clojure.compilation.load-ns clojure.test-clojure.ns-libs-load-later}" />
177-
<SetEnvironmentVariable Condition="'$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net9.0' "
178+
<SetEnvironmentVariable Condition="'$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net481' AND'$(TestTargetFramework)' != 'net9.0' "
178179
Name="clojure.test-clojure.exclude-namespaces"
179180
Value="#{clojure.test-clojure.compilation.load-ns clojure.test-clojure.ns-libs-load-later clojure.test-clojure.attributes clojure.test-clojure.compilation2 clojure.test-clojure.genclass}" />
180181
<Exec Command="$(clji) run_test.clj" WorkingDirectory="$(TestDir)" Condition=" '$(Runtime)' == '.Net' "/>
@@ -183,7 +184,7 @@
183184

184185
<Target Name="TestGen" DependsOnTargets="StageTest;CompileTest">
185186
<Copy SkipUnchangedFiles="true" SourceFiles="Clojure.Tests\clojure\run_test_generative.clj" DestinationFolder="$(TestDir)" />
186-
<SetEnvironmentVariable Condition="'$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net9.0'"
187+
<SetEnvironmentVariable Condition="'$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net481' AND '$(TestTargetFramework)' != 'net9.0'"
187188
Name="clojure.test-clojure.exclude-namespaces"
188189
Value="#{clojure.test-clojure.compilation.load-ns clojure.test-clojure.attributes clojure.test-clojure.compilation2 clojure.test-clojure.genclass}" />
189190
<Exec Command="$(clji) run_test_generative.clj" WorkingDirectory="$(TestDir)" Condition=" '$(Runtime)' == '.Net' "/>
@@ -253,8 +254,40 @@
253254
/>
254255
</Target>
255256

257+
258+
<!-- We want to run ILMerge on th Clojure.dll for the 481 version prior to doing the pack. Sneaking this in after the build -->
259+
<!-- TODO: Merge this code with ILMerge481 -->
260+
<Target Name="ILMerge481" DependsOnTargets="CreateStageDir">
256261

257-
<Target Name="ZipAll" DependsOnTargets="PackAll;ILMerge462">
262+
<PropertyGroup>
263+
<ILMergeStageDir>$(StageDir)\ilmerge\</ILMergeStageDir>
264+
<UnzippedDir>$(ILMergeStageDir)\unzipped</UnzippedDir>
265+
<SourceDir>$(RootDir)\Clojure.Compile\bin\$(Configuration)\net481</SourceDir>
266+
267+
</PropertyGroup>
268+
<MakeDir Directories="$(ILMergeStageDir)" />
269+
<Exec WorkingDirectory="$(SourceDir)"
270+
Command="ilmerge /keyfile:$(PublicKey) /out:$(ILMergeStageDir)\Clojure.dll Clojure.dll clojure.clr.io.clj.dll clojure.math.clj.dll clojure.clr.shell.clj.dll clojure.core.clj.dll clojure.core.protocols.clj.dll clojure.core.reducers.clj.dll clojure.core.server.clj.dll clojure.core_clr.clj.dll clojure.core_deftype.clj.dll clojure.core_print.clj.dll clojure.core_proxy.clj.dll clojure.data.clj.dll clojure.edn.clj.dll clojure.genclass.clj.dll clojure.gvec.clj.dll clojure.instant.clj.dll clojure.main.clj.dll clojure.pprint.clj.dll clojure.pprint.cl_format.clj.dll clojure.pprint.column_writer.clj.dll clojure.pprint.dispatch.clj.dll clojure.pprint.pprint_base.clj.dll clojure.pprint.pretty_writer.clj.dll clojure.pprint.print_table.clj.dll clojure.pprint.utilities.clj.dll clojure.reflect.clj.dll clojure.reflect.clr.clj.dll clojure.repl.clj.dll clojure.set.clj.dll clojure.stacktrace.clj.dll clojure.string.clj.dll clojure.template.clj.dll clojure.test.clj.dll clojure.test.junit.clj.dll clojure.test.tap.clj.dll clojure.uuid.clj.dll clojure.walk.clj.dll clojure.zip.clj.dll clojure.datafy.clj.dll clojure.clr.basis.impl.cljc.dll clojure.clr.basis.cljc.dll clojure.clr.process.clj.dll clojure.tools.deps.interop.cljc.dll clojure.repl.deps.cljc.dll"
271+
/>
272+
273+
<Unzip
274+
SourceFiles="$(StageDir)\Clojure.$(ZipVersion).nupkg"
275+
DestinationFolder="$(UnzippedDir)"
276+
OverwriteReadOnlyFiles="true"
277+
/>
278+
<Copy SkipUnchangedFiles="true"
279+
SourceFiles="$(ILMergeStageDir)\Clojure.dll"
280+
DestinationFolder="$(UnzippedDir)\lib\net481"
281+
/>
282+
283+
<ZipDirectory SourceDirectory="$(UnzippedDir)"
284+
DestinationFile ="$(StageDir)\Clojure.$(ZipVersion).nupkg"
285+
Overwrite="true"
286+
/>
287+
</Target>
288+
289+
290+
<Target Name="ZipAll" DependsOnTargets="PackAll;ILMerge462;ILMerge481">
258291

259292
<ZipDirectory SourceDirectory="$(RootDir)Clojure.Main\bin\$(Configuration)\net9.0\publish"
260293
DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net9.0.zip"
@@ -267,22 +300,39 @@
267300
<ZipDirectory SourceDirectory="$(RootDir)Clojure.Main\bin\$(Configuration)\net6.0\publish"
268301
DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net6.0.zip"
269302
Overwrite="true"/>
303+
304+
<!-- TOOD: Merge the 462 and 481 versions -->
270305
<ItemGroup>
271-
<ClojureCompileAssets Include="$(RootDir)Clojure.Compile\bin\$(Configuration)\net462\Clojure.Compile.*" />
306+
<ClojureCompile462Assets Include="$(RootDir)Clojure.Compile\bin\$(Configuration)\net462\Clojure.Compile.*" />
272307
<ClojureMain462Assets Include="$(RootDir)Clojure.Main461\bin\$(Configuration)\net462\**\*" />
273308
</ItemGroup>
274309
<Copy SkipUnchangedFiles="true"
275310
SourceFiles="@(ClojureMain462Assets)"
276311
DestinationFolder="$(StageDir)\net462\%(RecursiveDir)" />
277312
<Copy SkipUnchangedFiles="true"
278-
SourceFiles="@(ClojureCompileAssets)"
313+
SourceFiles="@(ClojureCompile462Assets)"
279314
DestinationFolder="$(StageDir)\net462\%(RecursiveDir)" />
280315

281316
<ZipDirectory SourceDirectory="$(StageDir)\net462"
282317
DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net4.6.2.zip"
283318
Overwrite="true"/>
284-
</Target>
285-
319+
320+
<ItemGroup>
321+
<ClojureCompile481Assets Include="$(RootDir)Clojure.Compile\bin\$(Configuration)\net481\Clojure.Compile.*" />
322+
<ClojureMain481Assets Include="$(RootDir)Clojure.Main461\bin\$(Configuration)\net481\**\*" />
323+
</ItemGroup>
324+
<Copy SkipUnchangedFiles="true"
325+
SourceFiles="@(ClojureMain481Assets)"
326+
DestinationFolder="$(StageDir)\net481\%(RecursiveDir)" />
327+
<Copy SkipUnchangedFiles="true"
328+
SourceFiles="@(ClojureCompile481Assets)"
329+
DestinationFolder="$(StageDir)\net481\%(RecursiveDir)" />
330+
331+
<ZipDirectory SourceDirectory="$(StageDir)\net481"
332+
DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net4.8.1.zip"
333+
Overwrite="true"/>
334+
</Target>
335+
286336
<!-- $$$$$$$$$$$$$$$$$$$$$$$$$$ -->
287337

288338
<!-- RJ: New build and clean targets for .Net Core 3.X and .Net 5-->

‎docs/Preparing-a-release.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Modify `Clojure\Clojure\Bootstrap\version.properties` to desired release version.
88
* Set the version info in `Clojure\CurrentVersion.props`.
99
* Please note that you should use lowercase letters only in the pre-release designation in order to avoid problems on non-Windows systems, i.e., `beta1` instead of `Beta1`, `rc1` instead of `RC1`.
10-
* Build and test. From the `Clojure` directory with X in {net462, net6.0, net8.0, net9.0} (Configuration will default to Debug. Substitute in names accordingly if that is case.)
10+
* Build and test. From the `Clojure` directory with X in {net462, net481, net6.0, net8.0, net9.0} (Configuration will default to Debug. Substitute in names accordingly if that is case.)
1111
* `msbuild build.proj -t:Test -p:TestTargetFramework=X -p:Configuration=Release`
1212
* `msbuild build.proj -t:TestGen -p:TestTargetFramework=X -p:Configuration=Release`
1313
* Package. From the `Clojure` directory, run
@@ -18,12 +18,13 @@
1818
* clojure-clr-1.10.0-alpha1-Release-core3.1.zip
1919
* clojure-clr-1.10.0-alpha1-Release-net5.0.zip
2020
* clojure-clr-1.10.0-alpha1-Release-net6.0.zip
21-
* clojure-clr-1.10.0-alpha1-Release-net4.6.1.zip
21+
* clojure-clr-1.10.0-alpha1-Release-net4.6.2.zip
22+
* clojure-clr-1.10.0-alpha1-Release-net4.8.1.zip
2223
* Validate these by any manner of your choosing. I moved the zips somewhere, unzipped them, and checked that the following start up:
2324
* in net6.0 and later:
2425
* > `Clojure.Main.exe` (This might not be created on non-Windows builds.)
2526
* > `dotnet Clojure.Main.dll`
26-
* in net462:
27+
* in net462 or net481:
2728
* > `Clojure.Main461.exe`
2829
* > `Clojure.Compile.exe` (Without command-line args, will just exit after the startup delay)
2930
* I test the tool install via:

0 commit comments

Comments
 (0)