Skip to content

Commit c891ee1

Browse files
dmillerdmiller
committed
Update to .Net Framework 4.6.2 (4.6.1 is no longer supported)
1 parent 20ba7d3 commit c891ee1

12 files changed

Lines changed: 43 additions & 42 deletions

File tree

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

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net461</TargetFrameworks>
5+
<TargetFrameworks>net462</TargetFrameworks>
66
<StartupObject>BootstrapCompile.Compile</StartupObject>
77
</PropertyGroup>
88

@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
1515
<PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
16-
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
16+
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424

25-
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net461'">
25+
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net462'">
2626
<PropertyGroup>
2727
<TargetCmdline Condition=" $(TargetCmdline) == '' ">$(TargetPath)</TargetCmdline>
2828
<TargetCmdline Condition=" '$(OS)' == 'Unix' ">mono $(TargetPath)</TargetCmdline>
@@ -31,6 +31,7 @@
3131
<ItemGroup>
3232
<CljCoreBin Include="$(ProjectDir)$(OutDir)clojure*.dll" />
3333
</ItemGroup>
34+
<Message Text="DMDMDMDMDM -- Copying @(CljCoreBin) to $(SolutionDir)Clojure.Main461\$(OutDir) " Importance="high" />
3435
<Copy SourceFiles="@(CljCoreBin)" DestinationFolder="$(SolutionDir)Clojure.Main461\$(OutDir)" />
3536
</Target>
3637

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<ItemGroup>
1616
<PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
1717
<PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
18-
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
18+
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

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

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net461</TargetFrameworks>
5+
<TargetFrameworks>net462</TargetFrameworks>
66
<StartupObject>Clojure.CljMain</StartupObject>
77
<PackAsTool>true</PackAsTool>
88
</PropertyGroup>
@@ -11,7 +11,7 @@
1111
<PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
1212
<PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
1313
<PackageReference Include="clr.tools.reader" Version="1.3.6" />
14-
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
14+
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎Clojure/Clojure/CljCompiler/Ast/DynInitHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ private bool ShouldRewriteDelegate(Type delegateType)
195195
{
196196
return false;
197197
}
198-
#if NET461
198+
#if NET462
199199
if (module.IsTransient())
200200
{
201201
return true;

‎Clojure/Clojure/CljCompiler/Ast/GenContext.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ private GenContext(string directory, AssemblyName aname, string extension, bool
150150

151151
Path = ComputeAssemblyPath(directory, aname.Name, extension);
152152

153-
#if NET461
153+
#if NET462
154154
if (_isDebuggable)
155155
_docWriter = ModuleBuilder.DefineDocument(sourceName, ClojureContext.Default.LanguageGuid, ClojureContext.Default.VendorGuid, Guid.Empty);
156156
#endif
@@ -207,7 +207,7 @@ internal void SaveAssembly()
207207
if ( _dynInitHelper != null )
208208
_dynInitHelper.FinalizeType();
209209

210-
#if NET461
210+
#if NET462
211211
_assyGen.SaveAssembly();
212212
#else
213213
Console.WriteLine("AOT-compilation not available");
@@ -250,7 +250,7 @@ public static void EmitDebugInfo(ILGen ilg, IPersistentMap spanMap)
250250

251251
public void MaybeEmitDebugInfo(ILGen ilg, IPersistentMap spanMap)
252252
{
253-
#if NET461
253+
#if NET462
254254
if ( _docWriter != null && spanMap != null )
255255
{
256256
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)
276276

277277
public void MaybSetLocalName(LocalBuilder lb, string name)
278278
{
279-
#if NET461
279+
#if NET462
280280
if (_isDebuggable)
281281
lb.SetLocalSymInfo(name);
282282
#endif

‎Clojure/Clojure/CljCompiler/Ast/MethodExpr.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public static void EmitTypedArgs(ObjExpr objx, CljILGen ilg, ParameterInfo[] par
444444
{
445445
EmitTypedArg(objx, ilg, parms[i].ParameterType, args[i].ArgExpr);
446446
LocalBuilder loc = ilg.DeclareLocal(pi.ParameterType);
447-
#if NET461
447+
#if NET462
448448
loc.SetLocalSymInfo("_byRef_temp" + i);
449449
#endif
450450
ilg.Emit(OpCodes.Stloc, loc);

‎Clojure/Clojure/CljCompiler/GenClass.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ static void EmitMain(GenContext context, TypeBuilder proxyTB, string mainName, F
415415
gen.MarkLabel(endLabel);
416416
gen.Emit(OpCodes.Ret);
417417

418-
#if NET461
418+
#if NET462
419419
//context.AssyBldr.SetEntryPoint(cb);
420420
context.AssemblyBuilder.SetEntryPoint(cb);
421421
#endif

‎Clojure/Clojure/Clojure.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net462</TargetFrameworks>
55
<NeutralLanguage></NeutralLanguage>
66
<RootNamespace>clojure.lang</RootNamespace>
77
</PropertyGroup>
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<PackageReference Include="clojure.core.specs.alpha" Version="0.2.62" />
2020
<PackageReference Include="clojure.spec.alpha" Version="0.3.218" />
21-
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
21+
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
2222
</ItemGroup>
2323

2424

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
10-
<PackageReference Include="NExpect" Version="1.0.251" />
8+
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
10+
<PackageReference Include="NExpect" Version="1.0.273" />
1111
<PackageReference Include="NUnit" Version="3.13.3" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
1313
<PrivateAssets>all</PrivateAssets>

‎Clojure/Csharp.Tests/LibTests/FutureTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void PropagatesExceptions()
7474
}
7575
}
7676

77-
#if NET461
77+
#if NET462
7878
// Thread.Abort not supported in .Net Core
7979

8080
[Test]
@@ -112,7 +112,7 @@ public void CancelFailsAfterSuccessfulCompletion()
112112
Expect(f.isCancelled()).To.Equal(false);
113113
}
114114

115-
#if NET461
115+
#if NET462
116116
// Thread.Abort not supported in .Net Core
117117
[Test]
118118
[ExpectedException(typeof(FutureAbortedException))]

0 commit comments

Comments
 (0)