Merge in 'release/5.0' changes

dotnet · Feb 12, 2021 · 61fc832 · 61fc832
2 parents 1ff21d0 + 3aad49b
commit 61fc832
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/eng/Publishing.props b/eng/Publishing.props
@@ -8,7 +8,9 @@
 
     <_UploadPathRoot>aspnetcore</_UploadPathRoot>
     <ProductVersionFileName>productVersion.txt</ProductVersionFileName>
+    <RepoProductVersionFileName>$(_UploadPathRoot)-$(ProductVersionFileName)</RepoProductVersionFileName>
     <ProductVersionFileLocation>$(ArtifactsShippingPackagesDir)$(ProductVersionFileName)</ProductVersionFileLocation>
+    <RepoProductVersionFileLocation>$(ArtifactsShippingPackagesDir)$(RepoProductVersionFileName)</RepoProductVersionFileLocation>
   </PropertyGroup>
 
   <!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->
@@ -33,7 +35,7 @@
     <_ChecksumsToPublish Include="$(ArtifactsDir)**\*.sha512" />
   </ItemGroup>
 
-  <Target 
+  <Target
     Name="_PublishInstallersAndChecksumsAndProductVersion"
     DependsOnTargets="_WriteProductVersionFile">
     <!--
@@ -78,10 +80,15 @@
         <PublishFlatContainer>true</PublishFlatContainer>
         <RelativeBlobPath>$(_UploadPathRoot)/Runtime/$(_PackageVersion)/$(ProductVersionFileName)</RelativeBlobPath>
       </ItemsToPushToBlobFeed>
+
+      <ItemsToPushToBlobFeed Include="$(RepoProductVersionFileLocation)" Condition=" '$(PublishInstallerBaseVersion)' == 'true'">
+        <PublishFlatContainer>true</PublishFlatContainer>
+        <RelativeBlobPath>$(_UploadPathRoot)/Runtime/$(_PackageVersion)/$(RepoProductVersionFileName)</RelativeBlobPath>
+      </ItemsToPushToBlobFeed>
     </ItemGroup>
   </Target>
 
-  <Target 
+  <Target
     Name="_WriteProductVersionFile"
     Condition=" '$(PublishInstallerBaseVersion)' == 'true'">
     <!--
@@ -106,5 +113,10 @@
       Lines="$(_ProductVersion)"
       Overwrite="true"
       Encoding="ASCII" />
+    <WriteLinesToFile
+      File="$(RepoProductVersionFileLocation)"
+      Lines="$(_ProductVersion)"
+      Overwrite="true"
+      Encoding="ASCII" />
   </Target>
 </Project>