diff options
| author | Jose <jose@zeroc.com> | 2019-09-25 17:36:52 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-09-25 17:36:52 +0200 |
| commit | ddc9b06643fc4d691808abb322cd835fc7f780dd (patch) | |
| tree | 7b7644e4e2a4541f7050a6e4a2a1801923b3bc7e | |
| parent | .NET Core 3.0 testing (diff) | |
| download | ice-ddc9b06643fc4d691808abb322cd835fc7f780dd.tar.bz2 ice-ddc9b06643fc4d691808abb322cd835fc7f780dd.tar.xz ice-ddc9b06643fc4d691808abb322cd835fc7f780dd.zip | |
Update .NET Core default target framework to .netcoreapp3.0
| -rw-r--r-- | csharp/Directory.Build.props | 2 | ||||
| -rw-r--r-- | csharp/README.md | 6 | ||||
| -rw-r--r-- | csharp/msbuild/ice.proj | 6 | ||||
| -rw-r--r-- | scripts/Util.py | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props index 9d63bd2c1ab..97eca0c8f30 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.1</AppTargetFramework> + <AppTargetFramework Condition="'$(AppTargetFramework)' == ''">netcoreapp3.0</AppTargetFramework> </PropertyGroup> </Project> diff --git a/csharp/README.md b/csharp/README.md index 71cbe6a758c..9d1b8c0eb8b 100644 --- a/csharp/README.md +++ b/csharp/README.md @@ -59,11 +59,11 @@ 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.1`. You can change the target framework -by setting the `AppTargetFrameworks` property to a different Target Framework Monikers (TFMs) +The iceboxnet and test applications target `netcoreapp3.0`. You can change the target framework +by setting the `AppTargetFramework` property to a different Target Framework Monikers (TFMs) value, for example: ``` -msbuild msbuild\ice.proj /p:"AppTargetFrameworks=net462" +msbuild msbuild\ice.proj /p:"AppTargetFramework=net462" ``` This builds the test programs for `net462`. The target frameworks you specify must diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj index 2bab5fb5faa..2e4cd9e69d5 100644 --- a/csharp/msbuild/ice.proj +++ b/csharp/msbuild/ice.proj @@ -226,10 +226,10 @@ <Target Name="WindowsNuGetPack" DependsOnTargets="BuildDist" Condition="'$(OS)' == 'Windows_NT'"> <RemoveDir Directories="zeroc.ice.net" /> - <!-- Build iceboxnet with netcoreapp3.0 target framework (default) --> + <!-- Build iceboxnet with netcoreapp2.1 target framework (default) --> <MSBuild Projects="$(MSBuildThisFileDirectory)..\src\IceBox\msbuild\icebox\netstandard2.0\icebox.csproj" - Properties="Configuration=$(Configuration);Platform=Any CPU" - Targets="Publish" + Properties="Configuration=$(Configuration);Platform=Any CPU;AppTargetFramework=netcoreapp2.1;BaseIntermediateOutputPath=obj\netcoreapp2.1\" + Targets="Restore;Publish" Condition="'$(BuildNetStandardTargets)' == 'true'"/> <!-- Build iceboxnet with netcoreapp3.0 target framework --> diff --git a/scripts/Util.py b/scripts/Util.py index f80ad988fe0..f097febc45b 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -3362,8 +3362,8 @@ class CSharpMapping(Mapping): if self.dotnetcore: self.libTargetFramework = "netstandard2.0" - self.binTargetFramework = "netcoreapp2.1" if self.framework == "" else self.framework - self.testTargetFramework = "netcoreapp2.1" if self.framework == "" else self.framework + self.binTargetFramework = "netcoreapp3.0" if self.framework == "" else self.framework + self.testTargetFramework = "netcoreapp3.0" 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 |