Merge branch 'hotfix-0.13.3'

ubisoft · May 20, 2020 · 126bc99 · 126bc99
2 parents 22b37c8 + b563c70
commit 126bc99
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
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.13.2.0")]
+[assembly: AssemblyVersion("0.13.3.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.13.2.0")]
+[assembly: AssemblyVersion("0.13.3.0")]
 
 [assembly: InternalsVisibleTo("Sharpmake")]
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.13.2.0")]
+[assembly: AssemblyVersion("0.13.3.0")]
 
 [assembly: SharpmakeExtension]
diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/Win64Platform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/Win64Platform.cs
@@ -437,6 +437,7 @@ public override void GeneratePlatformSpecificProjectDescription(IVcxprojGenerati
                 {
                     switch (devEnv)
                     {
+                        case DevEnv.vs2015:
                         case DevEnv.vs2017:
                             {
                                 string platformFolder = MSBuildGlobalSettings.GetCppPlatformFolder(context.DevelopmentEnvironmentsRange.MinDevEnv, Platform.win64);
@@ -464,8 +465,6 @@ public override void GeneratePlatformSpecificProjectDescription(IVcxprojGenerati
                                 }
                             }
                             break;
-                        default:
-                            throw new Error(devEnv + " is not supported.");
                     }
                 }
 

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.13.2.0")]
+[assembly: AssemblyVersion("0.13.3.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.13.2.0")]
+[assembly: AssemblyVersion("0.13.3.0")]
 
 [assembly: SharpmakeExtension]
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.13.2.0")]
+[assembly: AssemblyVersion("0.13.3.0")]
 #pragma warning disable CS7035
-[assembly: AssemblyFileVersion("0.13.2.0 (LocalBuild)")]
+[assembly: AssemblyFileVersion("0.13.3.0 (LocalBuild)")]
 #pragma warning restore
 
 [assembly: InternalsVisibleTo("Sharpmake.Application")]