diff options
| -rw-r--r-- | csharp/Directory.Build.props | 2 | ||||
| -rw-r--r-- | csharp/README.md | 8 | ||||
| -rw-r--r-- | csharp/msbuild/ice.nuget.targets | 4 | ||||
| -rw-r--r-- | csharp/msbuild/ice.proj | 2 | ||||
| -rw-r--r-- | scripts/Util.py | 8 |
5 files changed, 12 insertions, 12 deletions
diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props index e91ef3d096d..9d63bd2c1ab 100644 --- a/csharp/Directory.Build.props +++ b/csharp/Directory.Build.props @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <AppTargetFramework Condition="'$(AppTargetFramework)' == ''">netcoreapp2.2</AppTargetFramework> + <AppTargetFramework Condition="'$(AppTargetFramework)' == ''">netcoreapp2.1</AppTargetFramework> </PropertyGroup> </Project> diff --git a/csharp/README.md b/csharp/README.md index 76c2e6cc1a9..78a323d39e0 100644 --- a/csharp/README.md +++ b/csharp/README.md @@ -27,7 +27,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.2 SDK][4], if you use Visual Studio 2017 + - the [.NET Core 2.1 SDK][4], if you use Visual Studio 2017 > Note: Visual Studio 2017 version 15.3.0 or higher is required for .NET Core > builds. @@ -59,7 +59,7 @@ The `BuildNet45`, `BuildNet45Dist`, `BuildNetStandard` and `BuildNetStandardDist 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 `netcoreapp2.2`. You can change the target framework +The iceboxnet and test applications target `netcoreapp2.1`. You can change the target framework by setting the `AppTargetFrameworks` property to a different Target Framework Monikers (TFMs) value, for example: ``` @@ -111,7 +111,7 @@ This build retrieves and installs the `zeroc.ice.net` NuGet package if necessary ### Linux and macOS Build Requirements -You need the [.NET Core 2.2 SDK][4] to build Ice for .NET from source. +You need the [.NET Core 2.1 SDK][4] to build Ice for .NET from source. ### Compiling Ice for .NET on Linux or macOS @@ -275,5 +275,5 @@ python allTests.py --controller-app --config Release --platform iphonesimulator [1]: https://zeroc.com/distributions/ice [2]: https://blogs.msdn.microsoft.com/dotnet/2017/08/14/announcing-net-standard-2-0 [3]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.2 -[4]: https://www.microsoft.com/net/download +[4]: https://dotnet.microsoft.com/download/dotnet-core/2.1 [5]: https://docs.microsoft.com/en-us/dotnet/framework/app-domains/enhanced-strong-naming diff --git a/csharp/msbuild/ice.nuget.targets b/csharp/msbuild/ice.nuget.targets index 65310dfa309..853eb5f6616 100644 --- a/csharp/msbuild/ice.nuget.targets +++ b/csharp/msbuild/ice.nuget.targets @@ -12,7 +12,7 @@ <IceBoxNet45 Include="$(IceSrcRootDir)bin\net45\iceboxnet.exe; $(IceSrcRootDir)bin\net45\iceboxnet.pdb"/> - <IceBoxNetStandard Include="$(IceSrcRootDir)bin\netcoreapp2.2\publish\*" + <IceBoxNetStandard Include="$(IceSrcRootDir)bin\netcoreapp2.1\publish\*" Condition="'$(BuildNetStandardTargets)' == 'true'"/> <Assemblies Include="$(IceSrcRootDir)lib\**\*.dll; @@ -30,7 +30,7 @@ <Copy SourceFiles="@(Slices)" DestinationFolder="$(PackageDirectory)\slice\%(Slices.RecursiveDir)"/> <Copy SourceFiles="@(SliceCompilers)" DestinationFolder="$(PackageDirectory)\tools"/> <Copy SourceFiles="@(IceBoxNet45)" DestinationFolder="$(PackageDirectory)\tools\net45"/> - <Copy SourceFiles="@(IceBoxNetStandard)" DestinationFolder="$(PackageDirectory)\tools\netcoreapp2.2" + <Copy SourceFiles="@(IceBoxNetStandard)" DestinationFolder="$(PackageDirectory)\tools\netcoreapp2.1" Condition="'$(BuildNetStandardTargets)' == 'true'"/> </Target> </Project> diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj index 8f566c7c99e..15a02f8f53e 100644 --- a/csharp/msbuild/ice.proj +++ b/csharp/msbuild/ice.proj @@ -270,7 +270,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\netcoreapp2.2" + DestinationFolder="$(MSBuildThisFileDirectory)zeroc.ice.net\tools\netcoreapp2.1" Condition="'$(BuildNetStandardTargets)' == 'true'"/> <Copy SourceFiles="zeroc.ice.net.props" diff --git a/scripts/Util.py b/scripts/Util.py index 083dad4d9b6..4e821a69bfb 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -248,9 +248,9 @@ class Platform(object): installDir = component.getInstallDir(mapping, current) if isinstance(mapping, CSharpMapping): if component.useBinDist(mapping, current): - return os.path.join(installDir, "tools", "netcoreapp2.2") + return os.path.join(installDir, "tools", "netcoreapp2.1") else: - return os.path.join(installDir, "bin", "netcoreapp2.2") + return os.path.join(installDir, "bin", "netcoreapp2.1") return os.path.join(installDir, "bin") def _getLibDir(self, component, process, mapping, current): @@ -3277,8 +3277,8 @@ class CSharpMapping(Mapping): if self.dotnetcore: self.libTargetFramework = "netstandard2.0" - self.binTargetFramework = "netcoreapp2.2" if self.framework == "" else self.framework - self.testTargetFramework = "netcoreapp2.2" if self.framework == "" else self.framework + self.binTargetFramework = "netcoreapp2.1" if self.framework == "" else self.framework + self.testTargetFramework = "netcoreapp2.1" if self.framework == "" else self.framework else: self.libTargetFramework = "net45" if self.framework == "" else "netstandard2.0" self.binTargetFramework = "net45" if self.framework == "" else self.framework |