From b2509c0e8e07653140daf5347abaa4aaa8e7c50c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 30 Nov 2022 22:47:41 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20221130.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22572.6 -> To Version 7.0.0-beta.22580.5
---
 eng/Version.Details.xml                     | 12 ++++++------
 eng/Versions.props                          |  2 +-
 eng/common/templates/steps/source-build.yml |  6 ++++++
 global.json                                 |  4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fa193dad2..bbdacc4a8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -188,18 +188,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22572.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22580.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
+      <Sha>40307db5eec2e3bc2df44bacb8482969f20142e3</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22572.6">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22580.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
+      <Sha>40307db5eec2e3bc2df44bacb8482969f20142e3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22572.6">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22580.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
+      <Sha>40307db5eec2e3bc2df44bacb8482969f20142e3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22531.3">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 61cdeb0d9..094aa9ff2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,7 +27,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22580.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 12a8ff94d..4624885e3 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -63,6 +63,11 @@ steps:
       targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
     fi
 
+    runtimeOsArgs=
+    if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
+      runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
+    fi
+
     publishArgs=
     if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
       publishArgs='--publish'
@@ -75,6 +80,7 @@ steps:
       $internalRuntimeDownloadArgs \
       $internalRestoreArgs \
       $targetRidArgs \
+      $runtimeOsArgs \
       /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
       /p:ArcadeBuildFromSource=true
   displayName: Build
diff --git a/global.json b/global.json
index 632f780d8..b0417dfe3 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
     "cmake": "3.16.4"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22572.6",
-    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22572.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22580.5",
+    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22580.5"
   }
 }