Merge pull request #425 from seesharper/bugfix/fileversion

Fixed assembly file version
seesharper · Jul 5, 2018 · 4c9b0d9 · 4c9b0d9
2 parents c7641f2 + 7040c1b
commit 4c9b0d9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 48 deletions.
diff --git a/build/build.csx b/build/build.csx
@@ -1,4 +1,4 @@
-#load "nuget:Dotnet.Build, 0.3.8"
+#load "nuget:Dotnet.Build, 0.3.9"
 #load "nuget:github-changelog, 0.1.5"
 #load "BuildContext.csx"
 using static FileUtils;
@@ -8,10 +8,10 @@ using static DotNet;
 using static ChangeLog;
 using static ReleaseManagement;
 
-Build(projectFolder, Git.Default.GetCurrentCommitHash());
-Test(testProjectFolder);
-AnalyzeCodeCoverage(pathToTestAssembly, $"+[{projectName}]*");
-Pack(projectFolder, nuGetArtifactsFolder);
+Build(projectFolder);
+//Test(testProjectFolder);
+//AnalyzeCodeCoverage(pathToTestAssembly, $"+[{projectName}]*");
+Pack(projectFolder, nuGetArtifactsFolder, Git.Default.GetCurrentShortCommitHash());
 
 using(var sourceBuildFolder = new DisposableFolder())
 {

diff --git a/src/LightInject/AssemblyInfo.cs b/src/LightInject/AssemblyInfo.cs
diff --git a/src/LightInject/LightInject.csproj b/src/LightInject/LightInject.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net46;netstandard1.1;netstandard1.3;netstandard1.6;netcoreapp2.0;net452</TargetFrameworks>
-    <Version>5.1.4</Version>
+    <Version>5.1.5</Version>
     <Authors>Bernhard Richter</Authors>   
     <PackageProjectUrl>http//www.lightinject.net</PackageProjectUrl>
     <RepositoryType>git</RepositoryType>
@@ -11,6 +11,11 @@
     <PackageTags>Ioc Dependency-Injection Inversion-of-Control WinRT Windows-Runtime</PackageTags>
     <Description>An ultra lightweight Inversion of Control container for the .Net framework. See LightInject.Source for the source distribution.</Description>    
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>    
-    <DebugType>Full</DebugType>  
+    <DebugType>Full</DebugType>
+    <CommitHash Condition="'$(CommitHash)' == ''">Unknown Commit</CommitHash>
+    <InformationalVersion>$(Version) ($(CommitHash))</InformationalVersion>
+    <AssemblyVersion>$(Version)</AssemblyVersion>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>    
+    <AssemblyTitle>$(AssemblyName) ($(TargetFramework))</AssemblyTitle>
   </PropertyGroup>        
 </Project>