Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 8649a5c

Browse files
authored
Orchestrated final publish; CLI:master (#8504)
* Orchestrated final publish: https://github.com/dotnet/core-eng/issues/2407 * Changes per code review...
1 parent a8a0657 commit 8649a5c

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

build/AzureInfo.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3+
<Product>Sdk</Product>
34
<IsNotOrchestratedPublish>true</IsNotOrchestratedPublish>
45
<IsNotOrchestratedPublish Condition="'$(PB_PublishBlobFeedUrl)' != ''">false</IsNotOrchestratedPublish>
5-
<BlobStoragePartialRelativePath>Sdk</BlobStoragePartialRelativePath>
6-
<BlobStoragePartialRelativePath Condition="'$(IsNotOrchestratedPublish)' == 'false'">assets/$(BlobStoragePartialRelativePath)</BlobStoragePartialRelativePath>
6+
<BlobStoragePartialRelativePath>$(Product)</BlobStoragePartialRelativePath>
7+
<BlobStoragePartialRelativePath Condition="'$(IsNotOrchestratedPublish)' == 'false'">assets/$(Product)</BlobStoragePartialRelativePath>
78

89
<!-- Values related to the download of assets from blob storage -->
910
<DefaultCoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</DefaultCoreSetupBlobRootUrl>

build/DependencyVersions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<PropertyGroup>
6969
<VersionToolsVersion>2.1.0-prerelease-02430-04</VersionToolsVersion>
7070
<DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
71-
<BuildTasksFeedToolVersion>2.1.0-prerelease-02411-04</BuildTasksFeedToolVersion>
71+
<BuildTasksFeedToolVersion>2.1.0-prerelease-02430-04</BuildTasksFeedToolVersion>
7272
</PropertyGroup>
7373

7474
</Project>

build/Publish.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
ManifestBuildId="$(FullNugetVersion)"
8585
ManifestCommit="$(CommitHash)"
8686
ManifestName="$(BuildName)"
87+
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
8788
Overwrite="false"
8889
PublishFlatContainer="true"
8990
SkipCreateManifest="$(IsNotOrchestratedPublish)" />

build/publish/PublishContent.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
ManifestBuildId="$(FullNugetVersion)"
3434
ManifestCommit="$(CommitHash)"
3535
ManifestName="$(BuildName)"
36+
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
3637
Overwrite="$(OverwriteOnPublish)"
3738
PublishFlatContainer="true"
3839
SkipCreateManifest="$(IsNotOrchestratedPublish)" />
@@ -51,6 +52,7 @@
5152
ManifestBuildId="$(FullNugetVersion)"
5253
ManifestCommit="$(CommitHash)"
5354
ManifestName="$(BuildName)"
55+
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
5456
Overwrite="$(OverwriteOnPublish)"
5557
PublishFlatContainer="true"
5658
SkipCreateManifest="$(IsNotOrchestratedPublish)" />

build/publish/PublishNupkgToBlobFeed.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
ManifestBuildId="$(FullNugetVersion)"
1818
ManifestCommit="$(CommitHash)"
1919
ManifestName="$(BuildName)"
20+
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
2021
Overwrite="true"
2122
PublishFlatContainer="false"
2223
SkipCreateManifest="$(IsNotOrchestratedPublish)" />

0 commit comments

Comments
 (0)