diff --git a/Sharpmake.Application/Properties/AssemblyInfo.cs b/Sharpmake.Application/Properties/AssemblyInfo.cs index 0e2e69e56..95a9cc0be 100644 --- 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 index 8beea41e5..2a68fe1cb 100644 --- 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 index ce7a33f3a..68e11e783 100644 --- 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 [GeneratedAssemblyConfigTemplate.GenerateAssemblyVersionAttribute] [GeneratedAssemblyConfigTemplate.GenerateAssemblyInformationalVersionAttribute] [NugetRestoreProjectStyleString] + [options.ProductVersion] "; diff --git a/Sharpmake.Generators/VisualStudio/Csproj.cs b/Sharpmake.Generators/VisualStudio/Csproj.cs index 45742075b..0e6813bab 100644 --- 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(conf); options["ManifestCertificateThumbprint"] = Options.StringOption.Get(conf); options["CopyVsixExtensionLocation"] = Options.StringOption.Get(conf); + options["ProductVersion"] = Options.StringOption.Get(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 index d176b7f3c..4a0d719e5 100644 --- 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 index 25e40a3e8..3caf327a4 100644 --- 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 index 4236478c5..85e503197 100644 --- 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 index 6cf5db34f..89a598546 100644 --- 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 index 932eb19d8..1a86c2d88 100644 --- 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")]