Merge branch 'release-0.14.4'

belkiss · belkiss · commit e3886d2f1e70 · 2020-07-23T17:47:22.000+02:00
diff --git a/Sharpmake.Application/Properties/AssemblyInfo.cs b/Sharpmake.Application/Properties/AssemblyInfo.cs
@@ -43,4 +43,4 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.14.3.0")]
+[assembly: AssemblyVersion("0.14.4.0")]
diff --git a/Sharpmake.Generators/Properties/AssemblyInfo.cs b/Sharpmake.Generators/Properties/AssemblyInfo.cs
@@ -44,6 +44,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.14.3.0")]
+[assembly: AssemblyVersion("0.14.4.0")]
 
 [assembly: InternalsVisibleTo("Sharpmake")]
diff --git a/Sharpmake.Generators/VisualStudio/Csproj.Template.cs b/Sharpmake.Generators/VisualStudio/Csproj.Template.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) 2017 Ubisoft Entertainment
+// Copyright (c) 2017 Ubisoft Entertainment
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -111,6 +111,7 @@ public static class Project
     <GenerateAssemblyVersionAttribute>[GeneratedAssemblyConfigTemplate.GenerateAssemblyVersionAttribute]</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>[GeneratedAssemblyConfigTemplate.GenerateAssemblyInformationalVersionAttribute]</GenerateAssemblyInformationalVersionAttribute>
     <RestoreProjectStyle>[NugetRestoreProjectStyleString]</RestoreProjectStyle>
+    <ProductVersion>[options.ProductVersion]</ProductVersion>
   </PropertyGroup>
 ";
 
diff --git a/Sharpmake.Generators/VisualStudio/Csproj.cs b/Sharpmake.Generators/VisualStudio/Csproj.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) 2017 Ubisoft Entertainment
+// Copyright (c) 2017 Ubisoft Entertainment
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -3214,6 +3214,7 @@ private Options.ExplicitOptions GenerateOptions(CSharpProject project, Project.C
             options["ManifestKeyFile"] = Options.StringOption.Get<Options.CSharp.ManifestKeyFile>(conf);
             options["ManifestCertificateThumbprint"] = Options.StringOption.Get<Options.CSharp.ManifestCertificateThumbprint>(conf);
             options["CopyVsixExtensionLocation"] = Options.StringOption.Get<Options.CSharp.CopyVsixExtensionLocation>(conf);
+            options["ProductVersion"] = Options.StringOption.Get<Options.CSharp.ProductVersion>(conf);
 
             // concat defines, don't add options.Defines since they are automatically added by VS
             Strings defines = new Strings();
diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs
@@ -44,6 +44,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.14.3.0")]
+[assembly: AssemblyVersion("0.14.4.0")]
 
 [assembly: SharpmakeExtension]
diff --git a/Sharpmake.Platforms/Sharpmake.NvShield/Properties/AssemblyInfo.cs b/Sharpmake.Platforms/Sharpmake.NvShield/Properties/AssemblyInfo.cs
@@ -44,6 +44,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.14.3.0")]
+[assembly: AssemblyVersion("0.14.4.0")]
 
 [assembly: SharpmakeExtension]
diff --git a/Sharpmake.Platforms/Sharpmake.X360/Properties/AssemblyInfo.cs b/Sharpmake.Platforms/Sharpmake.X360/Properties/AssemblyInfo.cs
@@ -44,6 +44,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.14.3.0")]
+[assembly: AssemblyVersion("0.14.4.0")]
 
 [assembly: SharpmakeExtension]
diff --git a/Sharpmake/Options.CSharp.cs b/Sharpmake/Options.CSharp.cs
@@ -331,6 +331,11 @@ public class CopyVsixExtensionLocation : StringOption
                 public CopyVsixExtensionLocation(string location) : base(location) { }
             }
 
+            public class ProductVersion : StringOption
+            {
+                public ProductVersion(string versionString) : base(versionString) { }
+            }
+
             public enum MapFileExtensions
             {
                 Enabled,
diff --git a/Sharpmake/Properties/AssemblyInfo.cs b/Sharpmake/Properties/AssemblyInfo.cs
@@ -44,9 +44,9 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.14.3.0")]
+[assembly: AssemblyVersion("0.14.4.0")]
 #pragma warning disable CS7035
-[assembly: AssemblyFileVersion("0.14.3.0 (LocalBuild)")]
+[assembly: AssemblyFileVersion("0.14.4.0 (LocalBuild)")]
 #pragma warning restore
 
 [assembly: InternalsVisibleTo("Sharpmake.Application")]

Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,11 @@ public class CopyVsixExtensionLocation : StringOption`
`331`	`331`	`public CopyVsixExtensionLocation(string location) : base(location) { }`
`332`	`332`	`}`
`333`	`333`
	`334`	`+ public class ProductVersion : StringOption`
	`335`	`+ {`
	`336`	`+ public ProductVersion(string versionString) : base(versionString) { }`
	`337`	`+ }`
	`338`	`+`
`334`	`339`	`public enum MapFileExtensions`
`335`	`340`	`{`
`336`	`341`	`Enabled,`