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

Rename the PackageVersions.props files used in source-build (#11407)

Browse source 
* rename PackageVersions.props files used for source-build
This commit is contained in:
Logan Bussell 2021-08-06 10:07:54 -07:00 • committed by GitHub
parent e0973f9aac
commit f2fb118bdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/SourceBuild/tarball/content/Directory.Build.props
View file

@ -122,7 +122,7 @@
<SourceBuiltAspNetCoreRuntime>$(LocalBlobStorageRoot)aspnetcore/Runtime/</SourceBuiltAspNetCoreRuntime> <SourceBuiltAspNetCoreRuntime>$(LocalBlobStorageRoot)aspnetcore/Runtime/</SourceBuiltAspNetCoreRuntime>
<RestoreSourcePropsPath>$(IntermediatePath)RestoreSources.props</RestoreSourcePropsPath> <RestoreSourcePropsPath>$(IntermediatePath)RestoreSources.props</RestoreSourcePropsPath>
<PackageVersionPropsPath>$(IntermediatePath)PackageVersions.props</PackageVersionPropsPath> <PackageVersionPropsPath>$(IntermediatePath)PackageVersions.props</PackageVersionPropsPath>
<GennedPackageVersionPropsPath>$(IntermediatePath)GennedPackageVersions.props</GennedPackageVersionPropsPath> <CurrentSourceBuiltPackageVersionPropsPath>$(IntermediatePath)CurrentSourceBuiltPackageVersions.props</CurrentSourceBuiltPackageVersionPropsPath>
<LoggingDir>$(BaseOutputPath)logs/</LoggingDir> <LoggingDir>$(BaseOutputPath)logs/</LoggingDir>
<MSBuildDebugPathTargetDir>$(BaseOutputPath)msbuild-debug/</MSBuildDebugPathTargetDir> <MSBuildDebugPathTargetDir>$(BaseOutputPath)msbuild-debug/</MSBuildDebugPathTargetDir>
<RoslynDebugPathTargetDir>$(BaseOutputPath)roslyn-debug/</RoslynDebugPathTargetDir> <RoslynDebugPathTargetDir>$(BaseOutputPath)roslyn-debug/</RoslynDebugPathTargetDir>

2
src/SourceBuild/tarball/content/repos/Directory.Build.targets
View file

@ -326,7 +326,7 @@
<WriteBuildOutputProps NuGetPackages="@(PreviouslySourceBuiltPackages)" <WriteBuildOutputProps NuGetPackages="@(PreviouslySourceBuiltPackages)"
ExtraProperties="@(ExtraPackageVersionPropsPackageInfo)" ExtraProperties="@(ExtraPackageVersionPropsPackageInfo)"
AdditionalAssetDirs="@(_AdditionalAssetDirs)" AdditionalAssetDirs="@(_AdditionalAssetDirs)"
OutputPath="$(GennedPackageVersionPropsPath)" /> OutputPath="$(CurrentSourceBuiltPackageVersionPropsPath)" />
<WriteBuildOutputProps NuGetPackages="@(PreviouslySourceBuiltPackages)" <WriteBuildOutputProps NuGetPackages="@(PreviouslySourceBuiltPackages)"
IncludeCreationTimeProperty="true" IncludeCreationTimeProperty="true"

2
src/SourceBuild/tarball/content/repos/package-source-build.proj
View file

@ -5,7 +5,7 @@
<RepoApiImplemented>false</RepoApiImplemented> <RepoApiImplemented>false</RepoApiImplemented>
<ProjectDirectory>$(SubmoduleDirectory)$(RepositoryName)/</ProjectDirectory> <ProjectDirectory>$(SubmoduleDirectory)$(RepositoryName)/</ProjectDirectory>
<SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated> <SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated>
<IncludedPackageVersionPropsFile>$(GennedPackageVersionPropsPath)</IncludedPackageVersionPropsFile> <IncludedPackageVersionPropsFile>$(CurrentSourceBuiltPackageVersionPropsPath)</IncludedPackageVersionPropsFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

8
src/SourceBuild/tarball/content/tools-local/init-build.proj
View file

@ -69,17 +69,17 @@
<Delete Files="@(ReferencePackagesToOverride)" /> <Delete Files="@(ReferencePackagesToOverride)" />
<!-- Setup the PackageVersions.props file to be a combination of SourceBuilt and GennedPackages --> <!-- Setup the PackageVersions.props file to be a combination of source built and previously source built packages -->
<Copy SourceFiles="$(PrebuiltSourceBuiltPackagesPath)PackageVersions.props" DestinationFiles="$(IntermediatePath)SourceBuiltPackageVersions.props" /> <Copy SourceFiles="$(PrebuiltSourceBuiltPackagesPath)PackageVersions.props" DestinationFiles="$(IntermediatePath)PreviouslySourceBuiltPackageVersions.props" />
<PropertyGroup> <PropertyGroup>
<PackageVersionsPropsFile>$(IntermediatePath)PackageVersions.props</PackageVersionsPropsFile> <PackageVersionsPropsFile>$(IntermediatePath)PackageVersions.props</PackageVersionsPropsFile>
<PackageVersionsPropsContents> <PackageVersionsPropsContents>
<![CDATA[<?xml version="1.0" encoding="utf-8"?> <![CDATA[<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="SourceBuiltPackageVersions.props" Condition="Exists('SourceBuiltPackageVersions.props')" /> <Import Project="PreviouslySourceBuiltPackageVersions.props" Condition="Exists('PreviouslySourceBuiltPackageVersions.props')" />
<Import Project="$(ProjectDir)TemporaryBootstrapPackageVersions.props" Condition="Exists('$(ProjectDir)TemporaryBootstrapPackageVersions.props')" /> <Import Project="$(ProjectDir)TemporaryBootstrapPackageVersions.props" Condition="Exists('$(ProjectDir)TemporaryBootstrapPackageVersions.props')" />
<Import Project="GennedPackageVersions.props" Condition="Exists('GennedPackageVersions.props')" /> <Import Project="CurrentSourceBuiltPackageVersions.props" Condition="Exists('CurrentSourceBuiltPackageVersions.props')" />
</Project> </Project>
]]> ]]>
</PackageVersionsPropsContents> </PackageVersionsPropsContents>