Update dependencies from https://github.com/dotnet/arcade build 365 (#21052)

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.18565.9
- Microsoft.DotNet.Helix.Sdk - 1.0.0-beta.18565.9

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d83794b1477d246a7f9c1f921f74b851fdd1d9e5..698ddb35306a8fd4b0aee961c5c9e9a2e7bf631e 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,13 +2,13 @@
 <Dependencies>
   <ProductDependencies></ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18564.20">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18565.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>069237d9a7e83bed62c9f664228125b95ddf91f6</Sha>
+      <Sha>0448fb93bd78ed7a90ce3eabc7a0a3190e74ac48</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18564.20">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18565.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>069237d9a7e83bed62c9f664228125b95ddf91f6</Sha>
+      <Sha>0448fb93bd78ed7a90ce3eabc7a0a3190e74ac48</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

diff --git a/eng/common/PublishBuildAssets.cmd b/eng/common/PublishBuildAssets.cmd
index 4f9d54d028a5e4359ea5ec39dfb0aa797fb309ce..399ca0bd32f186d89d1e7f06a9f2e7c1aab8e1ed 100644 (file)
--- a/eng/common/PublishBuildAssets.cmd
+++ b/eng/common/PublishBuildAssets.cmd
@@ -1,3 +1,3 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -publishBuildAssets %*"
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -msbuildEngine dotnet -restore -execute /p:PublishBuildAssets=true /p:SdkTaskProjects=PublishBuildAssets.proj %*"
 exit /b %ErrorLevel%

diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index ca45b3db719b546b4caff051dfa1d365d95af3c1..76f108fd5d84335c5d0f16c95b335b971079f8a1 100644 (file)
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -6,6 +6,7 @@ Param(
   [string] $msbuildEngine = $null,
   [bool] $warnaserror = $true,
   [bool] $nodereuse = $true,
+  [switch] $execute,
   [switch] $restore,
   [switch] $deployDeps,
   [switch] $build,
@@ -88,7 +89,7 @@ try {
     /p:PerformanceTest=$performanceTest `
     /p:Sign=$sign `
     /p:Publish=$publish `
-    /p:PublishBuildAssets=$publishBuildAssets `
+    /p:Execute=$execute `
     /p:ContinuousIntegrationBuild=$ci `
     @properties
 

diff --git a/eng/common/templates/steps/helix-publish.yml b/eng/common/templates/steps/helix-publish.yml
index 6bbebd30cbb6f7409173633d528fc2db3a3c40e1..f261d0ad0eac63c8492135b90ab565f1dd8a4f63 100644 (file)
--- a/eng/common/templates/steps/helix-publish.yml
+++ b/eng/common/templates/steps/helix-publish.yml
@@ -26,7 +26,7 @@ steps:
       command: custom
       projects: eng/common/helixpublish.proj
       custom: msbuild
-      arguments: '/t:test /p:Language=msbuild /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\SendToHelix.binlog'
+      arguments: '/t:test /p:Language=msbuild /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog'
     displayName: Send job to Helix
     env:
       HelixSource: ${{ parameters.HelixSource }}
@@ -41,6 +41,7 @@ steps:
       CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
       XUnitProjects: ${{ parameters.XUnitProjects }}
       XUnitTargetFramework: ${{ parameters.XUnitTargetFramework }}
+      XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }}
       IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
       DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
       DotNetCliVersion: ${{ parameters.DotNetCliVersion }}

diff --git a/global.json b/global.json
index 9e3e1caf289ee875751e05778fbfd603a5f6432b..7e6df0e71c9d564a5d88869ed6da08820736b200 100644 (file)
--- a/global.json
+++ b/global.json
@@ -7,7 +7,7 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18564.20",
-    "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18564.20"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18565.9",
+    "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18565.9"
   }
 }