From ab3a8e4c9347ae22fc8efbc6c08641065810adbd Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 7 Mar 2024 22:04:48 +0000
Subject: [PATCH 1/3] Enable publishing in VMR

---
 eng/Publishing.props | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 0e6e2ec2fbd0..0908cb4c1e94 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -15,7 +15,7 @@
     <SdkAssetManifestFileName>$(OS)-$(PlatformName)-SdkAssets.xml</SdkAssetManifestFileName>
     <SdkAssetsManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(SdkAssetManifestFileName)</SdkAssetsManifestFilePath>
 
-    <TempWorkingDirectory>$(ArtifactsDir)\..\AssetsTmpDir\$([System.Guid]::NewGuid())</TempWorkingDirectory>
+    <TempWorkingDirectory>$(ArtifactsDir)\AssetsTmpDir\$([System.Guid]::NewGuid())</TempWorkingDirectory>
   </PropertyGroup>
 
   <!-- Pulled from arcade's publish.proj see https://github.com/dotnet/arcade/issues/5790 for
@@ -78,7 +78,7 @@
         <ItemsToPushToBlobFeed Include="@(FSharpPackagesToPush)" />
     </ItemGroup>
   </Target>
- 
+
   <!-- We use a separate target to publish this to blob storage so that we can push this to
        a relative path inside the blob storage. -->
   <Target Name="PublishToolsetAssets" DependsOnTargets="ReadToolsetVersion" BeforeTargets="Publish">
@@ -98,11 +98,16 @@
       <IsStableBuild>false</IsStableBuild>
       <IsStableBuild Condition="'$(DotNetFinalVersionKind)' == 'release'">true</IsStableBuild>
     </PropertyGroup>
-    
+
+    <!-- In VMR inner-build copy to local storage, do not push to AzDO -->
+    <PropertyGroup Condition="'$(ArcadeInnerBuildFromSource)' == 'true' or '$(DotNetBuildPhase)' == 'InnerRepo'">
+      <PushToLocalStorage>true</PushToLocalStorage>
+    </PropertyGroup>
 
     <MakeDir Directories="$(TempWorkingDirectory)"/>
 
     <PushToAzureDevOpsArtifacts
+      Condition="'$(DotNetBuildRepo)' != 'true'"
       AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
       AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
       AzureDevOpsBuildId="$(BUILD_BUILDID)"
@@ -123,6 +128,33 @@
       PublishingVersion="3"
       IsStableBuild="$(IsStableBuild)" />
 
+    <PushToBuildStorage
+      Condition="'$(DotNetBuildRepo)' == 'true'"
+      AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
+      AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
+      AzureDevOpsBuildId="$(BUILD_BUILDID)"
+      ItemsToPush="@(ToolsetAssetsToPushToBlobFeed)"
+      ItemsToSign="@(ItemsToSignPostBuild)"
+      CertificatesSignInfo="@(CertificatesSignInfo)"
+      StrongNameSignInfo="@(StrongNameSignInfo)"
+      FileSignInfo="@(FileSignInfo)"
+      FileExtensionSignInfo="@(FileExtensionSignInfo)"
+      ManifestBuildData="@(ManifestBuildData)"
+      ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
+      ManifestBranch="$(BUILD_SOURCEBRANCH)"
+      ManifestBuildId="$(BUILD_BUILDNUMBER)"
+      ManifestCommit="$(BUILD_SOURCEVERSION)"
+      PublishFlatContainer="true"
+      AssetManifestPath="$(SdkAssetsManifestFilePath)"
+      AssetsTemporaryDirectory="$(TempWorkingDirectory)"
+      PublishingVersion="3"
+      IsStableBuild="$(IsStableBuild)"
+      PushToLocalStorage="$(PushToLocalStorage)"
+      AssetsLocalStorageDir="$(SourceBuiltAssetsDir)"
+      ShippingPackagesLocalStorageDir="$(SourceBuiltShippingPackagesDir)"
+      NonShippingPackagesLocalStorageDir="$(SourceBuiltNonShippingPackagesDir)"
+      AssetManifestsLocalStorageDir="$(SourceBuiltAssetManifestsDir)" />
+
     <Copy
       SourceFiles="$(SdkAssetsManifestFilePath)"
       DestinationFolder="$(TempWorkingDirectory)\$(SdkAssetManifestFileName)" />

From 7a090920861b59ad6875841ecdb1d6f0081d29c6 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Sat, 9 Mar 2024 00:23:36 +0000
Subject: [PATCH 2/3] Remove unnecessary condition

---
 eng/Publishing.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 0908cb4c1e94..22f3b0b42634 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -100,7 +100,7 @@
     </PropertyGroup>
 
     <!-- In VMR inner-build copy to local storage, do not push to AzDO -->
-    <PropertyGroup Condition="'$(ArcadeInnerBuildFromSource)' == 'true' or '$(DotNetBuildPhase)' == 'InnerRepo'">
+    <PropertyGroup Condition="'$(DotNetBuildPhase)' == 'InnerRepo'">
       <PushToLocalStorage>true</PushToLocalStorage>
     </PropertyGroup>
 

From e90fb536f5b2b071ece83a2cf4d4e63d203e28d9 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Tue, 12 Mar 2024 22:19:17 +0000
Subject: [PATCH 3/3] Update task conditions

---
 eng/Publishing.props | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 22f3b0b42634..e95cf5b80b6b 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -99,15 +99,14 @@
       <IsStableBuild Condition="'$(DotNetFinalVersionKind)' == 'release'">true</IsStableBuild>
     </PropertyGroup>
 
-    <!-- In VMR inner-build copy to local storage, do not push to AzDO -->
-    <PropertyGroup Condition="'$(DotNetBuildPhase)' == 'InnerRepo'">
-      <PushToLocalStorage>true</PushToLocalStorage>
-    </PropertyGroup>
-
     <MakeDir Directories="$(TempWorkingDirectory)"/>
 
+    <!--
+      Delete PushToAzureDevOpsArtifacts task and remove condition from PushToBuildStorage task
+      after this repo picks up arcade with the following change: https://github.com/dotnet/arcade/pull/14559
+    -->
     <PushToAzureDevOpsArtifacts
-      Condition="'$(DotNetBuildRepo)' != 'true'"
+      Condition="'$(DotNetBuildOrchestrator)' != 'true'"
       AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
       AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
       AzureDevOpsBuildId="$(BUILD_BUILDID)"
@@ -129,7 +128,7 @@
       IsStableBuild="$(IsStableBuild)" />
 
     <PushToBuildStorage
-      Condition="'$(DotNetBuildRepo)' == 'true'"
+      Condition="'$(DotNetBuildOrchestrator)' == 'true'"
       AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
       AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
       AzureDevOpsBuildId="$(BUILD_BUILDID)"