Skip to content

Commit 8d0dba2

Browse files
Porting CoreFx changes to enable publishing to azure feeds.
* dotnet/corefx/pull/24784 * dotnet/corefx/pull/25031 * dotnet/corefx/pull/26192
1 parent 9457a9d commit 8d0dba2

File tree

3 files changed

+57
-3
lines changed

3 files changed

+57
-3
lines changed

dependencies.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050
<PlatformPackageVersion>2.1.0-preview1-25324-02</PlatformPackageVersion>
5151
</PropertyGroup>
5252

53+
<!-- Package versions used as toolsets -->
54+
<PropertyGroup>
55+
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
56+
<FeedTasksPackageVersion>2.1.0-prerelease-02417-06</FeedTasksPackageVersion>
57+
</PropertyGroup>
58+
5359
<!-- Package dependency verification/auto-upgrade configuration. -->
5460
<PropertyGroup>
5561
<BaseDotNetBuildInfo>build-info/dotnet/</BaseDotNetBuildInfo>
@@ -144,6 +150,11 @@
144150
<ElementName>CoreClrPackageVersion</ElementName>
145151
<PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
146152
</XmlUpdateStep>
153+
<XmlUpdateStep Include="BuildTools">
154+
<Path>$(MSBuildThisFileFullPath)</Path>
155+
<ElementName>FeedTasksPackageVersion</ElementName>
156+
<PackageId>$(FeedTasksPackage)</PackageId>
157+
</XmlUpdateStep>
147158
</ItemGroup>
148159

149160
<PropertyGroup>

init-tools.msbuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
66
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)Tools/$(BuildToolsPackageVersion)</BaseIntermediateOutputPath>
77
</PropertyGroup>
8+
<Import Project="$(MSBuildThisFileDirectory)dependencies.props" />
89
<ItemGroup>
910
<PackageReference Include="Microsoft.DotNet.BuildTools" Version="$(BuildToolsPackageVersion)" />
11+
<PackageReference Include="$(FeedTasksPackage)" Version="$(FeedTasksPackageVersion)" />
1012
</ItemGroup>
1113
</Project>

src/publish.proj

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
44
<Import Project="$(ToolsDir)PublishContent.targets" />
55
<Import Project="$(ToolsDir)versioning.targets" />
6+
<Import Project="$(PackagesDir)/$(FeedTasksPackage.ToLower())/$(FeedTasksPackageVersion)/build/$(FeedTasksPackage).targets" />
67

78
<PropertyGroup>
8-
<PublishPattern Condition="'$(PublishPattern)' == ''">$(PackageOutputRoot)**\*.nupkg</PublishPattern>
9+
<PublishPattern Condition="'$(PublishPattern)' == ''">$(PackageOutputRoot)\**\*.nupkg</PublishPattern>
910
</PropertyGroup>
1011

1112
<ItemGroup>
1213
<_PackagesToPublish Include="$(PublishPattern)" />
1314
</ItemGroup>
14-
15+
1516
<Target Name="CreateContainerName"
1617
DependsOnTargets="CreateVersionFileDuringBuild"
1718
Condition="'$(ContainerName)' == ''">
@@ -23,5 +24,45 @@
2324
<Target Name="Build" DependsOnTargets="CreateContainerName">
2425
<!-- skip uploadToAzure when there are no nupkgs -->
2526
<CallTarget Targets="UploadToAzure" Condition="'@(_PackagesToPublish)' != ''" />
26-
</Target>
27+
</Target>
28+
29+
<PropertyGroup>
30+
<PackageDownloadDirectory Condition="'$(DownloadDirectory)' == ''">$(PackagesDir)AzureTransfer\$(ConfigurationGroup)</PackageDownloadDirectory>
31+
<FinalPublishPattern>$(PackageDownloadDirectory)\**\*.nupkg</FinalPublishPattern>
32+
<FinalPublishPrivatePattern>$(PackageDownloadDirectory)\**\*Private*.nupkg</FinalPublishPrivatePattern>
33+
<FinalSymbolsPackagesPattern>$(PackageDownloadDirectory)\**\*.symbols.nupkg</FinalSymbolsPackagesPattern>
34+
</PropertyGroup>
35+
36+
<Target Name="PublishToAzureBlobFeed">
37+
<ItemGroup>
38+
<ItemsToPush Include="$(FinalPublishPrivatePattern)" Exclude="$(FinalSymbolsPackagesPattern)">
39+
<ManifestArtifactData>NonShipping=true</ManifestArtifactData>
40+
</ItemsToPush>
41+
<ItemsToPush Include="$(FinalPublishPattern)" Exclude="@(ItemsToPush);$(FinalSymbolsPackagesPattern)" />
42+
</ItemGroup>
43+
<Error Condition="'@(ItemsToPush)'==''" Text="ItemsToPush for packages is empty." />
44+
<PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
45+
AccountKey="$(AccountKey)"
46+
ItemsToPush="@(ItemsToPush)"
47+
Overwrite="$(PublishOverwrite)"
48+
ManifestName="$(GitHubRepositoryName)"
49+
ManifestBuildId="$(ManifestBuildId)"
50+
ManifestBranch="$(ManifestBranch)"
51+
ManifestCommit="$(ManifestCommit)" />
52+
</Target>
53+
54+
<Target Name="PublishSymbolsToAzureBlobFeed" Condition="'$(PublishSymbols)' == 'true'" >
55+
<ItemGroup>
56+
<ItemsToPush Include="$(FinalSymbolsPackagesPattern)" />
57+
</ItemGroup>
58+
<Error Condition="'@(ItemsToPush)'==''" Text="ItemsToPush for symbols is empty." />
59+
<PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
60+
AccountKey="$(AccountKey)"
61+
ItemsToPush="@(ItemsToPush)"
62+
Overwrite="$(PublishOverwrite)"
63+
ManifestName="$(GitHubRepositoryName)"
64+
ManifestBuildId="$(ManifestBuildId)"
65+
ManifestBranch="$(ManifestBranch)"
66+
ManifestCommit="$(ManifestCommit)" />
67+
</Target>
2768
</Project>

0 commit comments

Comments
 (0)