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

Commit c54911b

Browse files
author
John Beisner
committed
Dependency Uptake: download and import a package version props file.
1 parent 4adabde commit c54911b

File tree

5 files changed

+19
-3
lines changed

5 files changed

+19
-3
lines changed

build.proj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
<Target Name="RestoreDotnetCliBuildFramework"
3434
Inputs="$(DotnetCliBuildDirectory)/dotnet-cli-build.csproj"
3535
Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)"
36-
DependsOnTargets="WriteNugetConfigFile">
36+
DependsOnTargets="DownloadPackageVersionsProps;
37+
WriteNugetConfigFile"/>
3738

3839
<PropertyGroup>
3940
<ExtraRestoreArgs>$(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile)</ExtraRestoreArgs>
@@ -46,10 +47,11 @@
4647

4748
<Target Name="BuildTheWholeCli" DependsOnTargets="$(CLITargets)" />
4849

50+
<Import Project="build/DownloadedPackageVersions.targets" />
51+
<Import Project="build/NugetConfigFile.targets" />
4952
<Import Project="build/GitCommitInfo.targets" />
5053
<Import Project="build/HostInfo.targets" />
5154
<Import Project="build/BuildInfo.targets" />
52-
<Import Project="build/NugetConfigFile.targets" />
5355
<Import Project="build/Prepare.targets" />
5456
<Import Project="build/Compile.targets" />
5557
<Import Project="build/Package.targets" />
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project ToolsVersion="15.0">
2+
<Target Name="DownloadPackageVersionsProps">
3+
<PropertyGroup>
4+
<PB_AssetRootAccessTokenSuffixParam Condition=" '$(PB_AssetRootAccessTokenSuffix)' != '' ">?$(PB_AssetRootAccessTokenSuffix)</PB_AssetRootAccessTokenSuffixParam>
5+
</PropertyGroup>
6+
7+
<DownloadFile Uri="$(PB_PackageVersionPropsUrl)?$(PB_AssetRootAccessTokenSuffixParam)"
8+
DestinationPath="$(DownloadedPackageVersionsProps)"
9+
Condition=" '$(PB_PackageVersionPropsUrl)' != '' " />
10+
</Target>
11+
</Project>

build/InitRepo.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<GitCommitInfoProps>$(GeneratedPropsDir)/GitCommitInfo.props</GitCommitInfoProps>
55
<HostInfoProps>$(GeneratedPropsDir)/HostInfo.props</HostInfoProps>
66
<BuildInfoProps>$(GeneratedPropsDir)/BuildInfo.props</BuildInfoProps>
7+
<DownloadedPackageVersionsProps>$(GeneratedPropsDir)/DownloadedPackageVersions.props</DownloadedPackageVersionsProps>
78
<GeneratedNuGetConfig>$(RepoRoot)/NuGet.Config</GeneratedNuGetConfig>
89
</PropertyGroup>
910
</Project>

build/InitRepo.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project ToolsVersion="15.0">
22
<Target Name="WriteDynamicPropsToStaticPropsFiles"
3-
DependsOnTargets="WriteNugetConfigFile;
3+
DependsOnTargets="DownloadPackageVersionsProps;
4+
WriteNugetConfigFile;
45
BuildDotnetCliBuildFramework;
56
EnsureGeneratedPropsDirectory;
67
WriteGitCommitInfoProps;

dir.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<Import Project="build/BundledSdks.props" />
2626
<Import Project="build/BundledTemplates.props" />
2727
<Import Project="build/DependencyVersions.props" />
28+
<Import Condition=" Exists('$(DownloadedPackageVersionsProps)') " Project="$(DownloadedPackageVersionsProps)" />
2829
<Import Project="build/Version.props" />
2930
<Import Project="build/Branding.props" />
3031

0 commit comments

Comments
 (0)