Update CLI to 1.0.0-preview2-1-003182, BuildTools to 1.0.27-prerelease-01205-03 ...

* Update CLI to 1.0.0-preview2-1-003182, BuildTools to 1.0.27-prerelease-01205-03

* Add BuildVersion.targets and required properties to test directory's dir.props

Commit migrated from https://github.com/dotnet/coreclr/commit/6784aa67f2ef7350770fdecefc2078e862fed3bb

diff --git a/src/coreclr/BuildToolsVersion.txt b/src/coreclr/BuildToolsVersion.txt
index f271787..4c6fcde 100644 (file)
--- a/src/coreclr/BuildToolsVersion.txt
+++ b/src/coreclr/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.27-prerelease-01008-01
\ No newline at end of file
+1.0.27-prerelease-01205-03
\ No newline at end of file

diff --git a/src/coreclr/DotnetCLIVersion.txt b/src/coreclr/DotnetCLIVersion.txt
index b0f8213..e42fc5f 100644 (file)
--- a/src/coreclr/DotnetCLIVersion.txt
+++ b/src/coreclr/DotnetCLIVersion.txt
@@ -1 +1 @@
-1.0.0-preview3-003223
\ No newline at end of file
+1.0.0-preview2-1-003182
\ No newline at end of file

diff --git a/src/coreclr/init-tools.cmd b/src/coreclr/init-tools.cmd
index cb1aad4..9e41480 100644 (file)
--- a/src/coreclr/init-tools.cmd
+++ b/src/coreclr/init-tools.cmd
@@ -45,7 +45,7 @@ if exist "%DOTNET_CMD%" goto :afterdotnetrestore
 echo Installing dotnet cli...
 if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%"
 if [%PROCESSOR_ARCHITECTURE%]==[x86] (set DOTNET_ZIP_NAME=dotnet-dev-win-x86.%DOTNET_VERSION%.zip) else (set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip)
-set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
+set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/%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%"
 powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%"

diff --git a/src/coreclr/init-tools.sh b/src/coreclr/init-tools.sh
index 83a320f..9a83bda 100755 (executable)
--- a/src/coreclr/init-tools.sh
+++ b/src/coreclr/init-tools.sh
@@ -107,7 +107,7 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
             cp -r $DOTNET_TOOL_DIR/* $__DOTNET_PATH
         else
             echo "Installing dotnet cli..."
-            __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
+            __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.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/coreclr/tests/dir.props b/src/coreclr/tests/dir.props
index 43026ca..dcaee88 100644 (file)
--- a/src/coreclr/tests/dir.props
+++ b/src/coreclr/tests/dir.props
@@ -33,6 +33,22 @@
     <SkipImportILTargets>true</SkipImportILTargets>
   </PropertyGroup>
 
+  <!-- Common properties -->
+  <PropertyGroup>
+    <RootBinDir>$(__RootBinDir)\</RootBinDir>
+    <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
+  </PropertyGroup>
+
+  <!-- Output paths -->
+  <PropertyGroup>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(RootBinDir)obj\</BaseIntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(BuildType)</IntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(BuildType)</OutputPath>
+    <FinalOutputPath Condition="'$(FinalOutputPath)' == ''">$(BinDir)</FinalOutputPath>
+  </PropertyGroup>
+
+  <Import Condition="Exists('$(ToolsDir)BuildVersion.targets')" Project="$(ToolsDir)BuildVersion.targets" />
+
   <!-- Provides properties for dependency versions and configures dependency verification/auto-upgrade. -->
   <Import Project="$(ProjectDir)..\dependencies.props" />