projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 21ce329)
[master] Update dependencies from dotnet/arcade mono/linker Microsoft/vstest (#33718)
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Wed, 18 Mar 2020 21:47:59 +0000 (17:47 -0400)
committerGitHub <noreply@github.com>
Wed, 18 Mar 2020 21:47:59 +0000 (17:47 -0400)
* Update dependencies from https://github.com/dotnet/arcade build 20200318.1

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20168.1
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20168.1
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20168.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20168.1
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20168.1
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20168.1
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20168.1
- Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20168.1
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20168.1
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20168.1
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20168.1
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20168.1
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20168.1
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20168.1

* Update dependencies from https://github.com/mono/linker build 20200318.1

- ILLink.Tasks - 0.1.6-prerelease.20168.1

* Update dependencies from https://github.com/microsoft/vstest build 20200317-02

- Microsoft.NET.Test.Sdk - 16.6.0-preview-20200317-02

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
eng/Version.Details.xml patch | blob | history
eng/Versions.props patch | blob | history
eng/common/cross/build-android-rootfs.sh patch | blob | history
global.json patch | blob | history

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 26e4df5..51bcc9e 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -6,61 +6,61 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20167.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20168.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>76778a412f34ee621bf7dcf2aa6e49db0c7a6a46</Sha>
+      <Sha>a5981bea658fa46405eb39b59f8d8bbd2730a141</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -82,9 +82,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
       <Sha>d0bb63d2ec7060714e63ee4082fac48f2e57f3e2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.6.0-preview-20200316-01">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.6.0-preview-20200317-02">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>1f9234279752d90f9c094f85164e0a61dec7ec3b</Sha>
+      <Sha>7e62090f0a27e3754724dd7f39bf10c14eb24b22</Sha>
     </Dependency>
     <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20162.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -166,9 +166,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>e793fcc19797f407a1b7e98d5f81b04e25a551c3</Sha>
     </Dependency>
-    <Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.20166.4">
+    <Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.20168.1">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>eb2b1c6674a1e881e7baa0cb136a978ee3b39f89</Sha>
+      <Sha>461e313c839bac4ac9f53932ca5df1778a586dce</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index ac50220..7ead4ae 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -60,16 +60,16 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20167.1</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20167.1</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20167.1</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20167.1</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20167.1</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20167.1</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20167.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20167.1</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20167.1</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20167.1</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20168.1</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20168.1</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20168.1</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20168.1</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20168.1</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20168.1</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20168.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20168.1</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20168.1</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20168.1</MicrosoftDotNetVersionToolsTasksVersion>
     <!-- Installer dependencies -->
     <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.20080.9</MicrosoftNETCoreAppVersion>
     <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.20080.9</MicrosoftNETCoreDotNetHostVersion>
@@ -114,7 +114,7 @@
     <!-- System.Data.SqlClient -->
     <SystemDataSqlClientVersion>4.8.0</SystemDataSqlClientVersion>
     <!-- Testing -->
-    <MicrosoftNETTestSdkVersion>16.6.0-preview-20200316-01</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>16.6.0-preview-20200317-02</MicrosoftNETTestSdkVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
     <TraceEventVersion>2.0.5</TraceEventVersion>
     <NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
@@ -123,7 +123,7 @@
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>3.1.0-preview-20200129.1</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->
-    <ILLinkTasksVersion>0.1.6-prerelease.20166.4</ILLinkTasksVersion>
+    <ILLinkTasksVersion>0.1.6-prerelease.20168.1</ILLinkTasksVersion>
     <!-- Mono LLVM -->
     <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20166.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
     <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20166.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh
index 5e74881..e7f12ed 100755 (executable)
--- a/eng/common/cross/build-android-rootfs.sh
+++ b/eng/common/cross/build-android-rootfs.sh
@@ -53,12 +53,20 @@ for i in "$@"
 done
 
 # Obtain the location of the bash script to figure out where the root of the repo is.
-__CrossDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-__Android_Cross_Dir="$(cd "$__CrossDir/../../../.tools/android-rootfs" && pwd)"
+__ScriptBaseDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-__NDK_Dir="$__Android_Cross_Dir/android-ndk-$__NDK_Version"
-__lldb_Dir="$__Android_Cross_Dir/lldb"
-__ToolchainDir="$__Android_Cross_Dir/android-ndk-$__NDK_Version"
+__CrossDir="$__ScriptBaseDir/../../../.tools/android-rootfs"
+
+if [[ ! -f "$__CrossDir" ]]; then
+    mkdir -p "$__CrossDir"
+fi
+
+# Resolve absolute path to avoid `../` in build logs
+__CrossDir="$( cd "$__CrossDir" && pwd )"
+
+__NDK_Dir="$__CrossDir/android-ndk-$__NDK_Version"
+__lldb_Dir="$__CrossDir/lldb"
+__ToolchainDir="$__CrossDir/android-ndk-$__NDK_Version"
 
 if [[ -n "$TOOLCHAIN_DIR" ]]; then
     __ToolchainDir=$TOOLCHAIN_DIR
@@ -77,19 +85,20 @@ echo "Target Toolchain location: $__ToolchainDir"
 if [ ! -d $__NDK_Dir ]; then
     echo Downloading the NDK into $__NDK_Dir
     mkdir -p $__NDK_Dir
-    wget -nv -nc --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__Android_Cross_Dir/android-ndk-$__NDK_Version-linux-x86_64.zip
-    unzip -q $__Android_Cross_Dir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__Android_Cross_Dir
+    wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip
+    unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__CrossDir
 fi
 
 if [ ! -d $__lldb_Dir ]; then
     mkdir -p $__lldb_Dir
     echo Downloading LLDB into $__lldb_Dir
-    wget -nv -nc --show-progress https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip -O $__Android_Cross_Dir/lldb-2.3.3614996-linux-x86_64.zip
-    unzip -q $__Android_Cross_Dir/lldb-2.3.3614996-linux-x86_64.zip -d $__lldb_Dir
+    wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip -O $__CrossDir/lldb-2.3.3614996-linux-x86_64.zip
+    unzip -q $__CrossDir/lldb-2.3.3614996-linux-x86_64.zip -d $__lldb_Dir
 fi
 
 echo "Download dependencies..."
-mkdir -p $__Android_Cross_Dir/tmp/$arch/
+__TmpDir=$__CrossDir/tmp/$__BuildArch/
+mkdir -p "$__TmpDir"
 
 # combined dependencies for coreclr, installer and libraries
 __AndroidPackages="libicu"
@@ -103,11 +112,11 @@ for path in $(wget -qO- http://termux.net/dists/stable/main/binary-$__AndroidArc
 
     if [[ "$path" != "Filename:" ]]; then
         echo "Working on: $path"
-        wget -qO- http://termux.net/$path | dpkg -x - $__Android_Cross_Dir/tmp/$__AndroidArch/
+        wget -qO- http://termux.net/$path | dpkg -x - "$__TmpDir"
     fi
 done
 
-cp -R $__Android_Cross_Dir/tmp/$__AndroidArch/data/data/com.termux/files/usr/* $__ToolchainDir/sysroot/usr/
+cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/sysroot/usr/"
 
 # Generate platform file for build.sh script to assign to __DistroRid
 echo "Generating platform file..."
@@ -115,6 +124,8 @@ echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/sysroot/androi
 
 echo "Now to build coreclr, libraries and installers; run:"
 echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
-    --subsetCategory coreclr \
-    --subsetCategory libraries \
+    --subsetCategory coreclr
+echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
+    --subsetCategory libraries
+echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
     --subsetCategory installer
diff --git a/global.json b/global.json
index 606ef2f..c7d9fc3 100644 (file)
--- a/global.json
+++ b/global.json
@@ -12,10 +12,10 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20167.1",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20167.1",
-    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20167.1",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20167.1",
+    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20168.1",
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20168.1",
+    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20168.1",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20168.1",
     "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
     "Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2",
     "Microsoft.Build.NoTargets": "1.0.53",
Domain: Dotnet / Core;