Updating CLI to 2.0.0 version (dotnet/corefx#23751)

* Updating CLI to 2.0.0 version

* Fixing Tizen build by disabling warnings that for package downgrades due to missing RID specific packages for Tizen

Commit migrated from https://github.com/dotnet/corefx/commit/c6dbe361680efd21a20fdb8def01936b1031011c

diff --git a/src/libraries/BuildToolsVersion.txt b/src/libraries/BuildToolsVersion.txt
index f8f3084..993d7db 100644 (file)
--- a/src/libraries/BuildToolsVersion.txt
+++ b/src/libraries/BuildToolsVersion.txt
@@ -1 +1 @@
-2.0.0-prerelease-02020-01
+2.0.0-prerelease-02026-04

diff --git a/src/libraries/DotnetCLIVersion.txt b/src/libraries/DotnetCLIVersion.txt
index 170f3fc..227cea2 100644 (file)
--- a/src/libraries/DotnetCLIVersion.txt
+++ b/src/libraries/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.0.0-preview1-005977
+2.0.0

diff --git a/src/libraries/external/ILLink/illink.runtimeconfig.json b/src/libraries/external/ILLink/illink.runtimeconfig.json
index 51d6286..31f899f 100644 (file)
--- a/src/libraries/external/ILLink/illink.runtimeconfig.json
+++ b/src/libraries/external/ILLink/illink.runtimeconfig.json
@@ -3,7 +3,7 @@
     "tfm": "netcoreapp1.1",
     "framework": {
       "name": "Microsoft.NETCore.App",
-      "version": "2.0.0-preview1-001913-00"
+      "version": "2.0.0"
     }
   }
 }

diff --git a/src/libraries/external/runtime/runtime.depproj b/src/libraries/external/runtime/runtime.depproj
index 010011e..19f5f59 100644 (file)
--- a/src/libraries/external/runtime/runtime.depproj
+++ b/src/libraries/external/runtime/runtime.depproj
@@ -5,6 +5,7 @@
     <NugetRuntimeIdentifier>$(PackageRID)</NugetRuntimeIdentifier>
     <RidSpecificAssets>true</RidSpecificAssets>
     <CoreClrPackageVersion Condition="'$(TargetGroup)' == 'netcoreapp2.0'">2.0.0</CoreClrPackageVersion>
+    <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
     <!-- Temporarily Override restore moniker since NETNative's targeting pack still uses uap10.1 moniker -->

diff --git a/src/libraries/external/test-runtime/XUnit.Runtime.depproj b/src/libraries/external/test-runtime/XUnit.Runtime.depproj
index 643c7f2..c73ff24 100644 (file)
--- a/src/libraries/external/test-runtime/XUnit.Runtime.depproj
+++ b/src/libraries/external/test-runtime/XUnit.Runtime.depproj
@@ -15,6 +15,8 @@
     <NuGetTargetMonikerShort Condition="'$(TargetGroup)' == 'uapaot'">netstandard2.0</NuGetTargetMonikerShort>
     <NuGetTargetMoniker Condition="'$(TargetGroup)' == 'uap'">.NETStandard,Version=v2.0</NuGetTargetMoniker>
     <NuGetTargetMonikerShort Condition="'$(TargetGroup)' == 'uap'">netstandard2.0</NuGetTargetMonikerShort>
+    <!-- Don't warn if some dependencies were rolled forward -->
+    <NoWarn>$(NoWarn);NU1603</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="xunit.console.netcore">

diff --git a/src/libraries/init-tools.cmd b/src/libraries/init-tools.cmd
index f4b6739..695360b 100644 (file)
--- a/src/libraries/init-tools.cmd
+++ b/src/libraries/init-tools.cmd
@@ -33,7 +33,7 @@ if exist "%DOTNET_CMD%" goto :afterdotnetrestore
 
 echo Installing dotnet cli...
 if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%"
-set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip
+set DOTNET_ZIP_NAME=dotnet-sdk-%DOTNET_VERSION%-win-x64.zip
 set DOTNET_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
 set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME%
 echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%"

diff --git a/src/libraries/init-tools.sh b/src/libraries/init-tools.sh
index b10341e..87eddca 100755 (executable)
--- a/src/libraries/init-tools.sh
+++ b/src/libraries/init-tools.sh
@@ -23,7 +23,7 @@ if [ -z "$__DOTNET_PKG" ]; then
     case $OSName in
         Darwin)
             OS=OSX
-            __DOTNET_PKG=dotnet-dev-osx-x64
+            __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-osx-x64
             ulimit -n 2048
             # Format x.y.z as single integer with three digits for each part
             VERSION=`sw_vers -productVersion| sed -e 's/\./ /g' | xargs printf "%03d%03d%03d"`
@@ -34,7 +34,7 @@ if [ -z "$__DOTNET_PKG" ]; then
             ;;
 
         Linux)
-            __DOTNET_PKG=dotnet-dev-linux-x64
+            __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-linux-x64
             OS=Linux
                        
             if [ -e /etc/os-release ]; then
@@ -47,7 +47,7 @@ if [ -z "$__DOTNET_PKG" ]; then
             elif [ -e /etc/redhat-release ]; then
                 redhatRelease=$(</etc/redhat-release)
                 if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
-                    __DOTNET_PKG=dotnet-dev-rhel.6-x64
+                    __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-rhel.6-x64
                 fi
             fi                 
                        
@@ -56,7 +56,7 @@ if [ -z "$__DOTNET_PKG" ]; then
         *)
             echo "Unsupported OS '$OSName' detected. Downloading linux-x64 tools."
             OS=Linux
-            __DOTNET_PKG=dotnet-dev-linux-x64
+            __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-linux-x64
             ;;
   esac
 fi
@@ -85,7 +85,7 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
             cp -r $DOTNET_TOOL_DIR/* $__DOTNET_PATH
         else
             echo "Installing dotnet cli..."
-            __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
+            __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.tar.gz"
             # curl has HTTPS CA trust-issues less often than wget, so lets try that first.
             echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log
             if command -v curl > /dev/null; then

diff --git a/src/libraries/src.builds b/src/libraries/src.builds
index b6f33f1..40124b0 100644 (file)
--- a/src/libraries/src.builds
+++ b/src/libraries/src.builds
@@ -28,6 +28,7 @@
     </PropertyGroup>
 
     <GenerateDepsJson DepsJsonPath="$(_OriginalDepsJsonPath)"
+                      GenerateNewDepsJson="true"
                       RuntimeDirectory="$(NETCoreAppTestSharedFrameworkPath)"
                       DepsExceptions="@(ExceptionForDepsJson)"
                       OutputPath="$(_OutputTestSharedFrameworkDepsPath)"/>