Merge branch 'release-0.17.0'

ubisoft · Jul 20, 2021 · 5354c1a · 5354c1a
2 parents e2c14dc + 339b3fd
commit 5354c1a
Show file tree

Hide file tree

Showing 308 changed files with 5,375 additions and 4,509 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+---
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Maintain NuGet dependencies in sharpmake's csproj
+  # not ideal because the versions are in the .sharpmake.cs
+  # but at least we'll get notified
+  - package-ecosystem: "nuget"
+    directory: "/Sharpmake"
+    schedule:
+      interval: daily
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
diff --git a/CompileSharpmake.bat b/CompileSharpmake.bat
@@ -7,12 +7,6 @@
 
 setlocal enabledelayedexpansion
 
-:: Clear previous run status
-COLOR
-
-: set batch file directory as current
-pushd "%~dp0"
-
 set VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 if not exist %VSWHERE% (
     echo ERROR: Cannot determine the location of the vswhere command Common Tools folder.
@@ -36,7 +30,7 @@ call !VSMSBUILDCMD!
 if %errorlevel% NEQ 0 goto error
 
 if "%~1" == "" (
-    call :BuildSharpmake "Sharpmake.sln" "Debug" "Any CPU"
+    call :BuildSharpmake "%~dp0Sharpmake.sln" "Debug" "Any CPU"
 ) else (
     call :BuildSharpmake %1 %2 %3
 )
@@ -50,7 +44,7 @@ goto success
 :BuildSharpmake
 echo Compiling %~1 in "%~2|%~3"...
 
-set MSBUILD_CMD=msbuild -t:build -restore "%~1" /nologo /verbosity:m /p:Configuration="%~2" /p:Platform="%~3"
+set MSBUILD_CMD=msbuild -clp:Summary -t:rebuild -restore "%~1" /nologo /verbosity:m /p:Configuration="%~2" /p:Platform="%~3"
 echo %MSBUILD_CMD%
 %MSBUILD_CMD%
 set ERROR_CODE=%errorlevel%
@@ -62,18 +56,14 @@ goto success
 
 @REM -----------------------------------------------------------------------
 :success
-COLOR 2F
 set ERROR_CODE=0
 goto end
 
 @REM -----------------------------------------------------------------------
 :error
-COLOR 4F
 set ERROR_CODE=1
 goto end
 
 @REM -----------------------------------------------------------------------
 :end
-:: restore caller current directory
-popd
 exit /b %ERROR_CODE%
diff --git a/Sharpmake.Application/Program.cs b/Sharpmake.Application/Program.cs
@@ -59,19 +59,19 @@ public static void LogWrite(string format, params object[] args)
 
         public static void LogWrite(string message)
         {
-            string prefix = String.Empty;
+            string prefix = string.Empty;
 
             if (DebugEnable)
             {
                 TimeSpan span = DateTime.Now - s_startTime;
-                prefix = String.Format("[{0:00}:{1:00}] ", span.Minutes, span.Seconds);
+                prefix = string.Format("[{0:00}:{1:00}] ", span.Minutes, span.Seconds);
                 message = prefix + message;
             }
 
             Console.Write(message);
             if (Debugger.IsAttached)
             {
-                message = message.Replace(prefix + Util.CallerInfoTag, String.Empty);
+                message = message.Replace(prefix + Util.CallerInfoTag, string.Empty);
                 Trace.Write(message);
             }
         }
@@ -97,7 +97,7 @@ public static void DebugWrite(string message)
             {
                 TimeSpan span = DateTime.Now - s_startTime;
 
-                string prefix = String.Format("[{0:00}:{1:00}] ", span.Minutes, span.Seconds);
+                string prefix = string.Format("[{0:00}:{1:00}] ", span.Minutes, span.Seconds);
                 message = prefix + message;
 
                 Console.Write(message);
@@ -169,7 +169,18 @@ private static int Main()
         {
             if (CommandLine.ContainParameter("breakintodebugger"))
             {
-                System.Windows.Forms.MessageBox.Show("Debugger requested. Please attach a debugger and press OK");
+                if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+                {
+                    System.Windows.Forms.MessageBox.Show("Debugger requested. Please attach a debugger and press OK");
+                }
+                else
+                {
+                    Console.WriteLine("Debugger requested. Please attach a debugger and press ENTER to continue");
+                    while (Console.ReadKey(true).Key != ConsoleKey.Enter)
+                    {
+                        Console.WriteLine("Press ENTER to continue");
+                    }
+                }
                 Debugger.Break();
             }
             // This GC gives a little bit better results than the other ones. "LowLatency" is giving really bad results(twice slower than the other ones).
@@ -675,7 +686,7 @@ private static void RecursivePrintMethodInfo(Analyzer.ConfigureMethodInfo method
             ++nested;
             foreach (var dependent in method.Dependents.OrderBy(x => x.Method.ToString()))
             {
-                set.Add(String.Format("[{0}]->[{1}]", dependent, method));
+                set.Add(string.Format("[{0}]->[{1}]", dependent, method));
 
                 if (dependent.Dependents.Any())
                     RecursivePrintMethodInfo(dependent, set, nested);

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.16.1.0")]
+[assembly: AssemblyVersion("0.17.0.0")]
diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/FastBuildFunctionalTest.sharpmake.cs b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/FastBuildFunctionalTest.sharpmake.cs
@@ -543,6 +543,8 @@ public static void SharpmakeMain(Sharpmake.Arguments arguments)
             FastBuildSettings.FastBuildWait = true;
             FastBuildSettings.WriteAllConfigsSection = true;
 
+            KitsRootPaths.SetUseKitsRootForDevEnv(DevEnv.vs2019, KitsRootEnum.KitsRoot10, Options.Vc.General.WindowsTargetPlatformVersion.v10_0_19041_0);
+
             Bff.UnityResolver = new Bff.FragmentUnityResolver();
 
             arguments.Generate<FastBuildFunctionalTestSolution>();

diff --git a/...astBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff b/...astBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff
@@ -28,12 +28,12 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_
     .CompilerExtraOptions   = ''
             // General options
             // ---------------------------
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\include"'
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\atlmfc\include"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\um"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\shared"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\winrt"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\ucrt"'
+            + ' /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)\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"'
+            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt"'
             + ' /Zi'
             + ' /nologo'
             + ' /W4'
@@ -109,10 +109,10 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_
                             // ---------------------------
                             + ' /INCREMENTAL:NO'
                             + ' /NOLOGO'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\atlmfc\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\ucrt\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\x64"'
+                            + ' /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)\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
                             // ---------------------------
                             + ' "kernel32.lib"'
@@ -206,6 +206,13 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64' )
 }
 
 
+//=================================================================================================================
+Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_LibraryDependency' )
+{
+    .Targets = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable'
+}
+
+
 //=================================================================================================================
 ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_objects' )
 {
@@ -215,12 +222,12 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win6
     .CompilerExtraOptions   = ''
             // General options
             // ---------------------------
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\include"'
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\atlmfc\include"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\um"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\shared"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\winrt"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\ucrt"'
+            + ' /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)\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"'
+            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt"'
             + ' /Zi'
             + ' /nologo'
             + ' /W4'
@@ -297,10 +304,10 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win6
                             // ---------------------------
                             + ' /INCREMENTAL:NO'
                             + ' /NOLOGO'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\atlmfc\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\ucrt\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\x64"'
+                            + ' /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)\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
                             // ---------------------------
                             + ' "kernel32.lib"'
@@ -394,6 +401,13 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64' )
 }
 
 
+//=================================================================================================================
+Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_LibraryDependency' )
+{
+    .Targets = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_Executable'
+}
+
+
 //=================================================================================================================
 ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects' )
 {
@@ -403,12 +417,12 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects
     .CompilerExtraOptions   = ''
             // General options
             // ---------------------------
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\include"'
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\atlmfc\include"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\um"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\shared"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\winrt"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\ucrt"'
+            + ' /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)\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"'
+            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt"'
             + ' /Zi'
             + ' /nologo'
             + ' /W4'
@@ -484,10 +498,10 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executa
                             // ---------------------------
                             + ' /INCREMENTAL:NO'
                             + ' /NOLOGO'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\atlmfc\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\ucrt\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\x64"'
+                            + ' /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)\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
                             // ---------------------------
                             + ' "kernel32.lib"'
@@ -581,6 +595,13 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64' )
 }
 
 
+//=================================================================================================================
+Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_LibraryDependency' )
+{
+    .Targets = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executable'
+}
+
+
 //=================================================================================================================
 ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objects' )
 {
@@ -590,12 +611,12 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objec
     .CompilerExtraOptions   = ''
             // General options
             // ---------------------------
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\include"'
-            + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\atlmfc\include"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\um"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\shared"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\winrt"'
-            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\ucrt"'
+            + ' /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)\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"'
+            + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt"'
             + ' /Zi'
             + ' /nologo'
             + ' /W4'
@@ -672,10 +693,10 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Execu
                             // ---------------------------
                             + ' /INCREMENTAL:NO'
                             + ' /NOLOGO'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\atlmfc\lib\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\ucrt\x64"'
-                            + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\x64"'
+                            + ' /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)\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
                             // ---------------------------
                             + ' "kernel32.lib"'
@@ -769,5 +790,12 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64' )
 }
 
 
+//=================================================================================================================
+Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_LibraryDependency' )
+{
+    .Targets = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Executable'
+}
+
+
 #endif // WIN64
 ////////////////////////////////////////////////////////////////////////////////