Update to .NET Core 3.0 release (#644)

* Update to release * Update packages to match DLR
IronLanguages · Sep 28, 2019 · 5b4ff35 · 5b4ff35
1 parent dd38093
commit 5b4ff35
Show file tree

Hide file tree

Showing 15 changed files with 100 additions and 272 deletions.
diff --git a/Build/steps.yml b/Build/steps.yml
@@ -34,7 +34,7 @@ steps:
     displayName: Install .NET Core 3.0 SDK for build
     inputs:
       packageType: 'sdk'
-      version: '3.0.100-preview5-011568'
+      version: '3.0.100'
 
   # Install mono when running on Linux
   - ${{ if eq(parameters.os, 'Linux') }}:

diff --git a/IronPython.ruleset b/IronPython.ruleset
diff --git a/IronPython.sln b/IronPython.sln
@@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CurrentVersion.props = CurrentVersion.props
 		Directory.Build.props = Directory.Build.props
 		IronPython.nuspec = IronPython.nuspec
+		IronPython.ruleset = IronPython.ruleset
 		IronPython.StdLib.nuspec = IronPython.StdLib.nuspec
 		LICENSE = LICENSE
 		make.cmd = make.cmd

diff --git a/Src/DLR b/Src/DLR
diff --git a/Src/IronPython.Modules/IronPython.Modules.csproj b/Src/IronPython.Modules/IronPython.Modules.csproj
@@ -26,8 +26,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19270-01" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Src/IronPython.Modules/_ctypes/CFuncPtr.cs b/Src/IronPython.Modules/_ctypes/CFuncPtr.cs
@@ -493,7 +493,6 @@ private INativeType GetNativeReturnType() {
                 private ArgumentMarshaller/*!*/[]/*!*/ GetArgumentMarshallers(DynamicMetaObject/*!*/[]/*!*/ args) {
                     CFuncPtrType funcType = ((CFuncPtrType)Value.NativeType);
                     ArgumentMarshaller[] res = new ArgumentMarshaller[args.Length];
-
 
                     // first arg is taken by self if we're a com method
                     for (int i = 0; i < args.Length; i++) {

diff --git a/Src/IronPython/IronPython.csproj b/Src/IronPython/IronPython.csproj
@@ -49,8 +49,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19270-01" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Src/IronPython/Runtime/PythonDictionary.cs b/Src/IronPython/Runtime/PythonDictionary.cs
@@ -939,6 +939,7 @@ object IEnumerator<object>.Current {
         }
 
         void IDisposable.Dispose() {
+            _keys.Dispose();
         }
 
         public object __iter__() {

diff --git a/Src/IronPythonCompiler/IronPythonCompiler.csproj b/Src/IronPythonCompiler/IronPythonCompiler.csproj
@@ -32,7 +32,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Src/IronPythonConsole/IronPythonConsole.csproj b/Src/IronPythonConsole/IronPythonConsole.csproj
@@ -20,7 +20,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Src/IronPythonConsoleAny/IronPythonConsoleAny.csproj b/Src/IronPythonConsoleAny/IronPythonConsoleAny.csproj
@@ -46,7 +46,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Src/IronPythonTest/IronPythonTest.csproj b/Src/IronPythonTest/IronPythonTest.csproj
@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnitLite" Version="3.11.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="NUnitLite" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Src/IronPythonWindow/IronPythonWindow.csproj b/Src/IronPythonWindow/IronPythonWindow.csproj
@@ -24,7 +24,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Src/IronPythonWindowAny/IronPythonWindowAny.csproj b/Src/IronPythonWindowAny/IronPythonWindowAny.csproj
@@ -27,7 +27,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Tests/test_formatting.py b/Tests/test_formatting.py
@@ -308,10 +308,6 @@ def test_format_testfile(self):
         """the following is borrowed from stdlib"""
         import math
         format_testfile = 'formatfloat_testcases.txt'
-        bugged = {
-            ('%.2f', 0.004999): "0.01",
-            ('%f', 4.9989999999999997e-07): "0.000001",
-        }
         with open(os.path.join(self.test_dir, format_testfile)) as testfile:
             for line in testfile:
                 print line
@@ -324,8 +320,6 @@ def test_format_testfile(self):
                 lhs, rhs = map(str.strip, line.split('->'))
                 fmt, arg = lhs.split()
                 arg = float(arg)
-                if is_netcoreapp30: # https://github.com/dotnet/corefx/issues/37524
-                    rhs = bugged.get((fmt, arg), rhs)
                 self.assertEqual(fmt % arg, rhs)
                 if not math.isnan(arg) and math.copysign(1.0, arg) > 0.0:
                     print("minus")
+30 −0		.github/workflows/main.yml
+0 −50		Build/netcoreapp2.0.props
+1 −1		Build/steps.yml
+84 −241		DLR.ruleset
+0 −1		Dlr.sln
+8 −8		Package/nuget/DynamicLanguageRuntime.nuspec
+1 −2		Src/Microsoft.Dynamic/Actions/ActionBinder.cs
+1 −1		Src/Microsoft.Dynamic/Debugging/DebugSourceSpan.cs
+1 −1		Src/Microsoft.Dynamic/Debugging/TracePipeline/TracePipeline.cs
+4 −4		Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj
+2 −2		Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj
+1 −1		Src/Microsoft.Scripting/Hosting/ErrorListener.cs
+5 −5		Src/Microsoft.Scripting/Microsoft.Scripting.csproj
+2 −2		Src/Microsoft.Scripting/Runtime/DlrConfiguration.cs
+1 −1		Src/Microsoft.Scripting/SourceSpan.cs
+2 −2		Src/Microsoft.Scripting/Utils/AssemblyQualifiedTypeName.cs
+3 −3		Tests/Metadata/Metadata.csproj
+3 −3		Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj
+176 −85		Tests/Microsoft.Dynamic.Test/TestReflectionServices.cs
+3 −3		Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj
+1 −1		global.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -939,6 +939,7 @@ object IEnumerator<object>.Current { @@
             }
             void IDisposable.Dispose() {
+                _keys.Dispose();
             }
             public object __iter__() {
@@ Expand Down @@