Update to .Net Framework 4.6.2 (4.6.1 is no longer supported)

dmiller · dmiller · commit c891ee1003cc · 2022-07-27T14:46:52.000-05:00
diff --git a/Clojure/Clojure.Compile/Clojure.Compile.csproj b/Clojure/Clojure.Compile/Clojure.Compile.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <StartupObject>BootstrapCompile.Compile</StartupObject>
   </PropertyGroup>
 
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
     <PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
-    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
+    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -22,7 +22,7 @@
   </ItemGroup>
 
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net461'">
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462'">
     <PropertyGroup>
       <TargetCmdline Condition=" $(TargetCmdline) == '' ">$(TargetPath)</TargetCmdline>
       <TargetCmdline Condition=" '$(OS)' == 'Unix' ">mono $(TargetPath)</TargetCmdline>
@@ -31,6 +31,7 @@
     <ItemGroup>
       <CljCoreBin Include="$(ProjectDir)$(OutDir)clojure*.dll" />
     </ItemGroup>
+	  <Message Text="DMDMDMDMDM -- Copying @(CljCoreBin) to $(SolutionDir)Clojure.Main461\$(OutDir) " Importance="high" />
     <Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\$(OutDir)" />
   </Target>
   
diff --git a/Clojure/Clojure.Main/Clojure.Main.csproj b/Clojure/Clojure.Main/Clojure.Main.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
     <PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
-    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
+    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Clojure/Clojure.Main461/Clojure.Main461.csproj b/Clojure/Clojure.Main461/Clojure.Main461.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <StartupObject>Clojure.CljMain</StartupObject>
 	 <PackAsTool>true</PackAsTool>
   </PropertyGroup>
@@ -11,7 +11,7 @@
     <PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
     <PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
     <PackageReference Include="clr.tools.reader" Version="1.3.6" />
-    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
+    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Clojure/Clojure/CljCompiler/Ast/DynInitHelper.cs b/Clojure/Clojure/CljCompiler/Ast/DynInitHelper.cs
@@ -195,7 +195,7 @@ private bool ShouldRewriteDelegate(Type delegateType)
             {
                 return false;
             }
-#if NET461
+#if NET462
             if (module.IsTransient())
             {
                 return true;
diff --git a/Clojure/Clojure/CljCompiler/Ast/GenContext.cs b/Clojure/Clojure/CljCompiler/Ast/GenContext.cs
@@ -150,7 +150,7 @@ private GenContext(string directory, AssemblyName aname, string extension, bool
 
             Path = ComputeAssemblyPath(directory, aname.Name, extension);
 
-#if NET461
+#if NET462
             if (_isDebuggable)
                 _docWriter = ModuleBuilder.DefineDocument(sourceName, ClojureContext.Default.LanguageGuid, ClojureContext.Default.VendorGuid, Guid.Empty);
 #endif
@@ -207,7 +207,7 @@ internal void SaveAssembly()
             if ( _dynInitHelper != null  )
                 _dynInitHelper.FinalizeType();
 
-#if NET461                 
+#if NET462                 
             _assyGen.SaveAssembly();
 #else
             Console.WriteLine("AOT-compilation not available");
@@ -250,7 +250,7 @@ public static void EmitDebugInfo(ILGen ilg, IPersistentMap spanMap)
 
         public void MaybeEmitDebugInfo(ILGen ilg, IPersistentMap spanMap)
         {
-#if NET461
+#if NET462
             if ( _docWriter != null && spanMap != null )
             {
                 if (Compiler.GetLocations(spanMap, out int startLine, out int startCol, out int finishLine, out int finishCol))
@@ -276,7 +276,7 @@ public static void SetLocalName(LocalBuilder lb, string name)
 
         public void MaybSetLocalName(LocalBuilder lb, string name)
         {
-#if NET461
+#if NET462
             if (_isDebuggable)
                 lb.SetLocalSymInfo(name);
 #endif
diff --git a/Clojure/Clojure/CljCompiler/Ast/MethodExpr.cs b/Clojure/Clojure/CljCompiler/Ast/MethodExpr.cs
@@ -444,7 +444,7 @@ public static void EmitTypedArgs(ObjExpr objx, CljILGen ilg, ParameterInfo[] par
                     {
                         EmitTypedArg(objx, ilg, parms[i].ParameterType, args[i].ArgExpr);
                         LocalBuilder loc = ilg.DeclareLocal(pi.ParameterType);
-#if NET461
+#if NET462
                         loc.SetLocalSymInfo("_byRef_temp" + i);
 #endif
                         ilg.Emit(OpCodes.Stloc, loc);
diff --git a/Clojure/Clojure/CljCompiler/GenClass.cs b/Clojure/Clojure/CljCompiler/GenClass.cs
@@ -415,7 +415,7 @@ static void EmitMain(GenContext context, TypeBuilder proxyTB, string mainName, F
             gen.MarkLabel(endLabel);
             gen.Emit(OpCodes.Ret);
 
-#if NET461
+#if NET462
             //context.AssyBldr.SetEntryPoint(cb);
             context.AssemblyBuilder.SetEntryPoint(cb);
 #endif
diff --git a/Clojure/Clojure/Clojure.csproj b/Clojure/Clojure/Clojure.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;net461</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;net462</TargetFrameworks>
 		<NeutralLanguage></NeutralLanguage>
 		<RootNamespace>clojure.lang</RootNamespace>
 	</PropertyGroup>
@@ -18,7 +18,7 @@
 	<ItemGroup>
 		<PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
 		<PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
-		<PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
+		<PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
 	</ItemGroup>
 
 
diff --git a/Clojure/Csharp.Tests/Csharp.Tests.csproj b/Clojure/Csharp.Tests/Csharp.Tests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="NExpect" Version="1.0.251" />
+    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="NExpect" Version="1.0.273" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Clojure/Csharp.Tests/LibTests/FutureTests.cs b/Clojure/Csharp.Tests/LibTests/FutureTests.cs
@@ -74,7 +74,7 @@ public void PropagatesExceptions()
             }
         }
 
-#if NET461
+#if NET462
         // Thread.Abort not supported in .Net Core
 
         [Test]
@@ -112,7 +112,7 @@ public void CancelFailsAfterSuccessfulCompletion()
             Expect(f.isCancelled()).To.Equal(false);
         }
 
-#if NET461
+#if NET462
         // Thread.Abort not supported in .Net Core
         [Test]
         [ExpectedException(typeof(FutureAbortedException))]
diff --git a/Clojure/Csharp.Tests/LibTests/GenProxyTests.cs b/Clojure/Csharp.Tests/LibTests/GenProxyTests.cs
@@ -821,7 +821,7 @@ public class Impl3 : Impl2
         {
         }
 
-#if NET461
+#if NET462
         [Test]
         public void FindTypeInAssembly()
         {
@@ -922,7 +922,7 @@ public interface I1
             int m2(int x);
         }
 
-#if NET461
+#if NET462
         [Test]
         public void CanCreateConcreteImplementationOverAbstractProperty()
         {
diff --git a/Clojure/build.proj b/Clojure/build.proj
@@ -26,20 +26,20 @@
 	
 	<TestTargetFramework Condition=" '$(TestTargetFramework)' == '' ">net5.0</TestTargetFramework>
 	
-	<Error Condition=" '$(TestTargetFramework)' != 'net461' AND '$(TestTargetFramework)' != 'netcoreapp3.1' AND '$(TestTargetFramework)' != 'net5.0'" />
+	<Error Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'netcoreapp3.1' AND '$(TestTargetFramework)' != 'net5.0' AND '$(TestTargetFramework)' != 'net6.0'"/>
 		
 		
-	<TestLibraryFramework Condition=" '$(TestTargetFramework)' == 'net461' ">netstandard2.0</TestLibraryFramework>
-	<TestLibraryFramework Condition=" '$(TestTargetFramework)' != 'net461' ">netstandard2.1</TestLibraryFramework>
+	<TestLibraryFramework Condition=" '$(TestTargetFramework)' == 'net462' ">netstandard2.0</TestLibraryFramework>
+	<TestLibraryFramework Condition=" '$(TestTargetFramework)' != 'net462' ">netstandard2.1</TestLibraryFramework>
 	
 
 	<TestDir>$(RootDir)Test\$(Configuration)\$(TestTargetFramework)</TestDir>
 	
-	<ClojureMainBinDir Condition=" '$(TestTargetFramework)' == 'net461' ">$(RootDir)Clojure.Main461\bin\$(Configuration)\$(TestTargetFramework)</ClojureMainBinDir>
-	<ClojureMainBinDir Condition=" '$(TestTargetFramework)' != 'net461' ">$(RootDir)Clojure.Main\bin\$(Configuration)\$(TestTargetFramework)</ClojureMainBinDir>
-    <clji Condition=" '$(TestTargetFramework)' == 'net461' ">Clojure.Main461.exe</clji>
-    <clji Condition=" '$(TestTargetFramework)' != 'net461' ">Clojure.Main.exe</clji>		
-    <clji Condition=" '$(TestTargetFramework)' != 'net461' And '$(MSBuildRuntimeType)' == 'Core' ">dotnet run -p $(RootDir)Clojure.Main --framework $(TestTargetFramework) -c $(Configuration) --</clji>		
+	<ClojureMainBinDir Condition=" '$(TestTargetFramework)' == 'net462' ">$(RootDir)Clojure.Main461\bin\$(Configuration)\$(TestTargetFramework)</ClojureMainBinDir>
+	<ClojureMainBinDir Condition=" '$(TestTargetFramework)' != 'net462' ">$(RootDir)Clojure.Main\bin\$(Configuration)\$(TestTargetFramework)</ClojureMainBinDir>
+    <clji Condition=" '$(TestTargetFramework)' == 'net462' ">Clojure.Main461.exe</clji>
+    <clji Condition=" '$(TestTargetFramework)' != 'net462' ">Clojure.Main.exe</clji>		
+    <clji Condition=" '$(TestTargetFramework)' != 'net462' And '$(MSBuildRuntimeType)' == 'Core' ">dotnet run -p $(RootDir)Clojure.Main --framework $(TestTargetFramework) -c $(Configuration) --</clji>		
 	
 	<ClojureCompileBinDir>$(RootDir)Clojure.Compile\bin\$(Configuration)\$(TestTargetFramework)</ClojureCompileBinDir>
 	<cljc>Clojure.Compile.exe</cljc>
@@ -149,7 +149,7 @@
 		  DestinationFolder="$(TestDir)\%(RecursiveDir)" />	  
   </Target>  
   
-  <Target Name="CompileTest" DependsOnTargets="StageTest" Condition="'$(TestTargetFramework)' == 'net461'">
+  <Target Name="CompileTest" DependsOnTargets="StageTest" Condition="'$(TestTargetFramework)' == 'net462'">
     <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" 
           WorkingDirectory="$(TestDir)"
            Condition=" '$(Runtime)' == '.Net' "/>
@@ -163,10 +163,10 @@
   
   <Target Name="Test" DependsOnTargets="StageTest;CompileTest">
     <Copy SkipUnchangedFiles="true" SourceFiles="Clojure.Tests\clojure\run_test.clj" DestinationFolder="$(TestDir)" />
-    <SetEnvironmentVariable Condition="'$(TestTargetFramework)' == 'net461'"
+    <SetEnvironmentVariable Condition="'$(TestTargetFramework)' == 'net462'"
 							Name="clojure.test-clojure.exclude-namespaces" 
 							Value="#{clojure.test-clojure.compilation.load-ns clojure.test-clojure.ns-libs-load-later}" />
-	<SetEnvironmentVariable Condition="'$(TestTargetFramework)' != 'net461'"
+	<SetEnvironmentVariable Condition="'$(TestTargetFramework)' != 'net462'"
 							Name="clojure.test-clojure.exclude-namespaces" 
 							Value="#{clojure.test-clojure.compilation.load-ns clojure.test-clojure.ns-libs-load-later clojure.test-clojure.attributes clojure.test-clojure.compilation clojure.test-clojure.genclass}" />						
     <Exec Command="$(clji) run_test.clj"       WorkingDirectory="$(TestDir)" Condition=" '$(Runtime)' == '.Net' "/>
@@ -175,7 +175,7 @@
 
   <Target Name="TestGen" DependsOnTargets="StageTest;CompileTest">
     <Copy SkipUnchangedFiles="true" SourceFiles="Clojure.Tests\clojure\run_test_generative.clj" DestinationFolder="$(TestDir)" />
-	<SetEnvironmentVariable Condition="'$(TestTargetFramework)' != 'net461'"
+	<SetEnvironmentVariable Condition="'$(TestTargetFramework)' != 'net462'"
 							Name="clojure.test-clojure.exclude-namespaces" 
 							Value="#{clojure.test-clojure.compilation.load-ns clojure.test-clojure.attributes clojure.test-clojure.compilation clojure.test-clojure.genclass}" />						
     <Exec Command="$(clji) run_test_generative.clj"      WorkingDirectory="$(TestDir)"  Condition=" '$(Runtime)' == '.Net' "/>
@@ -216,18 +216,18 @@
 	              DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net6.0.zip"
 				  Overwrite="true"/>			  
 	<ItemGroup>
-		<ClojureCompileAssets Include="$(RootDir)Clojure.Compile\bin\$(Configuration)\net461\Clojure.Compile.*" />
-		<ClojureMain461Assets Include="$(RootDir)Clojure.Main461\bin\$(Configuration)\net461\**\*" />
+		<ClojureCompileAssets Include="$(RootDir)Clojure.Compile\bin\$(Configuration)\net462\Clojure.Compile.*" />
+		<ClojureMain462Assets Include="$(RootDir)Clojure.Main461\bin\$(Configuration)\net462\**\*" />
 	</ItemGroup>	
 	<Copy SkipUnchangedFiles="true"
-		  SourceFiles="@(ClojureMain461Assets)"
-		  DestinationFolder="$(StageDir)\net461\%(RecursiveDir)" />	
+		  SourceFiles="@(ClojureMain462Assets)"
+		  DestinationFolder="$(StageDir)\net462\%(RecursiveDir)" />	
 	<Copy SkipUnchangedFiles="true"
 		  SourceFiles="@(ClojureCompileAssets)"
-		  DestinationFolder="$(StageDir)\net461\%(RecursiveDir)" />			  
+		  DestinationFolder="$(StageDir)\net462\%(RecursiveDir)" />			  
 	  
-	<ZipDirectory SourceDirectory="$(StageDir)\net461"
-	              DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net4.6.1.zip"
+	<ZipDirectory SourceDirectory="$(StageDir)\net462"
+	              DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net4.6.2.zip"
 				  Overwrite="true"/>
   </Target>				  
 
@@ -296,7 +296,7 @@
 <!-- Targets below are part of the pre-Core build, haven't been updated yet. -->
 
  <!--  Need to update whenever more DLLs are added to basic build -->
-    <Target Name="Ilmerge" DependsOnTargets="Build" Condition="'$(TestTargetFramework)' == 'net461'">
+    <Target Name="Ilmerge" DependsOnTargets="Build" Condition="'$(TestTargetFramework)' == 'net462'">
     <MakeDir Directories="$(StageDir)\ilmerge\$(TestTargetFramework)" /> 
     <Exec WorkingDirectory="$(ClojureCompileBinDir)" 
           Command="ilmerge /keyfile:$(PublicKey) /out:$(StageDir)\ilmerge\$(TestTargetFramework)\Clojure.dll Clojure.dll clojure.clr.io.clj.dll clojure.clr.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"

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ private bool ShouldRewriteDelegate(Type delegateType)`
`195`	`195`	`{`
`196`	`196`	`return false;`
`197`	`197`	`}`
`198`		`-#if NET461`
	`198`	`+#if NET462`
`199`	`199`	`if (module.IsTransient())`
`200`	`200`	`{`
`201`	`201`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ public static void EmitTypedArgs(ObjExpr objx, CljILGen ilg, ParameterInfo[] par`
`444`	`444`	`{`
`445`	`445`	`EmitTypedArg(objx, ilg, parms[i].ParameterType, args[i].ArgExpr);`
`446`	`446`	`LocalBuilder loc = ilg.DeclareLocal(pi.ParameterType);`
`447`		`-#if NET461`
	`447`	`+#if NET462`
`448`	`448`	`loc.SetLocalSymInfo("_byRef_temp" + i);`
`449`	`449`	`#endif`
`450`	`450`	`ilg.Emit(OpCodes.Stloc, loc);`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public void PropagatesExceptions()`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`-#if NET461`
	`77`	`+#if NET462`
`78`	`78`	`// Thread.Abort not supported in .Net Core`
`79`	`79`
`80`	`80`	`[Test]`
`@@ -112,7 +112,7 @@ public void CancelFailsAfterSuccessfulCompletion()`
`112`	`112`	`Expect(f.isCancelled()).To.Equal(false);`
`113`	`113`	`}`
`114`	`114`
`115`		`-#if NET461`
	`115`	`+#if NET462`
`116`	`116`	`// Thread.Abort not supported in .Net Core`
`117`	`117`	`[Test]`
`118`	`118`	`[ExpectedException(typeof(FutureAbortedException))]`
Original file line number	Diff line number	Diff line change
`@@ -821,7 +821,7 @@ public class Impl3 : Impl2`
`821`	`821`	`{`
`822`	`822`	`}`
`823`	`823`
`824`		`-#if NET461`
	`824`	`+#if NET462`
`825`	`825`	`[Test]`
`826`	`826`	`public void FindTypeInAssembly()`
`827`	`827`	`{`
`@@ -922,7 +922,7 @@ public interface I1`
`922`	`922`	`int m2(int x);`
`923`	`923`	`}`
`924`	`924`
`925`		`-#if NET461`
	`925`	`+#if NET462`
`926`	`926`	`[Test]`
`927`	`927`	`public void CanCreateConcreteImplementationOverAbstractProperty()`
`928`	`928`	`{`