huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure version information is passed properly into the package cache build

This commit is contained in:
Nate McMaster 2017-08-30 15:15:57 -07:00
parent 5589365cac
commit ac49fcb7fd
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -1,5 +1,4 @@
<Project>
<Import Project="version.xml" />
<Import Project="build\dependencies.props" />
<PropertyGroup>
@ -10,7 +9,6 @@
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
<VersionSuffix Condition="'$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
</Project>

2
build/dependencies.props
View File

@ -1,4 +1,6 @@
<Project>
<Import Project="..\version.xml" />
<PropertyGroup>
<AspNetCoreIntegrationTestingVersion>0.5.0-*</AspNetCoreIntegrationTestingVersion>
<AspNetCoreVersion>2.1.0-*</AspNetCoreVersion>

2
build/repo.props
View File

@ -1,4 +1,6 @@
<Project>
<Import Project="dependencies.props" />
<ItemGroup>
<ExcludeFromPack Include="$(RepositoryRoot)src\Microsoft.AspNetCore.RuntimeStore\Microsoft.AspNetCore.RuntimeStore.csproj" />
<ExcludeFromPack Include="$(RepositoryRoot)src\Archive.AspNetCore.All\Archive.AspNetCore.All.csproj" />

6
build/repo.targets
View File

@ -1,11 +1,5 @@
<Project>
<Import Project="..\version.xml" />
<Import Project="dependencies.props" />
<PropertyGroup>
<OriginalVersionSuffix>$(VersionSuffix)</OriginalVersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
<!-- Project for building the Runtime Store -->
<MetaPackagePath>$(RepositoryRoot)src\Microsoft.AspNetCore.RuntimeStore\</MetaPackagePath>
<MetaPackageFile>$(MetaPackagePath)Microsoft.AspNetCore.RuntimeStore.csproj</MetaPackageFile>

4
version.xml
View File

@ -4,5 +4,9 @@
<KoreBuildChannel>dev</KoreBuildChannel>
<VersionPrefix>2.1.0</VersionPrefix>
<VersionSuffix>preview1</VersionSuffix>
<OriginalVersionSuffix>$(VersionSuffix)</OriginalVersionSuffix>
<VersionSuffix Condition="'$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
<Version>$(VersionPrefix)</Version>
<Version Condition="'$(VersionSuffix)' != ''">$(Version)-$(VersionSuffix)</Version>
</PropertyGroup>
</Project>