From 82099924efdf3e63b48e4e2e9d395bc3f67524bb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 20 Mar 2024 07:47:42 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/source-build-externals
 (#19097)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: JL03-Yue <59816815+JL03-Yue@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 eng/Version.Details.xml                       |  4 +-
 .../0001-Enable-publishing-in-VMR.patch       | 42 -------------------
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 src/SourceBuild/patches/source-build-externals/0001-Enable-publishing-in-VMR.patch

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0f45468d3..a11fc3e78 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -226,9 +226,9 @@
       <SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24162.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24168.3">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>3167c0a9379f52145af31057aca31f45528eb123</Sha>
+      <Sha>b46b7e6859f4094cd7f3e00dc0471d62f5d8d051</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta4.24126.1" CoherentParentDependency="Microsoft.NET.Sdk">
diff --git a/src/SourceBuild/patches/source-build-externals/0001-Enable-publishing-in-VMR.patch b/src/SourceBuild/patches/source-build-externals/0001-Enable-publishing-in-VMR.patch
deleted file mode 100644
index f4235006a..000000000
--- a/src/SourceBuild/patches/source-build-externals/0001-Enable-publishing-in-VMR.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nikola Milosavljevic <nikolam@microsoft.com>
-Date: Thu, 7 Mar 2024 22:10:43 +0000
-Subject: [PATCH] Enable publishing in VMR
-
-Backport: https://github.com/dotnet/source-build-externals/pull/275
----
- eng/Publishing.props | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/eng/Publishing.props b/eng/Publishing.props
-index d3aa836..3629bb8 100644
---- a/eng/Publishing.props
-+++ b/eng/Publishing.props
-@@ -2,5 +2,27 @@
- <Project>
-   <PropertyGroup>
-     <PublishingVersion>3</PublishingVersion>
-+    <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishPackages</PublishDependsOnTargets>
-   </PropertyGroup>
-+
-+  <ItemGroup>
-+    <_PackagesToPublish Remove="@(_PackagesToPublish)" />
-+    <_PackagesToPublish Include="$(ArtifactsPackagesDir)**\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildRepo)' == 'true'" />
-+  </ItemGroup>
-+
-+  <Target Name="_PublishPackages">
-+    <ItemGroup>
-+      <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
-+           Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
-+           the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
-+           to be published. Use DotNetBuildRepo as DotNetBuildFromSource is only set in the internal source build,
-+           and Build.proj is invoked from the wrapper build. -->
-+      <ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT' and '$(PostBuildSign)' != 'true' and '$(DotNetBuildRepo)' != 'true'" />
-+
-+      <ItemsToPushToBlobFeed Include="@(_PackagesToPublish)">
-+        <IsShipping>true</IsShipping>
-+      </ItemsToPushToBlobFeed>
-+    </ItemGroup>
-+  </Target>
-+
- </Project>