From cb88897531fbe9694f2f7c39c623d993d2561dde Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 15 Mar 2023 17:35:50 +0000
Subject: [PATCH 1/2] [release/7.0.1xx] Update dependencies from dotnet/arcade
 (#15822)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            | 21 +++++++++++++++------
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  6 +++---
 global.json             |  6 +++---
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index a0c5b2dd3..93f5df6c1 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,24 +7,30 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-e56abc4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-e56abc4-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-ba16583" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-ba16583-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-ba16583-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-ba16583-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-2/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-emsdk-ba16583-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-2eac915" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2eac9157/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-0a396ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
     <add key="darc-int-dotnet-sdk-8c1421b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-8c1421b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-8c1421b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-8c1421b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-27813f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-27813f8-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-27813f8-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-27813f8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-2/nuget/v3/index.json" />
     <add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -47,16 +53,19 @@
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-e56abc4-1" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-e56abc4" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-0a396ac" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
+    <add key="darc-int-dotnet-sdk-8c1421b-1" value="true" />
+    <add key="darc-int-dotnet-sdk-8c1421b-2" value="true" />
+    <add key="darc-int-dotnet-sdk-8c1421b-3" value="true" />
     <add key="darc-int-dotnet-sdk-8c1421b" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-27813f8-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-27813f8-3" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-27813f8-4" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-27813f8" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2f059ff56..35b0b7e8a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -194,18 +194,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23114.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23164.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
+      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23114.3">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23164.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
+      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23114.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23164.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
+      <Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23063.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 6fe32e1a8..171319712 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
@@ -122,8 +122,8 @@
       We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
       Instead the indicator is that the incoming SDK version is not RTM or greater yet.
     -->
-    <SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) >= 2">true</SubtractOneFromTemplateVersions>
-    <SubtractOneFromTemplateVersions Condition="$(VersionFeature) >= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
+    <SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) &gt;= 2">true</SubtractOneFromTemplateVersions>
+    <SubtractOneFromTemplateVersions Condition="$(VersionFeature) &gt;= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
     <AspNetCoreTemplateFeature60>$([MSBuild]::Subtract($(VersionFeature60), 1))</AspNetCoreTemplateFeature60>
     <AspNetCoreTemplateFeature60 Condition="'$(SubtractOneFromTemplateVersions)' == 'true'">$([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1))</AspNetCoreTemplateFeature60>
   </PropertyGroup>
diff --git a/global.json b/global.json
index 5039463a8..da60f35de 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "7.0.103",
+    "dotnet": "7.0.104",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@@ -11,7 +11,7 @@
     "cmake": "3.16.4"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3",
-    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3",
+    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3"
   }
 }

From f7fbfe43cd951a8771c1e26c534a1308ffb25d29 Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com>
Date: Wed, 15 Mar 2023 18:33:01 -0500
Subject: [PATCH 2/2] Source-build 7.0.104 March 2023 updates. (#15800)

---
 eng/Versions.props                                            | 4 ++--
 .../content/eng/bootstrap/OverrideBootstrapVersions.props     | 2 +-
 src/SourceBuild/tarball/content/global.json                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 171319712..54b14ea3a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -215,8 +215,8 @@
       or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
       necessary, and this property is removed from the file.
     -->
-    <PrivateSourceBuiltSDKVersion>7.0.103</PrivateSourceBuiltSDKVersion>
-    <PrivateSourceBuiltArtifactsPackageVersion>7.0.103</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltSDKVersion>7.0.104</PrivateSourceBuiltSDKVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>7.0.104</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>
diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props
index ced02e960..82542a831 100644
--- a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props
+++ b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
      <!-- 7.0.0 produced improperly versioned runtime assets because the OfficialBuildId
           was not set correctly.  This is the actual shipping version that it should have been -->
-     <NonshippingRuntimeVersionFor700>7.0.0-rtm.22518.5</NonshippingRuntimeVersionFor700>
+     <NonshippingRuntimeVersionFor700>7.0.4-servicing.23107.6</NonshippingRuntimeVersionFor700>
 
      <MicrosoftNETHostModelVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETHostModelVersion>
      <MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>
diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json
index 4ebdc2be0..56136778d 100644
--- a/src/SourceBuild/tarball/content/global.json
+++ b/src/SourceBuild/tarball/content/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "7.0.103"
+    "dotnet": "7.0.104"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",