Fixed C# mappping to use .NET Core 3.1

4 files changed, 15 insertions, 16 deletions

diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props
index efb889b06e0..3300772ae65 100644
--- a/csharp/Directory.Build.props
+++ b/csharp/Directory.Build.props
@@ -8,7 +8,7 @@
         </When>
         <Otherwise>
             <PropertyGroup>
-                <AppTargetFramework Condition="'$(AppTargetFramework)' == ''">netcoreapp3.0</AppTargetFramework>
+                <AppTargetFramework Condition="'$(AppTargetFramework)' == ''">netcoreapp3.1</AppTargetFramework>
             </PropertyGroup>
         </Otherwise>
     </Choose>
diff --git a/csharp/README.md b/csharp/README.md
index 173cb66bfaf..ba064577025 100644
--- a/csharp/README.md
+++ b/csharp/README.md
@@ -28,7 +28,7 @@ A source build of Ice for .NET on Windows produces two sets of assemblies:
 In order to build Ice for .NET from source, you need all of the following:
  - a [supported version][3] of Visual Studio
  - the [.NET Core 2.1 SDK][4], if you use Visual Studio 2017
- - the [.NET Core 3.0 SDK][5], if you use Visual Studio 2019
+ - the [.NET Core 3.1 SDK][5], if you use Visual Studio 2019
 
 > Note: Visual Studio 2017 version 15.3.0 or higher is required for .NET Core
 > builds.
@@ -60,7 +60,7 @@ The `Net45Build`, `Net45BuildDist`, `NetStandardBuild` and
 `NetStandardBuildDist` targets allow you to build assemblies only for the .NET
 Framework 4.5 or .NET Standard 2.0, with or without the test suite.
 
-The iceboxnet and test applications target `netcoreapp3.0` when using Visual
+The iceboxnet and test applications target `netcoreapp3.1` when using Visual
 Studio 2019 and `netcoreapp2.1` when using Visual Studio 2017. You can change
 the target framework by setting the `AppTargetFramework` property to a different
 Target Framework Moniker value, for example:
@@ -116,7 +116,7 @@ necessary.
 
 ### Linux and macOS Build Requirements
 
-You need the [.NET Core 2.1 SDK][4] or [.NET Core 3.0 SDK][5] to build
+You need the [.NET Core 2.1 SDK][4] or [.NET Core 3.1 SDK][5] to build
 Ice for .NET from source.
 
 ### Compiling Ice for .NET on Linux or macOS
@@ -139,8 +139,8 @@ You can skip the build of the test suite with the `BuildDist` target:
 dotnet msbuild msbuild/ice.proj /t:BuildDist
 ```
 
-The iceboxnet and test applications target `netcoreapp3.0` when using .NET Core
-3.0 SDK and `netcoreapp2.1` when using .NET Core 2.1 SDK. You can change the
+The iceboxnet and test applications target `netcoreapp3.1` when using .NET Core
+3.1 SDK and `netcoreapp2.1` when using .NET Core 2.1 SDK. You can change the
 target framework by setting the `AppTargetFramework` property to a different
 Target Framework Moniker value, for example:
 
@@ -180,9 +180,9 @@ For example to run test build against .NET Framework 4.6.2:
 python allTests.py --framework=net462
 ```
 
-And to run test build against .NET Core 3.0:
+And to run test build against .NET Core 3.1:
 ```
-python allTests.py --dotnetcore --framework=netcoreapp3.0
+python allTests.py --dotnetcore --framework=netcoreapp3.1
 ```
 
 ## NuGet Package
@@ -204,7 +204,7 @@ directory.
 > also includes assemblies for .NET Standard 2.0.
 >
 > If you build with Visual Studio 2019 the NuGet package include iceboxnet
-> executables targeting .NET Framework 4.5, .NET Core 3.0 and .NET Core 2.1.
+> executables targeting .NET Framework 4.5, .NET Core 3.1 and .NET Core 2.1.
 >
 > If you build with Visual Studio 2017 the NuGet package include iceboxnet
 > executables targeting .NET Framework 4.5 and .NET Core 2.1.
@@ -312,5 +312,5 @@ python allTests.py --controller-app --config Release --platform iphonesimulator
 [2]: https://blogs.msdn.microsoft.com/dotnet/2017/08/14/announcing-net-standard-2-0
 [3]: https://doc.zeroc.com/ice/3.7/release-notes/supported-platforms-for-ice-3-7-3
 [4]: https://dotnet.microsoft.com/download/dotnet-core/2.1
-[5]: https://dotnet.microsoft.com/download/dotnet-core/3.0
+[5]: https://dotnet.microsoft.com/download/dotnet-core/3.1
 [6]: https://docs.microsoft.com/en-us/dotnet/framework/app-domains/enhanced-strong-naming
diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj
index d827090741b..ef758af8617 100644
--- a/csharp/msbuild/ice.proj
+++ b/csharp/msbuild/ice.proj
@@ -232,9 +232,9 @@
                  Targets="Restore;Publish"
                  Condition="'$(NetStandardTargets)' == 'true'"/>
 
-        <!-- Build iceboxnet with netcoreapp3.0 target framework -->
+        <!-- Build iceboxnet with netcoreapp3.1 target framework -->
         <MSBuild Projects="$(MSBuildThisFileDirectory)..\src\IceBox\msbuild\icebox\netstandard2.0\icebox.csproj"
-                 Properties="Configuration=$(Configuration);Platform=Any CPU;AppTargetFramework=netcoreapp3.0;BaseIntermediateOutputPath=obj\netcoreapp3.0\"
+                 Properties="Configuration=$(Configuration);Platform=Any CPU;AppTargetFramework=netcoreapp3.1;BaseIntermediateOutputPath=obj\netcoreapp3.1\"
                  Targets="Restore;Publish"
                  Condition="'$(NetStandardTargets)' == 'true' and '$(VisualStudioVersion)' == '16.0'"/>
 
@@ -281,7 +281,7 @@
 
         <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.dll;
                            $(MSBuildThisFileDirectory)..\..\cpp\msbuild\packages\bzip2.v140.1.0.6.10\build\native\bin\x64\MT-Release\bzip2.pdb"
-              DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\netcoreapp3.0"
+              DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\netcoreapp3.1"
               Condition="'$(NetStandardTargets)' == 'true' and '$(VisualStudioVersion)' == '16.0'"/>
 
         <Copy SourceFiles="zeroc.ice.net.props"
diff --git a/scripts/Util.py b/scripts/Util.py
index d3103683b13..2e42bc4f03b 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -216,7 +216,7 @@ class Platform(object):
             version = run("dotnet --version").split(".")
             self.nugetPackageCache = re.search("info : global-packages: (.*)",
                                                run("dotnet nuget locals --list global-packages")).groups(1)[0]
-            self.defaultNetCoreFramework = "netcoreapp{}".format("3.0" if int(version[0]) >= 3 else "2.1")
+            self.defaultNetCoreFramework = "netcoreapp{}".format("3.1" if int(version[0]) >= 3 else "2.1")
         except:
             self.nugetPackageCache = None
 
@@ -3549,8 +3549,7 @@ class CSharpMapping(Mapping):
             path = os.path.join(current.testcase.getPath(current), current.getBuildDir(exe))
 
         useDotnetExe = (current.config.dotnetcore and
-                        (current.config.testTargetFramework in ["netcoreapp2.1", "netcoreapp2.2"] or
-                         process.isFromBinDir()))
+                        (current.config.testTargetFramework in ["netcoreapp2.1"] or process.isFromBinDir() or isinstance(platform, Darwin)))
         command = ""
         if useDotnetExe:
             command += "dotnet "