Upgrade to .NET Core 3.1 (#725)

slozier · web-flow · commit 6417e98892e0 · 2020-01-18T10:52:05.000-05:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,9 +19,9 @@ jobs:
     - uses: actions/checkout@v1
       with:
         submodules: true
-    - uses: actions/setup-dotnet@v1
+    - uses: actions/setup-dotnet@v1.4.0
       with:
-        dotnet-version: '3.0.100'
+        dotnet-version: '3.1.100'
     - name: Set Mono Version
       if: matrix.os == 'macos-latest'
       run: echo ::add-path::/Library/Frameworks/Mono.framework/Versions/6.4.0/bin
@@ -38,12 +38,14 @@ jobs:
       with:
         name: packages
         path: Package/Release/Packages
-    - name: Test
-      run: |
-        Write-Host ${env:DOTNET_ROOT}
-        ./make.ps1 -frameworks net45,netcoreapp3.0 test-all
-      env:
-        # Work around https://github.com/actions/setup-dotnet/issues/29
-        DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/3.0.100/x64
+    - name: Test (net45)
+      run: ./make.ps1 -frameworks net45 test-all
+      shell: pwsh
+    - name: Test (netcoreapp2.1)
+      # TODO: figure out how to test on other OSs
+      if: matrix.os == 'windows-latest'
+      run: ./make.ps1 -frameworks netcoreapp2.1 test-all
+      shell: pwsh
+    - name: Test (netcoreapp3.1)
+      run: ./make.ps1 -frameworks netcoreapp3.1 test-all
       shell: pwsh
-      # TODO: figure out how to also test on netcoreapp2.1
diff --git a/Build/netcoreapp3.1.props b/Build/netcoreapp3.1.props
diff --git a/Build/steps.yml b/Build/steps.yml
@@ -31,10 +31,10 @@ steps:
       version: '2.1.x'
 
   - task: DotNetCoreInstaller@1
-    displayName: Install .NET Core 3.0 SDK for build
+    displayName: Install .NET Core 3.1 SDK for build
     inputs:
       packageType: 'sdk'
-      version: '3.0.100'
+      version: '3.1.100'
 
   # Set Mono version on macOS
   - ${{ if eq(parameters.os, 'macOS') }}:
diff --git a/Documentation/building.md b/Documentation/building.md
@@ -1,12 +1,12 @@
 # Building IronPython3
 
-To build IronPython3 you will need the .NET SDK (minimum 4.5), a [.NET Core SDK (minimum 3.0)](https://dotnet.microsoft.com/download/visual-studio-sdks) and if building on Linux/macOS you will need [Mono](https://mono-project.com).
+To build IronPython3 you will need the .NET SDK (minimum 4.5), a [.NET Core SDK (minimum 3.1)](https://dotnet.microsoft.com/download/visual-studio-sdks) and if building on Linux/macOS you will need [Mono](https://mono-project.com).
 
 See [Getting the Sources](getting-the-sources.md) for information on getting the source for IronPython3.
 
 ## Building from Visual Studio
 
-Visual Studio 16.0(2019) or above is required to build IronPython3.
+Visual Studio 16.4(2019) or above is required to build IronPython3.
 
  * Open `c:\path\to\ironpython3\IronPython.sln` solution file
  * Select the configuration options (Release,Debug, etc)
diff --git a/Package/nuget/IronPython.nuspec b/Package/nuget/IronPython.nuspec
@@ -28,8 +28,8 @@
         <dependency id="Microsoft.Win32.Registry" version="4.5.0" />
         <dependency id="DynamicLanguageRuntime" version="[1.2.3-alpha0]" />
       </group>
-      <group targetFramework="netcoreapp3.0">
-        <dependency id="Microsoft.Win32.Registry" version="4.6.0" />
+      <group targetFramework="netcoreapp3.1">
+        <dependency id="Microsoft.Win32.Registry" version="4.7.0" />
         <dependency id="DynamicLanguageRuntime" version="[1.2.3-alpha0]" />
       </group>
     </dependencies>
diff --git a/Src/DLR b/Src/DLR
@@ -1 +1 @@
-Subproject commit 19ef3b59c9f5a0255ee1286a897095ba00773c3e
+Subproject commit 5a356aa152a760f60fce25d93778bada0f7e61ff
diff --git a/Src/IronPython.Modules/IronPython.Modules.csproj b/Src/IronPython.Modules/IronPython.Modules.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1;netstandard2.0</TargetFrameworks>
     <BaseAddress>885063680</BaseAddress>
     <CodeAnalysisRuleSet>..\..\IronPython.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -37,8 +37,8 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.6.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
   </ItemGroup>
 
   <Import Project="$(AfterTargetFiles)" />
diff --git a/Src/IronPython.SQLite/IronPython.SQLite.csproj b/Src/IronPython.SQLite/IronPython.SQLite.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1;netstandard2.0</TargetFrameworks>
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <SQLiteCommon>SQLITE_DEBUG;TRUE;WIN32;_MSC_VER;SQLITE_ASCII;SQLITE_MEM_POOL;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_OS_WIN;SQLITE_SYSTEM_MALLOC;VDBE_PROFILE_OFF</SQLiteCommon>
     <SQLiteCommonOmit>SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_DEPRECATED;SQLITE_OMIT_GET_TABLE;SQLITE_OMIT_INCRBLOB;SQLITE_OMIT_LOOKASIDE;SQLITE_OMIT_SHARED_CACHE;SQLITE_OMIT_UTF16;SQLITE_OMIT_WAL</SQLiteCommonOmit>
diff --git a/Src/IronPython.Wpf/DynamicXamlReader.cs b/Src/IronPython.Wpf/DynamicXamlReader.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 
 using System;
 using System.Xaml;
diff --git a/Src/IronPython.Wpf/IronPython.Wpf.csproj b/Src/IronPython.Wpf/IronPython.Wpf.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);netcoreapp3.1</TargetFrameworks>
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <BaseAddress>885063680</BaseAddress>
     <StoreInDLLs>true</StoreInDLLs>
diff --git a/Src/IronPython.Wpf/_wpf.cs b/Src/IronPython.Wpf/_wpf.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
-#if FEATURE_WPF || NETCOREAPP3_0
+#if FEATURE_WPF || NETCOREAPP3_1
 
 using System.IO;
 using System.Runtime.CompilerServices;
@@ -15,7 +15,7 @@
 using IronPython.Runtime;
 using IronPython.Runtime.Operations;
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 using Microsoft.Internal.Scripting.Runtime; // TODO: get rid of this once DynamicXamlReader is in the DLR
 #endif
 
diff --git a/Src/IronPython/IronPython.csproj b/Src/IronPython/IronPython.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1;netstandard2.0</TargetFrameworks>
     <BaseAddress>879755264</BaseAddress>
     <CodeAnalysisRuleSet>..\..\IronPython.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
diff --git a/Src/IronPython/Lib/iptest/test_env.py b/Src/IronPython/Lib/iptest/test_env.py
@@ -18,13 +18,13 @@
 
 is_netcoreapp =  False
 is_netcoreapp21 = False
-is_netcoreapp30 = False
+is_netcoreapp31 = False
 is_mono = False
 if is_ironpython:
     import clr
     is_netcoreapp = clr.IsNetCoreApp
     is_netcoreapp21 = clr.TargetFramework == ".NETCoreApp,Version=v2.1"
-    is_netcoreapp30 = clr.TargetFramework == ".NETCoreApp,Version=v3.0"
+    is_netcoreapp31 = clr.TargetFramework == ".NETCoreApp,Version=v3.1"
     is_mono = clr.IsMono
 
 #--The bittedness of the Python implementation
diff --git a/Src/IronPython/Modules/sys.cs b/Src/IronPython/Modules/sys.cs
@@ -447,7 +447,7 @@ public override string __repr__(CodeContext context) {
             }
         }
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         public static string float_repr_style = "short";
 #else
         public static string float_repr_style = "legacy";
diff --git a/Src/IronPythonConsole/IronPythonConsole.csproj b/Src/IronPythonConsole/IronPythonConsole.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>IronPythonConsole</RootNamespace>
     <AssemblyName>ipy</AssemblyName>
diff --git a/Src/IronPythonTest/IronPythonTest.csproj b/Src/IronPythonTest/IronPythonTest.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Tests/test_formatting.py b/Tests/test_formatting.py
@@ -5,7 +5,7 @@
 import os
 import unittest
 
-from iptest import IronPythonTestCase, is_cli, is_netcoreapp30, run_test, skipUnlessIronPython
+from iptest import IronPythonTestCase, is_cli, is_netcoreapp31, run_test, skipUnlessIronPython
 
 class A:
     def __str__(self):
@@ -59,7 +59,7 @@ def test_floats(self):
 
         # More than 12 significant digits near the decimal point, with rounding up
 
-        if is_cli and not is_netcoreapp30: # https://github.com/IronLanguages/ironpython2/issues/634
+        if is_cli and not is_netcoreapp31: # https://github.com/IronLanguages/ironpython2/issues/634
             self.assertEqual(str(12345678901.25), "12345678901.3")
             self.assertEqual(str(123456789012.5), "123456789013.0")
         else:
@@ -69,7 +69,7 @@ def test_floats(self):
             else:
                 self.assertEqual(str(123456789012.5), "1.23456789012e+11")
 
-        if is_cli and not is_netcoreapp30: # https://github.com/IronLanguages/ironpython2/issues/634
+        if is_cli and not is_netcoreapp31: # https://github.com/IronLanguages/ironpython2/issues/634
             self.assertEqual(str(1.234567890125), "1.23456789013")
         else:
             self.assertEqual(str(1.234567890125), "1.23456789012")
@@ -135,7 +135,7 @@ def test_floats(self):
                 (1000000.0, "1e+06"),
                 (0.0001, "0.0001"),
                 (0.00001, "1e-05")]
-        if is_cli and not is_netcoreapp30: # https://github.com/IronLanguages/ironpython2/issues/634
+        if is_cli and not is_netcoreapp31: # https://github.com/IronLanguages/ironpython2/issues/634
             values.append((123456.5, "123457"))
         else:
             values.append((123456.5, "123456"))
@@ -304,15 +304,10 @@ def test_cp28936(self):
         self.assertEqual('% -10.1e' % -1, '-1.0e+00  ')
         self.assertEqual('%+-10.1e' % -1, '-1.0e+00  ')
 
-
     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)
@@ -325,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")
diff --git a/global.json b/global.json
diff --git a/make.ps1 b/make.ps1
@@ -4,7 +4,7 @@ Param(
     [Parameter(Position=1)]
     [String] $target = "release",
     [String] $configuration = "Release",
-    [String[]] $frameworks=@('net45','netcoreapp2.1','netcoreapp3.0'),
+    [String[]] $frameworks=@('net45','netcoreapp2.1','netcoreapp3.1'),
     [String] $platform = "x64",
     [switch] $runIgnored
 )
