mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dependency Uptake: download and import a package version props file.

Browse source
This commit is contained in:
John Beisner 2017-12-01 12:39:51 -08:00
parent 4adabde4c9
commit c54911b788
5 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.proj
View file

@ -33,7 +33,8 @@
<Target Name="RestoreDotnetCliBuildFramework" <Target Name="RestoreDotnetCliBuildFramework"
Inputs="$(DotnetCliBuildDirectory)/dotnet-cli-build.csproj" Inputs="$(DotnetCliBuildDirectory)/dotnet-cli-build.csproj"
Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)" Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)"
DependsOnTargets="WriteNugetConfigFile"> DependsOnTargets="DownloadPackageVersionsProps;
WriteNugetConfigFile"/>
<PropertyGroup> <PropertyGroup>
<ExtraRestoreArgs>$(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile)</ExtraRestoreArgs> <ExtraRestoreArgs>$(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile)</ExtraRestoreArgs>
@ -46,10 +47,11 @@
<Target Name="BuildTheWholeCli" DependsOnTargets="$(CLITargets)" /> <Target Name="BuildTheWholeCli" DependsOnTargets="$(CLITargets)" />
<Import Project="build/DownloadedPackageVersions.targets" />
<Import Project="build/NugetConfigFile.targets" />
<Import Project="build/GitCommitInfo.targets" /> <Import Project="build/GitCommitInfo.targets" />
<Import Project="build/HostInfo.targets" /> <Import Project="build/HostInfo.targets" />
<Import Project="build/BuildInfo.targets" /> <Import Project="build/BuildInfo.targets" />
<Import Project="build/NugetConfigFile.targets" />
<Import Project="build/Prepare.targets" /> <Import Project="build/Prepare.targets" />
<Import Project="build/Compile.targets" /> <Import Project="build/Compile.targets" />
<Import Project="build/Package.targets" /> <Import Project="build/Package.targets" />

11
build/DownloadedPackageVersions.targets Normal file
View file

@ -0,0 +1,11 @@
<Project ToolsVersion="15.0">
<Target Name="DownloadPackageVersionsProps">
<PropertyGroup>
<PB_AssetRootAccessTokenSuffixParam Condition=" '$(PB_AssetRootAccessTokenSuffix)' != '' ">?$(PB_AssetRootAccessTokenSuffix)</PB_AssetRootAccessTokenSuffixParam>
</PropertyGroup>
<DownloadFile Uri="$(PB_PackageVersionPropsUrl)?$(PB_AssetRootAccessTokenSuffixParam)"
DestinationPath="$(DownloadedPackageVersionsProps)"
Condition=" '$(PB_PackageVersionPropsUrl)' != '' " />
</Target>
</Project>

1
build/InitRepo.props
View file

@ -4,6 +4,7 @@
<GitCommitInfoProps>$(GeneratedPropsDir)/GitCommitInfo.props</GitCommitInfoProps> <GitCommitInfoProps>$(GeneratedPropsDir)/GitCommitInfo.props</GitCommitInfoProps>
<HostInfoProps>$(GeneratedPropsDir)/HostInfo.props</HostInfoProps> <HostInfoProps>$(GeneratedPropsDir)/HostInfo.props</HostInfoProps>
<BuildInfoProps>$(GeneratedPropsDir)/BuildInfo.props</BuildInfoProps> <BuildInfoProps>$(GeneratedPropsDir)/BuildInfo.props</BuildInfoProps>
<DownloadedPackageVersionsProps>$(GeneratedPropsDir)/DownloadedPackageVersions.props</DownloadedPackageVersionsProps>
<GeneratedNuGetConfig>$(RepoRoot)/NuGet.Config</GeneratedNuGetConfig> <GeneratedNuGetConfig>$(RepoRoot)/NuGet.Config</GeneratedNuGetConfig>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

3
build/InitRepo.targets
View file

@ -1,6 +1,7 @@
<Project ToolsVersion="15.0"> <Project ToolsVersion="15.0">
<Target Name="WriteDynamicPropsToStaticPropsFiles" <Target Name="WriteDynamicPropsToStaticPropsFiles"
DependsOnTargets="WriteNugetConfigFile; DependsOnTargets="DownloadPackageVersionsProps;
WriteNugetConfigFile;
BuildDotnetCliBuildFramework; BuildDotnetCliBuildFramework;
EnsureGeneratedPropsDirectory; EnsureGeneratedPropsDirectory;
WriteGitCommitInfoProps; WriteGitCommitInfoProps;

1
dir.props
View file

@ -25,6 +25,7 @@
<Import Project="build/BundledSdks.props" /> <Import Project="build/BundledSdks.props" />
<Import Project="build/BundledTemplates.props" /> <Import Project="build/BundledTemplates.props" />
<Import Project="build/DependencyVersions.props" /> <Import Project="build/DependencyVersions.props" />
<Import Condition=" Exists('$(DownloadedPackageVersionsProps)') " Project="$(DownloadedPackageVersionsProps)" />
<Import Project="build/Version.props" /> <Import Project="build/Version.props" />
<Import Project="build/Branding.props" /> <Import Project="build/Branding.props" />