Update dependencies from https://github.com/dotnet/arcade build 327 (#21000)

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

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b2b2f57..fe76c7b 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.18562.25">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18563.21">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9f7d6b2656da648ed8c89eeda887e4ac92694288</Sha>
+      <Sha>179f64a9add52c37b4d441f12285da4b17389a82</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18562.25">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18563.21">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9f7d6b2656da648ed8c89eeda887e4ac92694288</Sha>
+      <Sha>179f64a9add52c37b4d441f12285da4b17389a82</Sha>
     </Dependency>
   </ToolsetDependencies>
-</Dependencies>
\ No newline at end of file
+</Dependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
index 92bea97..8a440dc 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,4 +18,4 @@
       https:%2F%2Fdotnet.myget.org/F/symreader/api/v3/index.json
     </RestoreSources>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/eng/common/helixpublish.proj b/eng/common/helixpublish.proj
index df2ad59..364af77 100644 (file)
--- a/eng/common/helixpublish.proj
+++ b/eng/common/helixpublish.proj
@@ -7,7 +7,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <HelixWorkItem Include="WorkItem">
+    <HelixWorkItem Include="WorkItem" Condition="'$(WorkItemDirectory)' != ''">
       <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
       <Command>$(WorkItemCommand)</Command>
     </HelixWorkItem>

diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml
index 0123cf4..e075e8b 100644 (file)
--- a/eng/common/templates/phases/base.yml
+++ b/eng/common/templates/phases/base.yml
@@ -85,6 +85,7 @@ phases:
       - task: MicroBuildSigningPlugin@2
         displayName: Install MicroBuild plugin
         inputs:
+          version: 1.1.35
           signType: $(_SignType)
           zipSources: false
           feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json

diff --git a/eng/common/templates/steps/helix-publish.yml b/eng/common/templates/steps/helix-publish.yml
index 68d2eb9..6bbebd3 100644 (file)
--- a/eng/common/templates/steps/helix-publish.yml
+++ b/eng/common/templates/steps/helix-publish.yml
@@ -9,6 +9,9 @@ parameters:
   WorkItemDirectory: ''
   WorkItemCommand: ''
   CorrelationPayloadDirectory: ''
+  XUnitProjects: ''
+  XUnitTargetFramework: ''
+  XUnitRunnerVersion: ''
   IncludeDotNetCli: false
   DotNetCliPackageType: ''
   DotNetCliVersion: ''
@@ -35,6 +38,9 @@ steps:
       HelixPostCommands: ${{ parameters.HelixPostCommands }}
       WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
       WorkItemCommand: ${{ parameters.WorkItemCommand }}
+      CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
+      XUnitProjects: ${{ parameters.XUnitProjects }}
+      XUnitTargetFramework: ${{ parameters.XUnitTargetFramework }}
       IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
       DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
       DotNetCliVersion: ${{ parameters.DotNetCliVersion }}

diff --git a/global.json b/global.json
index a741a18..fd7c8dc 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.18562.25",
-    "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18562.25"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18563.21",
+    "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18563.21"
   }
-}
\ No newline at end of file
+}