Merge branch 'release-0.17.3'

ubisoft · Sep 28, 2021 · b8ff3d1 · b8ff3d1
2 parents cc0ff32 + 5532db0
commit b8ff3d1
Show file tree

Hide file tree

Showing 32 changed files with 289 additions and 1,240 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.17.2.0")]
+[assembly: AssemblyVersion("0.17.3.0")]
diff --git a/...astBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff b/...astBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff
@@ -26,10 +26,8 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\'
 
     .CompilerExtraOptions   = ''
-            // General options
-            // ---------------------------
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"'
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"'
+            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"'
+            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"'
@@ -38,45 +36,27 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_
             + ' /nologo'
             + ' /W4'
             + ' /WX-'
-            // Multi-threaded build is already handled by FASTBuild
-            // + ' /MP'
-            // Preprocessor options
-            // ---------------------------
             + ' /D"WIN64"'
             + ' /D"_CONSOLE"'
             + ' /D"_DEBUG"'
-            // Code Generation options
-            // ---------------------------
             + ' /GF'
             + ' /MTd'
             + ' /GS'
             + ' /Gy-'
             + ' /fp:fast'
             + ' /fp:except-'
-            // Language options
-            // ---------------------------
             + ' /Zc:wchar_t'
             + ' /Zc:forScope'
             + ' /Zc:inline'
             + ' /GR-'
             + ' /openmp-'
-            // Output Files options
-            // ---------------------------
             + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"'
-            // Advanced options
-            // ---------------------------
             + ' /Gd'
             + ' /TP'
             + ' /errorReport:queue'
-            // Character Set
-            // ---------------------------
             + ' /D"_MBCS"'
-            // Additional compiler options
-            //--------------------------
             + ' /FS /Zc:__cplusplus'
 
-    // Optimizations options
-    // ---------------------
     .CompilerOptimizations = ''
             + ' /Od'
             + ' /Ob1'
@@ -109,8 +89,8 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_
                             // ---------------------------
                             + ' /INCREMENTAL:NO'
                             + ' /NOLOGO'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"'
+                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"'
+                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"'
                             + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"'
                             + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"'
                             // Input
@@ -220,10 +200,8 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win6
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\'
 
     .CompilerExtraOptions   = ''
-            // General options
-            // ---------------------------
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"'
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"'
+            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"'
+            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"'
@@ -232,45 +210,27 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win6
             + ' /nologo'
             + ' /W4'
             + ' /WX-'
-            // Multi-threaded build is already handled by FASTBuild
-            // + ' /MP'
-            // Preprocessor options
-            // ---------------------------
             + ' /D"NDEBUG"'
             + ' /D"WIN64"'
             + ' /D"_CONSOLE"'
-            // Code Generation options
-            // ---------------------------
             + ' /GF'
             + ' /MT'
             + ' /GS-'
             + ' /Gy'
             + ' /fp:fast'
             + ' /fp:except-'
-            // Language options
-            // ---------------------------
             + ' /Zc:wchar_t'
             + ' /Zc:forScope'
             + ' /Zc:inline'
             + ' /GR-'
             + ' /openmp-'
-            // Output Files options
-            // ---------------------------
             + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"'
-            // Advanced options
-            // ---------------------------
             + ' /Gd'
             + ' /TP'
             + ' /errorReport:queue'
-            // Character Set
-            // ---------------------------
             + ' /D"_MBCS"'
-            // Additional compiler options
-            //--------------------------
             + ' /FS /Zc:__cplusplus'
 
-    // Optimizations options
-    // ---------------------
     .CompilerOptimizations = ''
             + ' /Ox'
             + ' /Ob2'
@@ -304,8 +264,8 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win6
                             // ---------------------------
                             + ' /INCREMENTAL:NO'
                             + ' /NOLOGO'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"'
+                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"'
+                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"'
                             + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"'
                             + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"'
                             // Input
@@ -415,10 +375,8 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\'
 
     .CompilerExtraOptions   = ''
-            // General options
-            // ---------------------------
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"'
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"'
+            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"'
+            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"'
@@ -427,45 +385,27 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects
             + ' /nologo'
             + ' /W4'
             + ' /WX-'
-            // Multi-threaded build is already handled by FASTBuild
-            // + ' /MP'
-            // Preprocessor options
-            // ---------------------------
             + ' /D"WIN64"'
             + ' /D"_CONSOLE"'
             + ' /D"_DEBUG"'
-            // Code Generation options
-            // ---------------------------
             + ' /GF'
             + ' /MTd'
             + ' /GS'
             + ' /Gy-'
             + ' /fp:fast'
             + ' /fp:except-'
-            // Language options
-            // ---------------------------
             + ' /Zc:wchar_t'
             + ' /Zc:forScope'
             + ' /Zc:inline'
             + ' /GR-'
             + ' /openmp-'
-            // Output Files options
-            // ---------------------------
             + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"'
-            // Advanced options
-            // ---------------------------
             + ' /Gd'
             + ' /TP'
             + ' /errorReport:queue'
-            // Character Set
-            // ---------------------------
             + ' /D"_MBCS"'
-            // Additional compiler options
-            //--------------------------
             + ' /FS /Zc:__cplusplus'
 
-    // Optimizations options
-    // ---------------------
     .CompilerOptimizations = ''
             + ' /Od'
             + ' /Ob1'
@@ -498,8 +438,8 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executa
                             // ---------------------------
                             + ' /INCREMENTAL:NO'
                             + ' /NOLOGO'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"'
+                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"'
+                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"'
                             + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"'
                             + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"'
                             // Input
@@ -609,10 +549,8 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objec
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\'
 
     .CompilerExtraOptions   = ''
-            // General options
-            // ---------------------------
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"'
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"'
+            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"'
+            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"'
             + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"'
@@ -621,45 +559,27 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objec
             + ' /nologo'
             + ' /W4'
             + ' /WX-'
-            // Multi-threaded build is already handled by FASTBuild
-            // + ' /MP'
-            // Preprocessor options
-            // ---------------------------
             + ' /D"NDEBUG"'
             + ' /D"WIN64"'
             + ' /D"_CONSOLE"'
-            // Code Generation options
-            // ---------------------------
             + ' /GF'
             + ' /MT'
             + ' /GS-'
             + ' /Gy'
             + ' /fp:fast'
             + ' /fp:except-'
-            // Language options
-            // ---------------------------
             + ' /Zc:wchar_t'
             + ' /Zc:forScope'
             + ' /Zc:inline'
             + ' /GR-'
             + ' /openmp-'
-            // Output Files options
-            // ---------------------------
             + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"'
-            // Advanced options
-            // ---------------------------
             + ' /Gd'
             + ' /TP'
             + ' /errorReport:queue'
-            // Character Set
-            // ---------------------------
             + ' /D"_MBCS"'
-            // Additional compiler options
-            //--------------------------
             + ' /FS /Zc:__cplusplus'
 
-    // Optimizations options
-    // ---------------------
     .CompilerOptimizations = ''
             + ' /Ox'
             + ' /Ob2'
@@ -693,8 +613,8 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Execu
                             // ---------------------------
                             + ' /INCREMENTAL:NO'
                             + ' /NOLOGO'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"'
+                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"'
+                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"'
                             + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"'
                             + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"'
                             // Input

diff --git a/...sts/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff b/...sts/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff
@@ -27,7 +27,7 @@ Settings
 //=================================================================================================================
 Compiler( 'Compiler-x64-vs2019' )
 {
-    .ExecutableRootPath     = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\HostX64\x64'
+    .ExecutableRootPath     = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64'
     .Executable             = '$ExecutableRootPath$\cl.exe'
     .ExtraFiles             = {
                                 '$ExecutableRootPath$\1033\clui.dll',
@@ -100,8 +100,8 @@ Compiler( 'RC.win64Config' )
 
 .win64Config =
 [
-    .BinPath                = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64'
-    .LinkerPath             = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64'
+    .BinPath                = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64'
+    .LinkerPath             = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64'
     .ResourceCompiler       = 'RC.win64Config'
     .Compiler               = 'Compiler-x64-vs2019'
     .Librarian              = '$LinkerPath$\lib.exe'
@@ -110,7 +110,7 @@ Compiler( 'RC.win64Config' )
 
 Compiler( 'ML.win64ConfigMasm' )
 {
-    .Executable             = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64\ml64.exe'
+    .Executable             = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\ml64.exe'
     .CompilerFamily         = 'custom'
 }