Skip to content

Commit a693729

Browse files
committed
Switch to using info version for nuget
1 parent 41a7a68 commit a693729

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Build/CommonAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
1818
[assembly: AssemblyVersion("3.7.8")]
19-
[assembly: AssemblyFileVersion("3.7.8-beta")]
20-
//[assembly: AssemblyInformationalVersion("2.5-filters")]
19+
[assembly: AssemblyFileVersion("3.7.8")]
20+
[assembly: AssemblyInformationalVersion("3.7.8-beta")]

Build/build.proj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,30 +58,30 @@
5858
<Output TaskParameter="Assemblies" ItemName="AsmInfo" />
5959
</GetAssemblyIdentity>
6060
<GetAssemblyInformationalVersion AssemblyFile="$(PackageDir)\Griddly.Core\lib\net461\Griddly.Mvc.dll">
61-
<Output TaskParameter="Value" ItemName="AssemblyVersion" />
61+
<Output TaskParameter="Value" ItemName="AssemblyInformationalVersion" />
6262
</GetAssemblyInformationalVersion>
6363
<PropertyGroup>
64-
<AssemblyVersion Condition="@(AssemblyVersion) != ''">@(AssemblyVersion)</AssemblyVersion>
65-
<AssemblyVersion Condition="$(AssemblyVersion) == ''">%(AsmInfo.Version)</AssemblyVersion>
64+
<AssemblyInformationalVersion Condition="@(AssemblyInformationalVersion) != ''">@(AssemblyInformationalVersion)</AssemblyInformationalVersion>
65+
<AssemblyInformationalVersion Condition="$(AssemblyInformationalVersion) == ''">%(AsmInfo.InfoVersion)</AssemblyInformationalVersion>
6666
</PropertyGroup>
6767

6868
<!-- insert the version number into the nuspec files -->
6969
<XmlUpdate
7070
Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
7171
XmlFileName="$(PackageDir)\Griddly\Griddly.nuspec"
7272
XPath="/package/metadata/version"
73-
Value="$(AssemblyVersion)" />
73+
Value="$(AssemblyInformationalVersion)" />
7474
<XmlUpdate
7575
Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
7676
XmlFileName="$(PackageDir)\Griddly.Core\Griddly.Core.nuspec"
7777
XPath="/package/metadata/version"
78-
Value="$(AssemblyVersion)" />
78+
Value="$(AssemblyInformationalVersion)" />
7979

8080
<XmlUpdate
8181
Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
8282
XmlFileName="$(PackageDir)\Griddly\Griddly.nuspec"
8383
XPath="/package/metadata/dependencies/group/dependency[@id='Griddly.Core']/@version"
84-
Value="$(AssemblyVersion)" />
84+
Value="$(AssemblyInformationalVersion)" />
8585

8686
<Exec WorkingDirectory="$(PackageDir)"
8787
Command="$(BaseDir)\.nuget\nuget.exe pack $(PackageDir)\Griddly\Griddly.nuspec" />

0 commit comments

Comments
 (0)