Skip to content

Commit 5083cad

Browse files
author
Oren Novotny
committed
Set variables in sdk builds by default
1 parent e7536a1 commit 5083cad

File tree

2 files changed

+43
-10
lines changed

2 files changed

+43
-10
lines changed

src/GitVersionTask/NugetAssets/build/GitVersionTask.targets

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@
88
<!-- Property that enables WriteVersionInfoToBuildLog -->
99
<WriteVersionInfoToBuildLog Condition=" '$(WriteVersionInfoToBuildLog)' == '' ">true</WriteVersionInfoToBuildLog>
1010

11-
<!-- Property that enables UpdateAssemblyInfo -->
11+
<!-- Property that enables UpdateAssemblyInfo. Default to off for SDK builds -->
12+
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == '' and '$(TargetFramework)' != '' ">false</UpdateAssemblyInfo>
1213
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == '' ">true</UpdateAssemblyInfo>
14+
15+
<!-- Property that enables setting of Version -->
16+
<UpdateVersionProperties Condition=" '$(UpdateVersionProperties)' == '' ">true</UpdateVersionProperties>
17+
<UseFullSemVerForNuGet Condition=" '$(UseFullSemVerForNuGet)' == '' ">false</UseFullSemVerForNuGet>
1318

1419
<!-- Property that enables GetVersion -->
1520
<GetVersion Condition=" '$(GetVersion)' == '' ">true</GetVersion>
@@ -77,6 +82,18 @@
7782
<Output TaskParameter="CommitsSinceVersionSource" PropertyName="GitVersion_CommitsSinceVersionSource" />
7883
<Output TaskParameter="CommitsSinceVersionSourcePadded" PropertyName="GitVersion_CommitsSinceVersionSourcePadded" />
7984
</GetVersion>
85+
86+
<PropertyGroup Condition=" '$(UpdateVersionProperties)' == 'true' ">
87+
<Version>$(GitVersion_FullSemVer)</Version>
88+
<VersionPrefix>$(GitVersion_MajorMinorPatch)</VersionPrefix>
89+
<VersionSuffix Condition=" '$(UseFullSemVerForNuGet)' == 'false' ">$(GitVersion_NuGetPreReleaseTag)</VersionSuffix>
90+
<VersionSuffix Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_PreReleaseTag)</VersionSuffix>
91+
<PackageVersion Condition=" '$(UseFullSemVerForNuGet)' == 'false' ">$(GitVersion_NuGetVersion)</PackageVersion>
92+
<PackageVersion Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_FullSemVer)</PackageVersion>
93+
<InformationalVersion Condition=" '$(InformationalVersion)' == '' ">$(GitVersion_InformationalVersion)</InformationalVersion>
94+
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(GitVersion_AssemblySemVer)</AssemblyVersion>
95+
<FileVersion Condition=" '$(FileVersion)' == '' ">$(GitVersion_MajorMinorPatch).$(GitVersion_CommitsSinceVersionSource)</FileVersion>
96+
</PropertyGroup>
8097

8198
</Target>
8299

@@ -93,6 +110,4 @@
93110
</None>
94111
</ItemGroup>
95112

96-
</Project>
97-
98-
113+
</Project>

src/GitVersionTask/NugetAssets/buildMultiTargeting/GitVersionTask.targets

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,16 @@
77
<!-- Property that enables WriteVersionInfoToBuildLog -->
88
<WriteVersionInfoToBuildLog Condition=" '$(WriteVersionInfoToBuildLog)' == '' ">true</WriteVersionInfoToBuildLog>
99

10-
<!-- Property that enables GetVersion -->
10+
<!-- Property that enables UpdateAssemblyInfo. Default to off for SDK builds -->
11+
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == '' and '$(TargetFramework)' != '' ">false</UpdateAssemblyInfo>
12+
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == '' ">true</UpdateAssemblyInfo>
13+
1114
<GetVersion Condition=" '$(GetVersion)' == '' ">true</GetVersion>
15+
16+
17+
<!-- Property that enables setting of Version -->
18+
<UpdateVersionProperties Condition=" '$(UpdateVersionProperties)' == '' ">true</UpdateVersionProperties>
19+
<UseFullSemVerForNuGet Condition=" '$(UseFullSemVerForNuGet)' == '' ">false</UseFullSemVerForNuGet>
1220

1321
<GitVersionTaskLibrary>$(MSBuildThisFileDirectory)..\build\</GitVersionTaskLibrary>
1422
</PropertyGroup>
@@ -23,11 +31,11 @@
2331
TaskName="GitVersionTask.WriteVersionInfoToBuildLog"
2432
AssemblyFile="$(GitVersionTaskLibrary)GitVersionTask.dll" />
2533

26-
<Target Name="WriteVersionInfoToBuildLog" BeforeTargets="DispatchToInnerBuilds" Condition="$(WriteVersionInfoToBuildLog) == 'true'">
34+
<Target Name="WriteVersionInfoToBuildLog" BeforeTargets="DispatchToInnerBuilds;GenerateNuspec" Condition="$(WriteVersionInfoToBuildLog) == 'true'">
2735
<WriteVersionInfoToBuildLog SolutionDirectory="$(SolutionDir)" NoFetch="$(GitVersion_NoFetchEnabled)"/>
2836
</Target>
2937

30-
<Target Name="GetVersion" BeforeTargets="DispatchToInnerBuilds" Condition="$(GetVersion) == 'true'">
38+
<Target Name="GetVersion" BeforeTargets="DispatchToInnerBuilds;GenerateNuspec" Condition="$(GetVersion) == 'true'">
3139

3240
<GetVersion SolutionDirectory="$(SolutionDir)" NoFetch="$(GitVersion_NoFetchEnabled)">
3341
<Output TaskParameter="Major" PropertyName="GitVersion_Major" />
@@ -55,8 +63,18 @@
5563
<Output TaskParameter="CommitsSinceVersionSource" PropertyName="GitVersion_CommitsSinceVersionSource" />
5664
<Output TaskParameter="CommitsSinceVersionSourcePadded" PropertyName="GitVersion_CommitsSinceVersionSourcePadded" />
5765
</GetVersion>
66+
67+
<PropertyGroup Condition=" '$(UpdateVersionProperties)' == 'true' ">
68+
<Version>$(GitVersion_FullSemVer)</Version>
69+
<VersionPrefix>$(GitVersion_MajorMinorPatch)</VersionPrefix>
70+
<VersionSuffix Condition=" '$(UseFullSemVerForNuGet)' == 'false' ">$(GitVersion_NuGetPreReleaseTag)</VersionSuffix>
71+
<VersionSuffix Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_PreReleaseTag)</VersionSuffix>
72+
<PackageVersion Condition=" '$(UseFullSemVerForNuGet)' == 'false' ">$(GitVersion_NuGetVersion)</PackageVersion>
73+
<PackageVersion Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_FullSemVer)</PackageVersion>
74+
<InformationalVersion Condition=" '$(InformationalVersion)' == '' ">$(GitVersion_InformationalVersion)</InformationalVersion>
75+
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(GitVersion_AssemblySemVer)</AssemblyVersion>
76+
<FileVersion Condition=" '$(FileVersion)' == '' ">$(GitVersion_MajorMinorPatch).$(GitVersion_CommitsSinceVersionSource)</FileVersion>
77+
</PropertyGroup>
5878

5979
</Target>
60-
</Project>
61-
62-
80+
</Project>

0 commit comments

Comments
 (0)