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

Commit 3386db7

Browse files
author
jbeisner
committed
Create a manifest if performing an orchestrated build publish.
1 parent 1acb93f commit 3386db7

File tree

8 files changed

+51
-26
lines changed

8 files changed

+51
-26
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
3636
<Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="$(GitCommitInfoProps)" />
3737
<Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="$(HostInfoProps)" />
3838
<Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="$(BuildInfoProps)" />
39-
<Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" />
40-
39+
4140
<Import Project="build/BranchInfo.props" />
4241
<Import Project="build/AzureInfo.props" />
4342

‎build/AzureInfo.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<Product>Sdk</Product>
4-
<IsOrchestratedPublish Condition="'$(PB_PublishBlobFeedUrl)' != ''">true</IsOrchestratedPublish>
4+
<IsNotOrchestratedPublish Condition="'$(PB_PublishBlobFeedUrl)' == ''">true</IsNotOrchestratedPublish>
55

66
<!-- Values related to the download of assets from blob storage -->
77
<DefaultCoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</DefaultCoreSetupBlobRootUrl>
@@ -19,7 +19,7 @@
1919
<ArtifactCloudDropAccessToken>$(PB_PublishBlobFeedKey)</ArtifactCloudDropAccessToken>
2020
<ArtifactCloudDropAccessToken Condition="'$(ArtifactCloudDropAccessToken)' == ''">$(ARTIFACT_STORAGE_KEY)</ArtifactCloudDropAccessToken>
2121
<ArtifactCloudDropURL>$(PB_PublishBlobFeedUrl)</ArtifactCloudDropURL>
22-
<ArtifactCloudDropURL Condition="'$(PB_PublishBlobFeedUrl)' == ''">"https://$(ArtifactCloudDropAccountName).blob.core.windows.net/$(ArtifactContainerName)/"</ArtifactCloudDropURL>
22+
<ArtifactCloudDropURL Condition="'$(PB_PublishBlobFeedUrl)' == ''">https://$(ArtifactCloudDropAccountName).blob.core.windows.net/$(ArtifactContainerName)/index.json</ArtifactCloudDropURL>
2323

2424
<!-- Values related to the upload of checksums to blob storage -->
2525
<ChecksumCloudDropAccountName>$(CHECKSUM_STORAGE_ACCOUNT)</ChecksumCloudDropAccountName>
@@ -29,8 +29,8 @@
2929
<ChecksumCloudDropAccessToken>$(PB_PublishBlobFeedKey)</ChecksumCloudDropAccessToken>
3030
<ChecksumCloudDropAccessToken Condition="'$(ChecksumCloudDropAccessToken)' == ''">$(CHECKSUM_STORAGE_KEY)</ChecksumCloudDropAccessToken>
3131
<ChecksumCloudDropURL>$(PB_PublishBlobFeedUrl)</ChecksumCloudDropURL>
32-
<ChecksumCloudDropURL Condition="'$(PB_PublishBlobFeedUrl)' == ''">"https://$(ChecksumCloudDropAccountName).blob.core.windows.net/$(ChecksumContainerName)/"</ChecksumCloudDropURL>
33-
32+
<ChecksumCloudDropURL Condition="'$(PB_PublishBlobFeedUrl)' == ''">https://$(ChecksumCloudDropAccountName).blob.core.windows.net/$(ChecksumContainerName)/index.json</ChecksumCloudDropURL>
33+
3434
<!-- Values related to the upload of NuPkgs to the blob feed -->
3535
<BlobFeedExpectedURL>$(PB_PublishBlobFeedUrl)</BlobFeedExpectedURL>
3636
<BlobFeedExpectedURL Condition="'$(BlobFeedExpectedURL)' == ''">https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</BlobFeedExpectedURL>

‎build/Branding.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3+
<BuildName>Cli</BuildName>
34
<SdkBrandName>Microsoft .NET Core SDK 2.2.0 - Preview</SdkBrandName>
45
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
56
<SharedFrameworkBrandName>Microsoft .NET Core Runtime 2.1.0 - Preview</SharedFrameworkBrandName>

‎build/DependencyVersions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
<!-- infrastructure and test only dependencies -->
6868
<PropertyGroup>
69-
<VersionToolsVersion>1.0.27-prerelease-01723-01</VersionToolsVersion>
69+
<VersionToolsVersion>2.1.0-prerelease-02411-04</VersionToolsVersion>
7070
<DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
7171
<BuildTasksFeedToolVersion>2.1.0-prerelease-02411-04</BuildTasksFeedToolVersion>
7272
</PropertyGroup>

‎build/Publish.targets‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" />
34
<Import Project="$(MSBuildThisFileDirectory)/publish/FinishBuild.targets" />
45
<Import Project="$(MSBuildThisFileDirectory)/publish/PublishContent.targets" />
56
<Import Project="$(MSBuildThisFileDirectory)/publish/PublishNupkgToBlobFeed.targets" />
@@ -73,11 +74,17 @@
7374
</CliVersionBadgeToUpload>
7475
</ItemGroup>
7576

76-
<Message Text="Publish badges to blob feed started: " />
77-
<PushToBlobFeed AccountKey="$(ArtifactCloudDropAccessToken)"
78-
ExpectedFeedUrl="$(ArtifactCloudDropURL)"
77+
<Message Text="Publish badges to blob feed started: $(ArtifactCloudDropURL)" />
78+
<PushToBlobFeed ExpectedFeedUrl="$(ArtifactCloudDropURL)"
79+
AccountKey="$(ArtifactCloudDropAccessToken)"
7980
ItemsToPush="@(CliVersionBadgeToUpload)"
80-
Overwrite="false" />
81-
81+
ManifestBranch="$(BranchName)"
82+
ManifestBuildId="$(FullNugetVersion)"
83+
ManifestCommit="$(CommitHash)"
84+
ManifestName="$(BuildName)"
85+
Overwrite="false"
86+
PublishFlatContainer="true"
87+
SkipCreateManifest="$(IsNotOrchestratedPublish)" />
8288
</Target>
89+
8390
</Project>

‎build/publish/FinishBuild.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Target Name="FinishBuild"
4-
Condition="'$(IsOrchestratedPublish)' != 'true'"
4+
Condition="'$(IsNotOrchestratedPublish)' == 'true'"
55
DependsOnTargets="SetArtifactBlobProps;
66
SetChecksumBlobProps;
77
CheckIfAllBuildsHavePublished;
@@ -10,7 +10,7 @@
1010
<Target Name="SetArtifactBlobProps">
1111
<Error Condition="'$(ArtifactCloudDropURL)' == ''" Text="Missing property ArtifactCloudDropURL." />
1212

13-
<ParseBlobUrl FeedUrl="$(ArtifactCloudDropURL)">
13+
<ParseBlobUrl BlobUrl="$(ArtifactCloudDropURL)">
1414
<Output TaskParameter="BlobElements" ItemName="BlobElements" />
1515
</ParseBlobUrl>
1616

@@ -23,7 +23,7 @@
2323
<Target Name="SetChecksumBlobProps">
2424
<Error Condition="'$(ChecksumCloudDropURL)' == ''" Text="Missing property ChecksumCloudDropURL." />
2525

26-
<ParseBlobUrl FeedUrl="$(ChecksumCloudDropURL)">
26+
<ParseBlobUrl BlobUrl="$(ChecksumCloudDropURL)">
2727
<Output TaskParameter="BlobElements" ItemName="BlobElements" />
2828
</ParseBlobUrl>
2929

‎build/publish/PublishContent.targets‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,36 @@
2323
<Target Name="UploadArtifactsToAzure" DependsOnTargets="GatherItemsForPattern">
2424
<Error Condition="'$(ArtifactCloudDropAccessToken)' == ''" Text="Missing property ArtifactCloudDropAccessToken." />
2525
<Error Condition="'$(ArtifactCloudDropURL)' == ''" Text="Missing property ArtifactCloudDropURL." />
26-
26+
2727
<Message Text="Publish assets to blob storage started: $(ArtifactCloudDropURL)" />
28-
<PushToBlobFeed AccountKey="$(ArtifactCloudDropAccessToken)"
29-
ExpectedFeedUrl="$(ArtifactCloudDropURL)"
28+
<PushToBlobFeed ExpectedFeedUrl="$(ArtifactCloudDropURL)"
29+
AccountKey="$(ArtifactCloudDropAccessToken)"
3030
ItemsToPush="@(ForPublishing)"
31-
Overwrite="$(OverwriteOnPublish)" />
31+
ManifestBranch="$(BranchName)"
32+
ManifestBuildId="$(FullNugetVersion)"
33+
ManifestCommit="$(CommitHash)"
34+
ManifestName="$(BuildName)"
35+
Overwrite="$(OverwriteOnPublish)"
36+
PublishFlatContainer="true"
37+
SkipCreateManifest="$(IsNotOrchestratedPublish)" />
3238
</Target>
3339

3440
<!-- publishes checksums for the artifacts to blob storage in Azure -->
3541
<Target Name="UploadChecksumsToAzure" DependsOnTargets="GenerateChecksums">
3642
<Error Condition="'$(ChecksumCloudDropAccessToken)' == ''" Text="Missing property ChecksumCloudDropAccessToken." />
3743
<Error Condition="'$(ChecksumCloudDropURL)' == ''" Text="Missing property ChecksumCloudDropURL." />
38-
44+
3945
<Message Text="Publish checksums to blob storage started: $(ChecksumCloudDropURL)" />
40-
<PushToBlobFeed AccountKey="$(ChecksumCloudDropAccessToken)"
41-
ExpectedFeedUrl="$(ChecksumCloudDropURL)"
46+
<PushToBlobFeed ExpectedFeedUrl="$(ChecksumCloudDropURL)"
47+
AccountKey="$(ChecksumCloudDropAccessToken)"
4248
ItemsToPush="@(ArtifactsForGeneratingChecksums->'%(DestinationPath)')"
43-
Overwrite="$(OverwriteOnPublish)" />
49+
ManifestBranch="$(BranchName)"
50+
ManifestBuildId="$(FullNugetVersion)"
51+
ManifestCommit="$(CommitHash)"
52+
ManifestName="$(BuildName)"
53+
Overwrite="$(OverwriteOnPublish)"
54+
PublishFlatContainer="true"
55+
SkipCreateManifest="$(IsNotOrchestratedPublish)" />
4456
</Target>
4557

4658
</Project>

‎build/publish/PublishNupkgToBlobFeed.targets‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@
1010
<Error Condition="'$(BlobFeedExpectedURL)' == ''" Text="Missing property BlobFeedExpectedURL." />
1111

1212
<Message Text="Publish NuPkgs to Blob feed started" />
13-
<PushToBlobFeed AccountKey="$(BlobFeedCloudDropAccessToken)"
14-
ExpectedFeedUrl="$(BlobFeedExpectedURL)"
13+
<PushToBlobFeed ExpectedFeedUrl="$(BlobFeedExpectedURL)"
14+
AccountKey="$(BlobFeedCloudDropAccessToken)"
1515
ItemsToPush="@(NupkgsForPublishing)"
16-
Overwrite="false" />
16+
ManifestBranch="$(BranchName)"
17+
ManifestBuildId="$(FullNugetVersion)"
18+
ManifestCommit="$(CommitHash)"
19+
ManifestName="$(BuildName)"
20+
Overwrite="true"
21+
PublishFlatContainer="false"
22+
SkipCreateManifest="$(IsNotOrchestratedPublish)" />
1723
</Target>
1824
</Project>

0 commit comments

Comments
 (0)