Skip to content

Version Synchronization (MSBuild) #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreiborodin merged 1 commit into from
Dec 10, 2019
Merged

Version Synchronization (MSBuild) #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Project>

<PropertyGroup>
<!--
The following three properties are manually set:
- Major is hard-coded and should be incremented on breaking changes.
- Minor version is hard-coded and should be incremented on feature additions that aren't breaking changes.
- Revision (semver Patch) version is hard-coded and should be incremented when a bug fix is made.
-->
<MSB4U_MajorVersion>0</MSB4U_MajorVersion>
<MSB4U_MinorVersion>8</MSB4U_MinorVersion>
<MSB4U_RevisionVersion>3</MSB4U_RevisionVersion>
<MSB4U_RevisionVersion_PreIncrement>3</MSB4U_RevisionVersion_PreIncrement>

<!-- If we are not on a release branch, we increment revision version -->
<MSB4U_RevisionVersion Condition="!$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/release/'))">$([MSBuild]::Add($(MSB4U_RevisionVersion), 1))</MSB4U_RevisionVersion>

<MSB4U_Version>$(MSB4U_MajorVersion).$(MSB4U_MinorVersion).$(MSB4U_RevisionVersion)</MSB4U_Version>
<!-- Version is based on Major.Minor.Revision as defined above, however, in a lab BUILD_BUILDID will be set so we pull in that as the pre-release version. -->
<MSB4U_Version Condition="'$(BUILD_BUILDID)' != '' And !$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/release/'))">$(MSB4U_Version)-$(BUILD_BUILDID)</MSB4U_Version>

<MSB4U_PackageVersion>$(MSB4U_Version)</MSB4U_PackageVersion>
<MSB4U_AssemblyVersion>$(MSB4U_MajorVersion).$(MSB4U_MinorVersion)</MSB4U_AssemblyVersion>
<MSB4U_AssemblyFileVersion>$(MSB4U_AssemblyVersion).$(MSB4U_RevisionVersion).0</MSB4U_AssemblyFileVersion>
<MSB4U_AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And !$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/release/'))">$(MSB4U_AssemblyVersion).$(MSB4U_RevisionVersion).$(BUILD_BUILDID)</MSB4U_AssemblyFileVersion>

<MSB4U_DependencyVersion>$(MSB4U_MajorVersion).$(MSB4U_MinorVersion).$(MSB4U_RevisionVersion)</MSB4U_DependencyVersion>
<MSB4U_DependencyVersion Condition="!$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/release/'))">[$(MSB4U_MajorVersion).$(MSB4U_MinorVersion).$(MSB4U_RevisionVersion_PreIncrement), $(MSB4U_MajorVersion).$(MSB4U_MinorVersion).$(MSB4U_RevisionVersion)]</MSB4U_DependencyVersion>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MSBuildForUnity" Version="[0.8.3-*, 0.8.3]">
<PackageReference Include="MSBuildForUnity" Version="$(MSB4U_DependencyVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
25 changes: 9 additions & 16 deletions Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,16 @@

<!-- Setup the versioning for the package based on the build number if provided -->
<PropertyGroup>
<!-- Major is hard-coded and should be incremented on breaking changes -->
<MajorVersion>0</MajorVersion>

<!-- Minor version is hard-coded and should be incremented on feature additions that aren't breaking changes.-->
<MinorVersion>8</MinorVersion>

<!-- Revision (semver Patch) version is hard-coded and should be incremented when a bug fix is made.-->
<RevisionVersion>3</RevisionVersion>
<!-- These values are set up from the repo-root Directory.Build.props file -->
<MajorVersion>$(MSB4U_MajorVersion)</MajorVersion>
<MinorVersion>$(MSB4U_MinorVersion)</MinorVersion>
<RevisionVersion>$(MSB4U_RevisionVersion)</RevisionVersion>

<Version>$(MajorVersion).$(MinorVersion).$(RevisionVersion)</Version>
<!-- Version is based on Major.Minor.Revision as defined above, however, in a lab BUILD_BUILDID will be set so we pull in that as the pre-release version. -->
<Version Condition="'$(BUILD_BUILDID)' != '' And !$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/release/'))">$(Version)-$(BUILD_BUILDID)</Version>

<PackageVersion>$(Version)</PackageVersion>
<AssemblyVersion>$(MajorVersion).$(MinorVersion)</AssemblyVersion>
<AssemblyFileVersion>$(AssemblyVersion).$(RevisionVersion).0</AssemblyFileVersion>
<AssemblyFileVersion Condition="'$(BUILD_BUILDID)' != '' And !$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/release/'))">$(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID)</AssemblyFileVersion>
<Version>$(MSB4U_Version)</Version>

<PackageVersion>$(MSB4U_PackageVersion)</PackageVersion>
<AssemblyVersion>$(MSB4U_AssemblyVersion)</AssemblyVersion>
<AssemblyFileVersion>$(MSB4U_AssemblyFileVersion)</AssemblyFileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down