[master] Update dependencies from dotnet/arcade dotnet/runtime-assets (#31855)

* Update dependencies from https://github.com/dotnet/arcade build 20200205.2

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

* Update dependencies from https://github.com/dotnet/runtime-assets build 20200205.1

- System.Windows.Extensions.TestData - 5.0.0-beta.20105.1
- System.Security.Cryptography.X509Certificates.TestData - 5.0.0-beta.20105.1
- System.Private.Runtime.UnicodeData - 5.0.0-beta.20105.1
- System.Net.TestData - 5.0.0-beta.20105.1
- System.IO.Packaging.TestData - 5.0.0-beta.20105.1
- System.IO.Compression.TestData - 5.0.0-beta.20105.1
- System.Drawing.Common.TestData - 5.0.0-beta.20105.1
- System.ComponentModel.TypeConverter.TestData - 5.0.0-beta.20105.1

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 23dea9a..68cefee 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -42,65 +42,65 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20103.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>27c8467294a4e64ac6642b4c12ca63495ff126c8</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20104.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
+      <Sha>b65df96ccb820fd5f7ea226aeba310485f395130</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>
@@ -126,37 +126,37 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>fd0fe3df347a081b56c4da89f85a3e1ff463a4e7</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20072.1">
+    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20105.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>bb1d9660e3adf9acb81a229c91a8de9d25a020e1</Sha>
+      <Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.20072.1">
+    <Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.20105.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>bb1d9660e3adf9acb81a229c91a8de9d25a020e1</Sha>
+      <Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.20072.1">
+    <Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.20105.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>bb1d9660e3adf9acb81a229c91a8de9d25a020e1</Sha>
+      <Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.20072.1">
+    <Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.20105.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>bb1d9660e3adf9acb81a229c91a8de9d25a020e1</Sha>
+      <Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
     </Dependency>
-    <Dependency Name="System.Net.TestData" Version="5.0.0-beta.20072.1">
+    <Dependency Name="System.Net.TestData" Version="5.0.0-beta.20105.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>bb1d9660e3adf9acb81a229c91a8de9d25a020e1</Sha>
+      <Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
     </Dependency>
-    <Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.20072.1">
+    <Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.20105.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>bb1d9660e3adf9acb81a229c91a8de9d25a020e1</Sha>
+      <Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.20072.1">
+    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.20105.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>bb1d9660e3adf9acb81a229c91a8de9d25a020e1</Sha>
+      <Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.20072.1">
+    <Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.20105.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>bb1d9660e3adf9acb81a229c91a8de9d25a020e1</Sha>
+      <Sha>572e952eae1d4fc6e83300031c5f7c401014ff34</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
index a579595..854eb25 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,16 +57,16 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20104.2</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20104.2</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20104.2</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20104.2</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20104.2</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20104.2</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20104.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20104.2</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20104.2</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20104.2</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20105.2</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20105.2</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20105.2</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20105.2</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20105.2</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20105.2</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20105.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20105.2</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20105.2</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20105.2</MicrosoftDotNetVersionToolsTasksVersion>
     <!-- Installer dependencies -->
     <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.20080.9</MicrosoftNETCoreAppVersion>
     <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.20080.9</MicrosoftNETCoreDotNetHostVersion>
@@ -81,14 +81,14 @@
     <SystemTextEncodingsWebVersion>5.0.0-alpha.1.19563.6</SystemTextEncodingsWebVersion>
     <runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19563.3</runtimenativeSystemIOPortsVersion>
     <!-- Runtime-Assets dependencies -->
-    <SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20072.1</SystemComponentModelTypeConverterTestDataVersion>
-    <SystemDrawingCommonTestDataVersion>5.0.0-beta.20072.1</SystemDrawingCommonTestDataVersion>
-    <SystemIOCompressionTestDataVersion>5.0.0-beta.20072.1</SystemIOCompressionTestDataVersion>
-    <SystemIOPackagingTestDataVersion>5.0.0-beta.20072.1</SystemIOPackagingTestDataVersion>
-    <SystemNetTestDataVersion>5.0.0-beta.20072.1</SystemNetTestDataVersion>
-    <SystemPrivateRuntimeUnicodeDataVersion>5.0.0-beta.20072.1</SystemPrivateRuntimeUnicodeDataVersion>
-    <SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.20072.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
-    <SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20072.1</SystemWindowsExtensionsTestDataVersion>
+    <SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20105.1</SystemComponentModelTypeConverterTestDataVersion>
+    <SystemDrawingCommonTestDataVersion>5.0.0-beta.20105.1</SystemDrawingCommonTestDataVersion>
+    <SystemIOCompressionTestDataVersion>5.0.0-beta.20105.1</SystemIOCompressionTestDataVersion>
+    <SystemIOPackagingTestDataVersion>5.0.0-beta.20105.1</SystemIOPackagingTestDataVersion>
+    <SystemNetTestDataVersion>5.0.0-beta.20105.1</SystemNetTestDataVersion>
+    <SystemPrivateRuntimeUnicodeDataVersion>5.0.0-beta.20105.1</SystemPrivateRuntimeUnicodeDataVersion>
+    <SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.20105.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
+    <SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20105.1</SystemWindowsExtensionsTestDataVersion>
     <!-- Standard dependencies -->
     <NETStandardLibraryVersion>2.2.0-prerelease.19564.1</NETStandardLibraryVersion>
     <!-- dotnet-optimization dependencies -->

diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1
index c521dc4..a6916d2 100644 (file)
--- a/eng/common/performance/performance-setup.ps1
+++ b/eng/common/performance/performance-setup.ps1
@@ -50,7 +50,7 @@ if ($Internal) {
 }
 
 # FIX ME: This is a workaround until we get this from the actual pipeline
-$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations --architecture $Architecture"
+$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations"
 $SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
 
 if ($RunFromPerformanceRepo) {

diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh
index 5dafe74..ba8bfc1 100755 (executable)
--- a/eng/common/performance/performance-setup.sh
+++ b/eng/common/performance/performance-setup.sh
@@ -164,7 +164,7 @@ if [[ "$internal" == true ]]; then
     fi
 fi
 
-common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
+common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations"
 setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
 
 if [[ "$run_from_perf_repo" = true ]]; then

diff --git a/global.json b/global.json
index 8e04b4b..02938d4 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.20103.5",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20104.2",
-    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20104.2",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20104.2",
+    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20105.2",
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20105.2",
+    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20105.2",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20105.2",
     "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",