Skip to content

Commit c5ae891

Browse files
asbjornuasbjornu
authored
Merge pull request #1247 from bording/sync-fileversion
Sync FileVersion
2 parents 00c26d4 + 7bbc0a2 commit c5ae891

File tree

4 files changed

+33
-27
lines changed

4 files changed

+33
-27
lines changed

‎src/GitVersionTask/AssemblyInfoBuilder/FSharpAssemblyInfoBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ open System.Reflection
4141
{3}
4242
",
4343
vars.AssemblySemVer,
44-
vars.MajorMinorPatch + ".0",
44+
vars.AssemblySemFileVer,
4545
vars.InformationalVersion,
4646
GenerateStaticVariableMembers(v),
4747
rootNamespace);

‎src/GitVersionTask/GetVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public GetVersion()
6767
public string AssemblySemVer { get; set; }
6868

6969
[Output]
70-
public string AssemblySemFileVer { get; private set; }
70+
public string AssemblySemFileVer { get; set; }
7171

7272
[Output]
7373
public string FullSemVer { get; set; }

‎src/GitVersionTask/NugetAssets/build/GitVersionTask.targets

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == '' and '$(TargetFramework)' != '' ">false</UpdateAssemblyInfo>
2222
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == '' and '$(NCrunch)' != '' ">false</UpdateAssemblyInfo>
2323
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == '' ">true</UpdateAssemblyInfo>
24-
24+
2525
<!-- Property that enables setting of Version -->
2626
<UpdateVersionProperties Condition=" '$(UpdateVersionProperties)' == '' ">true</UpdateVersionProperties>
2727
<UseFullSemVerForNuGet Condition=" '$(UseFullSemVerForNuGet)' == '' ">false</UseFullSemVerForNuGet>
@@ -48,7 +48,7 @@
4848
<Target Name="WriteVersionInfoToBuildLog" BeforeTargets="CoreCompile;GetAssemblyVersion;GenerateNuspec" Condition="$(WriteVersionInfoToBuildLog) == 'true'">
4949
<WriteVersionInfoToBuildLog SolutionDirectory="$(GitVersionPath)" NoFetch="$(GitVersion_NoFetchEnabled)"/>
5050
</Target>
51-
51+
5252
<Target Name="UpdateAssemblyInfo" BeforeTargets="CoreCompile" Condition="$(UpdateAssemblyInfo) == 'true'">
5353
<UpdateAssemblyInfo
5454
SolutionDirectory="$(GitVersionPath)"
@@ -66,36 +66,39 @@
6666
<Compile Include="$(AssemblyInfoTempFilePath)" />
6767
</ItemGroup>
6868
</Target>
69-
69+
7070
<Target Name="GetVersion" BeforeTargets="CoreCompile;GetAssemblyVersion;GenerateNuspec;_GenerateRestoreProjectSpec;EnsureWixToolsetInstalled" Condition="$(GetVersion) == 'true'">
7171

7272
<GetVersion SolutionDirectory="$(GitVersionPath)" NoFetch="$(GitVersion_NoFetchEnabled)">
7373
<Output TaskParameter="Major" PropertyName="GitVersion_Major" />
7474
<Output TaskParameter="Minor" PropertyName="GitVersion_Minor" />
7575
<Output TaskParameter="Patch" PropertyName="GitVersion_Patch" />
76+
<Output TaskParameter="PreReleaseTag" PropertyName="GitVersion_PreReleaseTag" />
77+
<Output TaskParameter="PreReleaseTagWithDash" PropertyName="GitVersion_PreReleaseTagWithDash" />
78+
<Output TaskParameter="PreReleaseLabel" PropertyName="GitVersion_PreReleaseLabel" />
79+
<Output TaskParameter="PreReleaseNumber" PropertyName="GitVersion_PreReleaseNumber" />
7680
<Output TaskParameter="BuildMetaData" PropertyName="GitVersion_BuildMetaData" />
7781
<Output TaskParameter="BuildMetaDataPadded" PropertyName="GitVersion_BuildMetaDataPadded" />
7882
<Output TaskParameter="FullBuildMetaData" PropertyName="GitVersion_FullBuildMetaData" />
79-
<Output TaskParameter="BranchName" PropertyName="GitVersion_BranchName" />
80-
<Output TaskParameter="Sha" PropertyName="GitVersion_Sha" />
8183
<Output TaskParameter="MajorMinorPatch" PropertyName="GitVersion_MajorMinorPatch" />
8284
<Output TaskParameter="SemVer" PropertyName="GitVersion_SemVer" />
8385
<Output TaskParameter="LegacySemVer" PropertyName="GitVersion_LegacySemVer" />
8486
<Output TaskParameter="LegacySemVerPadded" PropertyName="GitVersion_LegacySemVerPadded" />
85-
<Output TaskParameter="FullSemVer" PropertyName="GitVersion_FullSemVer" />
8687
<Output TaskParameter="AssemblySemVer" PropertyName="GitVersion_AssemblySemVer" />
88+
<Output TaskParameter="AssemblySemFileVer" PropertyName="GitVersion_AssemblySemFileVer" />
89+
<Output TaskParameter="FullSemVer" PropertyName="GitVersion_FullSemVer" />
90+
<Output TaskParameter="InformationalVersion" PropertyName="GitVersion_InformationalVersion" />
91+
<Output TaskParameter="BranchName" PropertyName="GitVersion_BranchName" />
92+
<Output TaskParameter="Sha" PropertyName="GitVersion_Sha" />
93+
<Output TaskParameter="NuGetVersionV2" PropertyName="GitVersion_NuGetVersionV2" />
8794
<Output TaskParameter="NuGetVersion" PropertyName="GitVersion_NuGetVersion" />
95+
<Output TaskParameter="NuGetPreReleaseTagV2" PropertyName="GitVersion_NuGetPreReleaseTagV2" />
8896
<Output TaskParameter="NuGetPreReleaseTag" PropertyName="GitVersion_NuGetPreReleaseTag" />
89-
<Output TaskParameter="PreReleaseTag" PropertyName="GitVersion_PreReleaseTag" />
90-
<Output TaskParameter="PreReleaseTagWithDash" PropertyName="GitVersion_PreReleaseTagWithDash" />
91-
<Output TaskParameter="PreReleaseLabel" PropertyName="GitVersion_PreReleaseLabel" />
92-
<Output TaskParameter="PreReleaseNumber" PropertyName="GitVersion_PreReleaseNumber" />
93-
<Output TaskParameter="InformationalVersion" PropertyName="GitVersion_InformationalVersion" />
9497
<Output TaskParameter="CommitDate" PropertyName="GitVersion_CommitDate" />
9598
<Output TaskParameter="CommitsSinceVersionSource" PropertyName="GitVersion_CommitsSinceVersionSource" />
9699
<Output TaskParameter="CommitsSinceVersionSourcePadded" PropertyName="GitVersion_CommitsSinceVersionSourcePadded" />
97100
</GetVersion>
98-
101+
99102
<PropertyGroup Condition=" '$(UpdateVersionProperties)' == 'true' ">
100103
<Version>$(GitVersion_FullSemVer)</Version>
101104
<VersionPrefix>$(GitVersion_MajorMinorPatch)</VersionPrefix>
@@ -105,7 +108,7 @@
105108
<PackageVersion Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_FullSemVer)</PackageVersion>
106109
<InformationalVersion Condition=" '$(InformationalVersion)' == '' ">$(GitVersion_InformationalVersion)</InformationalVersion>
107110
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(GitVersion_AssemblySemVer)</AssemblyVersion>
108-
<FileVersion Condition=" '$(FileVersion)' == '' ">$(GitVersion_MajorMinorPatch).$(GitVersion_CommitsSinceVersionSource)</FileVersion>
111+
<FileVersion Condition=" '$(FileVersion)' == '' ">$(GitVersion_AssemblySemFileVer)</FileVersion>
109112
</PropertyGroup>
110113

111114
</Target>

‎src/GitVersionTask/NugetAssets/buildMultiTargeting/GitVersionTask.targets

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<GetVersion Condition=" '$(GetVersion)' == '' and '$(NCrunch)' != '' ">false</GetVersion>
2525
<GetVersion Condition=" '$(GetVersion)' == '' ">true</GetVersion>
26-
26+
2727
<!-- Property that enables setting of Version -->
2828
<UpdateVersionProperties Condition=" '$(UpdateVersionProperties)' == '' ">true</UpdateVersionProperties>
2929
<UseFullSemVerForNuGet Condition=" '$(UseFullSemVerForNuGet)' == '' ">false</UseFullSemVerForNuGet>
@@ -46,36 +46,39 @@
4646
<Target Name="WriteVersionInfoToBuildLog" BeforeTargets="DispatchToInnerBuilds;GenerateNuspec;_GenerateRestoreProjectSpec" Condition="$(WriteVersionInfoToBuildLog) == 'true'">
4747
<WriteVersionInfoToBuildLog SolutionDirectory="$(GitVersionPath)" NoFetch="$(GitVersion_NoFetchEnabled)"/>
4848
</Target>
49-
49+
5050
<Target Name="GetVersion" BeforeTargets="DispatchToInnerBuilds;GenerateNuspec" Condition="$(GetVersion) == 'true'">
5151

5252
<GetVersion SolutionDirectory="$(GitVersionPath)" NoFetch="$(GitVersion_NoFetchEnabled)">
5353
<Output TaskParameter="Major" PropertyName="GitVersion_Major" />
5454
<Output TaskParameter="Minor" PropertyName="GitVersion_Minor" />
5555
<Output TaskParameter="Patch" PropertyName="GitVersion_Patch" />
56+
<Output TaskParameter="PreReleaseTag" PropertyName="GitVersion_PreReleaseTag" />
57+
<Output TaskParameter="PreReleaseTagWithDash" PropertyName="GitVersion_PreReleaseTagWithDash" />
58+
<Output TaskParameter="PreReleaseLabel" PropertyName="GitVersion_PreReleaseLabel" />
59+
<Output TaskParameter="PreReleaseNumber" PropertyName="GitVersion_PreReleaseNumber" />
5660
<Output TaskParameter="BuildMetaData" PropertyName="GitVersion_BuildMetaData" />
5761
<Output TaskParameter="BuildMetaDataPadded" PropertyName="GitVersion_BuildMetaDataPadded" />
5862
<Output TaskParameter="FullBuildMetaData" PropertyName="GitVersion_FullBuildMetaData" />
59-
<Output TaskParameter="BranchName" PropertyName="GitVersion_BranchName" />
60-
<Output TaskParameter="Sha" PropertyName="GitVersion_Sha" />
6163
<Output TaskParameter="MajorMinorPatch" PropertyName="GitVersion_MajorMinorPatch" />
6264
<Output TaskParameter="SemVer" PropertyName="GitVersion_SemVer" />
6365
<Output TaskParameter="LegacySemVer" PropertyName="GitVersion_LegacySemVer" />
6466
<Output TaskParameter="LegacySemVerPadded" PropertyName="GitVersion_LegacySemVerPadded" />
65-
<Output TaskParameter="FullSemVer" PropertyName="GitVersion_FullSemVer" />
6667
<Output TaskParameter="AssemblySemVer" PropertyName="GitVersion_AssemblySemVer" />
68+
<Output TaskParameter="AssemblySemFileVer" PropertyName="GitVersion_AssemblySemFileVer" />
69+
<Output TaskParameter="FullSemVer" PropertyName="GitVersion_FullSemVer" />
70+
<Output TaskParameter="InformationalVersion" PropertyName="GitVersion_InformationalVersion" />
71+
<Output TaskParameter="BranchName" PropertyName="GitVersion_BranchName" />
72+
<Output TaskParameter="Sha" PropertyName="GitVersion_Sha" />
73+
<Output TaskParameter="NuGetVersionV2" PropertyName="GitVersion_NuGetVersionV2" />
6774
<Output TaskParameter="NuGetVersion" PropertyName="GitVersion_NuGetVersion" />
75+
<Output TaskParameter="NuGetPreReleaseTagV2" PropertyName="GitVersion_NuGetPreReleaseTagV2" />
6876
<Output TaskParameter="NuGetPreReleaseTag" PropertyName="GitVersion_NuGetPreReleaseTag" />
69-
<Output TaskParameter="PreReleaseTag" PropertyName="GitVersion_PreReleaseTag" />
70-
<Output TaskParameter="PreReleaseTagWithDash" PropertyName="GitVersion_PreReleaseTagWithDash" />
71-
<Output TaskParameter="PreReleaseLabel" PropertyName="GitVersion_PreReleaseLabel" />
72-
<Output TaskParameter="PreReleaseNumber" PropertyName="GitVersion_PreReleaseNumber" />
73-
<Output TaskParameter="InformationalVersion" PropertyName="GitVersion_InformationalVersion" />
7477
<Output TaskParameter="CommitDate" PropertyName="GitVersion_CommitDate" />
7578
<Output TaskParameter="CommitsSinceVersionSource" PropertyName="GitVersion_CommitsSinceVersionSource" />
7679
<Output TaskParameter="CommitsSinceVersionSourcePadded" PropertyName="GitVersion_CommitsSinceVersionSourcePadded" />
7780
</GetVersion>
78-
81+
7982
<PropertyGroup Condition=" '$(UpdateVersionProperties)' == 'true' ">
8083
<Version>$(GitVersion_FullSemVer)</Version>
8184
<VersionPrefix>$(GitVersion_MajorMinorPatch)</VersionPrefix>
@@ -85,7 +88,7 @@
8588
<PackageVersion Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_FullSemVer)</PackageVersion>
8689
<InformationalVersion Condition=" '$(InformationalVersion)' == '' ">$(GitVersion_InformationalVersion)</InformationalVersion>
8790
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(GitVersion_AssemblySemVer)</AssemblyVersion>
88-
<FileVersion Condition=" '$(FileVersion)' == '' ">$(GitVersion_MajorMinorPatch).$(GitVersion_CommitsSinceVersionSource)</FileVersion>
91+
<FileVersion Condition=" '$(FileVersion)' == '' ">$(GitVersion_AssemblySemFileVer)</FileVersion>
8992
</PropertyGroup>
9093

9194
</Target>

0 commit comments

Comments
 (0)