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

Merge pull request #5944 from piotrpMSFT/piotrpMSFT/infra/00prefix

Browse source 
Re-introduce 00 prefix
This commit is contained in:
Piotr Puszkiewicz 2017-03-07 13:21:33 -08:00 • committed by GitHub
commit b80ce431ca
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/Branding.props
View file

@ -1,6 +1,6 @@
<Project ToolsVersion="14.0"> <Project ToolsVersion="14.0">
<PropertyGroup> <PropertyGroup>
<SdkBrandName>Microsoft .NET Core 2.0.0 - SDK Alpha</SdkBrandName> <SdkBrandName>Microsoft .NET Core 2.0.0 - SDK Preview 1</SdkBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core 2.0.0 - Runtime</SharedFrameworkBrandName> <SharedFrameworkBrandName>Microsoft .NET Core 2.0.0 - Runtime</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core 2.0.0 - Host</SharedHostBrandName> <SharedHostBrandName>Microsoft .NET Core 2.0.0 - Host</SharedHostBrandName>
<HostFxrBrandName>Microsoft .NET Core 2.0.0 - Host FX Resolver</HostFxrBrandName> <HostFxrBrandName>Microsoft .NET Core 2.0.0 - Host FX Resolver</HostFxrBrandName>

5
build/GitCommitInfo.targets
View file

@ -11,8 +11,10 @@
</Exec> </Exec>
<PropertyGroup> <PropertyGroup>
<GitInfoCommitCount>$(GitInfoCommitCount.PadLeft(6,'0'))</GitInfoCommitCount>
<ShouldOverWriteThePropsFile <ShouldOverWriteThePropsFile
Condition=" '$(CommitCount)' != '$(GitInfoCommitCount)' Or Condition=" 'ForceStringComparison$(CommitCount)' != 'ForceStringComparison$(GitInfoCommitCount)' Or
'$(CommitHash)' != '$(GitInfoCommitHash)' ">true</ShouldOverWriteThePropsFile> '$(CommitHash)' != '$(GitInfoCommitHash)' ">true</ShouldOverWriteThePropsFile>
<GitCommitInfoPropsContent> <GitCommitInfoPropsContent>
@ -29,5 +31,6 @@
Lines="$(GitCommitInfoPropsContent)" Lines="$(GitCommitInfoPropsContent)"
Condition=" '$(ShouldOverwriteThePropsFile)' == 'true' " Condition=" '$(ShouldOverwriteThePropsFile)' == 'true' "
Overwrite="true" /> Overwrite="true" />
</Target> </Target>
</Project> </Project>

2
build/Version.props
View file

@ -3,7 +3,7 @@
<VersionMajor>2</VersionMajor> <VersionMajor>2</VersionMajor>
<VersionMinor>0</VersionMinor> <VersionMinor>0</VersionMinor>
<VersionPatch>0</VersionPatch> <VersionPatch>0</VersionPatch>
<ReleaseSuffix>alpha</ReleaseSuffix> <ReleaseSuffix>preview1</ReleaseSuffix>
<CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix> <CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>
<SimpleVersion Condition=" '$(DropSuffix)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)</SimpleVersion> <SimpleVersion Condition=" '$(DropSuffix)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)</SimpleVersion>