Permalink
Browse files

Merge branch '0.5'

  • Loading branch information...
2 parents 533da3e + d256af8 commit 160a1cab7abb53eb474982fed0cae3a5061cbc03 @davidfowl davidfowl committed May 9, 2012
View
@@ -38,18 +38,12 @@
<Revision>0</Revision>
</PropertyGroup>
- <PropertyGroup Condition="$(PrereleaseTag) != ''">
+ <PropertyGroup>
<Version>$(MajorVersion).$(MinorVersion).$(Revision).$(Build)</Version>
- <PackageVersion>$(MajorVersion).$(MinorVersion).$(Revision)$(PrereleaseTagWithSeparator)</PackageVersion>
- <JsVersion>$(MajorVersion).$(MinorVersion)$(PrereleaseTag)</JsVersion>
+ <PackageVersion>$(MajorVersion).$(MinorVersion).$(PackageBuild)$(PrereleaseTagWithSeparator)</PackageVersion>
+ <JsVersion>$(MajorVersion).$(MinorVersion).$(PackageBuild)$(PrereleaseTag)</JsVersion>
</PropertyGroup>
- <PropertyGroup Condition="$(PrereleaseTag) == ''">
- <Version>$(MajorVersion).$(MinorVersion).$(Revision).$(Build)</Version>
- <PackageVersion>$(MajorVersion).$(MinorVersion).$(PackageBuild)</PackageVersion>
- <JsVersion>$(MajorVersion).$(MinorVersion).$(PackageBuild)</JsVersion>
- </PropertyGroup>
-
<ItemGroup>
<RegexTransform Include="$(ProjectRoot)\Common\CommonAssemblyInfo.cs">
<Find>\d+\.\d+\.\d+\.\d+</Find>
Oops, something went wrong.

0 comments on commit 160a1ca

Please sign in to comment.