.NET Core 3.1 (IronLanguages#224)

* .NET Core 3.1 * Install 3.1 SDK * Split testing in multiple steps
jamestiotio · Jan 18, 2020 · 5a356aa · 5a356aa
1 parent 19ef3b5
commit 5a356aa
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 36 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,9 +14,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - uses: actions/setup-dotnet@v1
+    - uses: actions/setup-dotnet@v1.4.0
       with:
-        dotnet-version: '3.0.100'
+        dotnet-version: '3.1.100'
     - name: Build
       run: pwsh make.ps1
     - name: Package
@@ -25,12 +25,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.0.props → Build/netcoreapp3.1.props b/Build/netcoreapp3.0.props → Build/netcoreapp3.1.props
diff --git a/Build/steps.yml b/Build/steps.yml
@@ -28,10 +28,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'
 
   # Install mono when running on Linux
   - ${{ if eq(parameters.os, 'Linux') }}:

diff --git a/Dlr.sln b/Dlr.sln
@@ -37,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{60056F49
 		Build\After.targets = Build\After.targets
 		Build\net45.props = Build\net45.props
 		Build\netcoreapp2.1.props = Build\netcoreapp2.1.props
-		Build\netcoreapp3.0.props = Build\netcoreapp3.0.props
+		Build\netcoreapp3.1.props = Build\netcoreapp3.1.props
 		Build\netstandard2.0.props = Build\netstandard2.0.props
 		Build\steps.yml = Build\steps.yml
 	EndProjectSection

diff --git a/Package/nuget/DynamicLanguageRuntime.nuspec b/Package/nuget/DynamicLanguageRuntime.nuspec
@@ -27,9 +27,9 @@
         <dependency id="System.Reflection.Emit" version="4.6.0" />
         <dependency id="System.Reflection.Emit.Lightweight" version="4.6.0" />
       </group>
-      <group targetFramework="netcoreapp3.0">
-        <dependency id="System.CodeDom" version="4.6.0" />
-        <dependency id="System.Configuration.ConfigurationManager" version="4.6.0" />
+      <group targetFramework="netcoreapp3.1">
+        <dependency id="System.CodeDom" version="4.7.0" />
+        <dependency id="System.Configuration.ConfigurationManager" version="4.7.0" />
       </group>
     </dependencies>
   </metadata>

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ The original DLR site is at [CodePlex](http://dlr.codeplex.com). The DLR was par
 
 Build
 -----
-You will need to have Visual Studio 2019 16.3.0 or later installed on your machine.
+You will need to have Visual Studio 2019 16.4.0 or later installed on your machine.
 
 On Windows machines, start a Visual Studio command prompt and type:
 

diff --git a/Src/Microsoft.Dynamic/ComInterop/ComObject.cs b/Src/Microsoft.Dynamic/ComInterop/ComObject.cs
@@ -20,12 +20,7 @@ namespace Microsoft.Scripting.ComInterop {
     /// <summary>
     /// The ComObject class wraps a runtime-callable-wrapper and enables it to be used with the Dynamic Language Runtime and the C# dynamic keyword.
     /// </summary>
-#if NETCOREAPP3_0
-    public
-#else
-    internal
-#endif
-    class ComObject : IDynamicMetaObjectProvider {
+    internal class ComObject : IDynamicMetaObjectProvider {
         internal ComObject(object rcw) {
             Debug.Assert(Utils.TypeUtils.IsComObject(rcw));
             RuntimeCallableWrapper = rcw;

diff --git a/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj b/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.1;netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.1;netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <RootNamespace>Microsoft.Scripting</RootNamespace>
     <BaseAddress>859832320</BaseAddress>
     <CodeAnalysisRuleSet>..\..\DLR.ruleset</CodeAnalysisRuleSet>

diff --git a/Src/Microsoft.Scripting/Microsoft.Scripting.csproj b/Src/Microsoft.Scripting/Microsoft.Scripting.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.1;netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <BaseAddress>857735168</BaseAddress>
     <CodeAnalysisRuleSet>..\..\DLR.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(IsFullFramework)' != 'true' ">
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
-    <PackageReference Include="System.CodeDom" Version="4.6.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+    <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/Tests/Metadata/Metadata.csproj b/Tests/Metadata/Metadata.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>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);CCI</DefineConstants>

diff --git a/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj b/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.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/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj b/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.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/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
 )
-Original file line number
+Diff line change
@@ Expand Up @@
     Build
     -----
-    You will need to have Visual Studio 2019 16.3.0 or later installed on your machine.
+    You will need to have Visual Studio 2019 16.4.0 or later installed on your machine.
     On Windows machines, start a Visual Studio command prompt and type:
@@ Expand Down @@