From 869a2c61e2e90b5767384cd6928b3cf36bb025ff Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Tue, 2 Mar 2021 17:42:24 +0100 Subject: [PATCH] Update functional tests references following change 650bb8fa5da3769786db46b1f0a0c6604c40e231 --- ...itlyorderedpostbuildtest_vs2019_win64.bff} | 316 +++++++++--------- ...orderedpostbuildtest_vs2019_win64.vcxproj} | 225 +++++++------ ...ostbuildtest_vs2019_win64.vcxproj.filters} | 2 +- ...fastbuildfunctionaltest-globalsettings.bff | 17 +- .../projects/fastbuildfunctionaltest.bff | 32 +- .../projects/fastbuildfunctionaltest.sln | 248 +++++++------- .../projects/fastbuildfunctionaltest_all.bff | 88 ++--- .../fastbuildfunctionaltest_all.vcxproj | 58 ++-- ...n64.bff => mixcppandcexe_vs2019_win64.bff} | 264 +++++++-------- ...roj => mixcppandcexe_vs2019_win64.vcxproj} | 225 +++++++------ ...ixcppandcexe_vs2019_win64.vcxproj.filters} | 2 +- ... => postbuildcopydirtest_vs2019_win64.bff} | 212 ++++++------ ...postbuildcopydirtest_vs2019_win64.vcxproj} | 225 +++++++------ ...dcopydirtest_vs2019_win64.vcxproj.filters} | 2 +- ...tbuildcopysinglefiletest_vs2019_win64.bff} | 220 ++++++------ ...ldcopysinglefiletest_vs2019_win64.vcxproj} | 225 +++++++------ ...nglefiletest_vs2019_win64.vcxproj.filters} | 2 +- ... => postbuildexecutetest_vs2019_win64.bff} | 220 ++++++------ ...postbuildexecutetest_vs2019_win64.vcxproj} | 225 +++++++------ ...dexecutetest_vs2019_win64.vcxproj.filters} | 2 +- ...> postbuildtestexecution_vs2019_win64.bff} | 220 ++++++------ ...stbuildtestexecution_vs2019_win64.vcxproj} | 225 +++++++------ ...estexecution_vs2019_win64.vcxproj.filters} | 2 +- ...f => requireprebuildstep_vs2019_win64.bff} | 180 +++++----- ... requireprebuildstep_vs2019_win64.vcxproj} | 225 +++++++------ ...prebuildstep_vs2019_win64.vcxproj.filters} | 2 +- ...lesrcdirsfbnoblobexclude_vs2019_win64.bff} | 90 +++-- ...cdirsfbnoblobexclude_vs2019_win64.vcxproj} | 145 ++++---- ...oblobexclude_vs2019_win64.vcxproj.filters} | 2 +- ...lesrcdirsfbnoblobinclude_vs2019_win64.bff} | 90 +++-- ...cdirsfbnoblobinclude_vs2019_win64.vcxproj} | 145 ++++---- ...oblobinclude_vs2019_win64.vcxproj.filters} | 2 +- ...plesrcdirsfbunityexclude_vs2019_win64.bff} | 90 +++-- ...rcdirsfbunityexclude_vs2019_win64.vcxproj} | 86 ++--- ...plesrcdirsfbunityinclude_vs2019_win64.bff} | 90 +++-- ...rcdirsfbunityinclude_vs2019_win64.vcxproj} | 86 ++--- ...n64.bff => useprecompexe_vs2019_win64.bff} | 272 ++++++++------- ...roj => useprecompexe_vs2019_win64.vcxproj} | 265 ++++++++------- ...seprecompexe_vs2019_win64.vcxproj.filters} | 2 +- ...buildsimpleexecutable_vs2017_win64.vcxproj | 8 +- 40 files changed, 2492 insertions(+), 2545 deletions(-) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{explicitlyorderedpostbuildtest_vs2017_win64.bff => explicitlyorderedpostbuildtest_vs2019_win64.bff} (80%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{explicitlyorderedpostbuildtest_vs2017_win64.vcxproj => explicitlyorderedpostbuildtest_vs2019_win64.vcxproj} (67%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{explicitlyorderedpostbuildtest_vs2017_win64.vcxproj.filters => explicitlyorderedpostbuildtest_vs2019_win64.vcxproj.filters} (74%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{mixcppandcexe_vs2017_win64.bff => mixcppandcexe_vs2019_win64.bff} (85%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{mixcppandcexe_vs2017_win64.vcxproj => mixcppandcexe_vs2019_win64.vcxproj} (66%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{mixcppandcexe_vs2017_win64.vcxproj.filters => mixcppandcexe_vs2019_win64.vcxproj.filters} (83%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildcopydirtest_vs2017_win64.bff => postbuildcopydirtest_vs2019_win64.bff} (84%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildcopydirtest_vs2017_win64.vcxproj => postbuildcopydirtest_vs2019_win64.vcxproj} (66%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildcopydirtest_vs2017_win64.vcxproj.filters => postbuildcopydirtest_vs2019_win64.vcxproj.filters} (73%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildcopysinglefiletest_vs2017_win64.bff => postbuildcopysinglefiletest_vs2019_win64.bff} (84%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildcopysinglefiletest_vs2017_win64.vcxproj => postbuildcopysinglefiletest_vs2019_win64.vcxproj} (67%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildcopysinglefiletest_vs2017_win64.vcxproj.filters => postbuildcopysinglefiletest_vs2019_win64.vcxproj.filters} (74%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildexecutetest_vs2017_win64.bff => postbuildexecutetest_vs2019_win64.bff} (83%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildexecutetest_vs2017_win64.vcxproj => postbuildexecutetest_vs2019_win64.vcxproj} (66%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildexecutetest_vs2017_win64.vcxproj.filters => postbuildexecutetest_vs2019_win64.vcxproj.filters} (73%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildtestexecution_vs2017_win64.bff => postbuildtestexecution_vs2019_win64.bff} (83%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildtestexecution_vs2017_win64.vcxproj => postbuildtestexecution_vs2019_win64.vcxproj} (66%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{postbuildtestexecution_vs2017_win64.vcxproj.filters => postbuildtestexecution_vs2019_win64.vcxproj.filters} (73%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{requireprebuildstep_vs2017_win64.bff => requireprebuildstep_vs2019_win64.bff} (84%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{requireprebuildstep_vs2017_win64.vcxproj => requireprebuildstep_vs2019_win64.vcxproj} (67%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{requireprebuildstep_vs2017_win64.vcxproj.filters => requireprebuildstep_vs2019_win64.vcxproj.filters} (73%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.bff => spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.bff} (87%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.vcxproj => spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.vcxproj} (76%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.vcxproj.filters => spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.vcxproj.filters} (96%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.bff => spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.bff} (87%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.vcxproj => spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.vcxproj} (76%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.vcxproj.filters => spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.vcxproj.filters} (96%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{spanmultiplesrcdirsfbunityexclude_vs2017_win64.bff => spanmultiplesrcdirsfbunityexclude_vs2019_win64.bff} (87%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{spanmultiplesrcdirsfbunityexclude_vs2017_win64.vcxproj => spanmultiplesrcdirsfbunityexclude_vs2019_win64.vcxproj} (51%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{spanmultiplesrcdirsfbunityinclude_vs2017_win64.bff => spanmultiplesrcdirsfbunityinclude_vs2019_win64.bff} (87%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{spanmultiplesrcdirsfbunityinclude_vs2017_win64.vcxproj => spanmultiplesrcdirsfbunityinclude_vs2019_win64.vcxproj} (51%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{useprecompexe_vs2017_win64.bff => useprecompexe_vs2019_win64.bff} (86%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{useprecompexe_vs2017_win64.vcxproj => useprecompexe_vs2019_win64.vcxproj} (66%) rename Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/{useprecompexe_vs2017_win64.vcxproj.filters => useprecompexe_vs2019_win64.vcxproj.filters} (93%) diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff similarity index 80% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff index 14267fea2..1abbdf842 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff @@ -20,20 +20,20 @@ Unity( 'ExplicitlyOrderedPostBuildTest_FastBuildUnitys_unity' ) #if WIN64 //================================================================================================================= -ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -48,7 +48,6 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_ // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -63,7 +62,7 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_ + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -97,12 +96,12 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_ //================================================================================================================= -Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\' - .Libraries = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\' + .Libraries = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -110,10 +109,10 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_ // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -134,12 +133,12 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_ // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -164,64 +163,64 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_ //================================================================================================================= -Copy( 'Copy_21E34A2D' ) +Copy( 'Copy_CDABBD29' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.exe' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe' - .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe' + .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -Copy( 'Copy_BC977AE9' ) +Copy( 'Copy_6D45C9ED' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.pdb' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb' - .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.pdb' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb' + .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -CopyDir( 'Copy_2784F0C2' ) +CopyDir( 'Copy_043B3282' ) { - .SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\explicitly_ordered_postbuild_test\temp_copy\' + .SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\' .SourcePathsPattern = '*.*' .SourcePathsRecurse = true - .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\file_copy_destination\' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\file_copy_destination\' .PreBuildDependencies = { - 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable', - 'Copy_21E34A2D', - 'Copy_BC977AE9' + 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable', + 'Copy_CDABBD29', + 'Copy_6D45C9ED' } } //================================================================================================================= -Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable', - 'Copy_21E34A2D', - 'Copy_BC977AE9', - 'Copy_2784F0C2' + 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable', + 'Copy_CDABBD29', + 'Copy_6D45C9ED', + 'Copy_043B3282' } } //================================================================================================================= -ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -236,7 +235,6 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win6 // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -251,7 +249,7 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win6 + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -286,12 +284,12 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win6 //================================================================================================================= -Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\' - .Libraries = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\' + .Libraries = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -299,10 +297,10 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win6 // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -323,12 +321,12 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win6 // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -353,64 +351,64 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win6 //================================================================================================================= -Copy( 'Copy_2DCB92CD' ) +Copy( 'Copy_EBDB2349' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.exe' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe' - .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe' + .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -Copy( 'Copy_3BAA3409' ) +Copy( 'Copy_FF2A720D' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.pdb' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb' - .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.pdb' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb' + .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -CopyDir( 'Copy_6007A422' ) +CopyDir( 'Copy_81DF5222' ) { - .SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\explicitly_ordered_postbuild_test\temp_copy\' + .SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitly_ordered_postbuild_test\temp_copy\' .SourcePathsPattern = '*.*' .SourcePathsRecurse = true - .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\file_copy_destination\' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\file_copy_destination\' .PreBuildDependencies = { - 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64_Executable', - 'Copy_2DCB92CD', - 'Copy_3BAA3409' + 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_Executable', + 'Copy_EBDB2349', + 'Copy_FF2A720D' } } //================================================================================================================= -Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64_Executable', - 'Copy_2DCB92CD', - 'Copy_3BAA3409', - 'Copy_6007A422' + 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_Executable', + 'Copy_EBDB2349', + 'Copy_FF2A720D', + 'Copy_81DF5222' } } //================================================================================================================= -ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_objects' ) +ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -425,7 +423,6 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_objects // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -440,7 +437,7 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_objects + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -474,12 +471,12 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_objects //================================================================================================================= -Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_Executable' ) +Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest\' - .Libraries = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\' + .Libraries = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -487,10 +484,10 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_Executa // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -511,12 +508,12 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_Executa // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -541,64 +538,64 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_Executa //================================================================================================================= -Copy( 'Copy_82284415' ) +Copy( 'Copy_F64F55D5' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.exe' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe' - .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe' + .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -Copy( 'Copy_60A01E55' ) +Copy( 'Copy_D9CBE015' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb' - .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.pdb' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb' + .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -CopyDir( 'Copy_4F4A088A' ) +CopyDir( 'Copy_7A6FA5CA' ) { - .SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\explicitly_ordered_postbuild_test\temp_copy\' + .SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\' .SourcePathsPattern = '*.*' .SourcePathsRecurse = true - .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\file_copy_destination\' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\file_copy_destination\' .PreBuildDependencies = { - 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_Executable', - 'Copy_82284415', - 'Copy_60A01E55' + 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executable', + 'Copy_F64F55D5', + 'Copy_D9CBE015' } } //================================================================================================================= -Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64' ) +Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64' ) { .Targets = { - 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64_Executable', - 'Copy_82284415', - 'Copy_60A01E55', - 'Copy_4F4A088A' + 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executable', + 'Copy_F64F55D5', + 'Copy_D9CBE015', + 'Copy_7A6FA5CA' } } //================================================================================================================= -ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_objects' ) +ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\explicitlyorderedpostbuildtest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -613,7 +610,6 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_objec // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -628,7 +624,7 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_objec + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -663,12 +659,12 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_objec //================================================================================================================= -Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_Executable' ) +Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\explicitlyorderedpostbuildtest\' - .Libraries = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\' + .Libraries = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -676,10 +672,10 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_Execu // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -700,12 +696,12 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_Execu // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -730,45 +726,45 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_Execu //================================================================================================================= -Copy( 'Copy_B2476EF5' ) +Copy( 'Copy_A82D2B75' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.exe' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe' - .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.exe' + .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -Copy( 'Copy_FE930175' ) +Copy( 'Copy_F2DE4EF5' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb' - .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.pdb' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\explicitlyorderedpostbuildtest.pdb' + .PreBuildDependencies = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -CopyDir( 'Copy_4AFE99AA' ) +CopyDir( 'Copy_7608D0EA' ) { - .SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\explicitly_ordered_postbuild_test\temp_copy\' + .SourcePaths = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitly_ordered_postbuild_test\temp_copy\' .SourcePathsPattern = '*.*' .SourcePathsRecurse = true - .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\file_copy_destination\' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\file_copy_destination\' .PreBuildDependencies = { - 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_Executable', - 'Copy_B2476EF5', - 'Copy_FE930175' + 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Executable', + 'Copy_A82D2B75', + 'Copy_F2DE4EF5' } } //================================================================================================================= -Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64' ) +Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64' ) { .Targets = { - 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64_Executable', - 'Copy_B2476EF5', - 'Copy_FE930175', - 'Copy_4AFE99AA' + 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Executable', + 'Copy_A82D2B75', + 'Copy_F2DE4EF5', + 'Copy_7608D0EA' } } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.vcxproj similarity index 67% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.vcxproj index 61f6501e7..207be92be 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.vcxproj @@ -1,82 +1,82 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Debug_MSBuild_vs2017 + + Debug_MSBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 - - Release_MSBuild_vs2017 + + Release_MSBuild_vs2019 x64 - {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9} + {E965FD55-C022-64FC-AB1B-9C299D53E107} en-US ExplicitlyOrderedPostBuildTest ExplicitlyOrderedPostBuildTest - 10.0.10586.0 + 10.0.16299.0 - + Makefile true MultiByte false - v141 + v142 - + Makefile true MultiByte false - v141 + v142 - + Application true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Application false MultiByte false - v141 + v142 @@ -85,113 +85,113 @@ - - output\debug_fastbuild_noblob_vs2017\ - build\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\ + + output\debug_fastbuild_noblob_vs2019\ + build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\*.a" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.exe" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.elf" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.exp" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.ilk" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.pdb" >NUL 2>NUL - output\debug_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\*.a" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.elf" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exp" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.ilk" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.pdb" >NUL 2>NUL + output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe WIN64;_CONSOLE;_DEBUG explicitlyorderedpostbuildtest.exe - - output\debug_fastbuild_vs2017\ - build\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest\ + + output\debug_fastbuild_vs2019\ + build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest\*.a" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.exe" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.elf" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.exp" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.ilk" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb" >NUL 2>NUL - output\debug_fastbuild_vs2017\explicitlyorderedpostbuildtest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\*.a" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.elf" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.exp" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.ilk" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.pdb" >NUL 2>NUL + output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe WIN64;_CONSOLE;_DEBUG explicitlyorderedpostbuildtest.exe - + explicitlyorderedpostbuildtest - output\debug_msbuild_vs2017\ - build\debug_msbuild_vs2017\explicitlyorderedpostbuildtest\ + output\debug_msbuild_vs2019\ + build\debug_msbuild_vs2019\explicitlyorderedpostbuildtest\ .exe true false - output\debug_msbuild_vs2017\explicitlyorderedpostbuildtest.exe + output\debug_msbuild_vs2019\explicitlyorderedpostbuildtest.exe false false - - output\release_fastbuild_noblob_vs2017\ - build\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\ + + output\release_fastbuild_noblob_vs2019\ + build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\*.obj" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\*.a" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest\*.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.exe" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.elf" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.exp" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.ilk" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.pdb" >NUL 2>NUL - output\release_fastbuild_noblob_vs2017\explicitlyorderedpostbuildtest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\*.obj" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\*.a" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\*.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.elf" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exp" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.ilk" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.pdb" >NUL 2>NUL + output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe NDEBUG;WIN64;_CONSOLE explicitlyorderedpostbuildtest.exe - - output\release_fastbuild_vs2017\ - build\release_fastbuild_vs2017\explicitlyorderedpostbuildtest\ + + output\release_fastbuild_vs2019\ + build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_vs2017\explicitlyorderedpostbuildtest\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_vs2017\explicitlyorderedpostbuildtest\*.obj" >NUL 2>NUL -del "build\release_fastbuild_vs2017\explicitlyorderedpostbuildtest\*.a" >NUL 2>NUL -del "build\release_fastbuild_vs2017\explicitlyorderedpostbuildtest\*.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.exe" >NUL 2>NUL -del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.elf" >NUL 2>NUL -del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.exp" >NUL 2>NUL -del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.ilk" >NUL 2>NUL -del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb" >NUL 2>NUL - output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\*.obj" >NUL 2>NUL +del "build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\*.a" >NUL 2>NUL +del "build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\*.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe" >NUL 2>NUL +del "output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.elf" >NUL 2>NUL +del "output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.exp" >NUL 2>NUL +del "output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.ilk" >NUL 2>NUL +del "output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.pdb" >NUL 2>NUL + output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe NDEBUG;WIN64;_CONSOLE explicitlyorderedpostbuildtest.exe - + explicitlyorderedpostbuildtest - output\release_msbuild_vs2017\ - build\release_msbuild_vs2017\explicitlyorderedpostbuildtest\ + output\release_msbuild_vs2019\ + build\release_msbuild_vs2019\explicitlyorderedpostbuildtest\ .exe true false - output\release_msbuild_vs2017\explicitlyorderedpostbuildtest.exe + output\release_msbuild_vs2019\explicitlyorderedpostbuildtest.exe false false - + NotUsing Level4 @@ -237,16 +237,16 @@ del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb" >NUL 2> Cdecl Default /Zc:__cplusplus - build\debug_msbuild_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb + build\debug_msbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb MultiThreadedDebug Console true - output\debug_msbuild_vs2017\explicitlyorderedpostbuildtest.exe + output\debug_msbuild_vs2019\explicitlyorderedpostbuildtest.exe NotSet - build\debug_msbuild_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest - output\debug_msbuild_vs2017\explicitlyorderedpostbuildtest.pdb + build\debug_msbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest + output\debug_msbuild_vs2019\explicitlyorderedpostbuildtest.pdb true false false @@ -271,10 +271,10 @@ del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb" >NUL 2> false true - output\debug_msbuild_vs2017\explicitlyorderedpostbuildtest.map + output\debug_msbuild_vs2019\explicitlyorderedpostbuildtest.map - + NotUsing Level4 @@ -297,7 +297,6 @@ del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb" >NUL 2> false false true - false false false Default @@ -321,16 +320,16 @@ del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb" >NUL 2> Cdecl Default /Zc:__cplusplus - build\release_msbuild_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb + build\release_msbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb MultiThreaded Console true - output\release_msbuild_vs2017\explicitlyorderedpostbuildtest.exe + output\release_msbuild_vs2019\explicitlyorderedpostbuildtest.exe NotSet - build\release_msbuild_vs2017\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest - output\release_msbuild_vs2017\explicitlyorderedpostbuildtest.pdb + build\release_msbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest.intermediate.manifest + output\release_msbuild_vs2019\explicitlyorderedpostbuildtest.pdb true false false @@ -355,7 +354,7 @@ del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb" >NUL 2> false true - output\release_msbuild_vs2017\explicitlyorderedpostbuildtest.map + output\release_msbuild_vs2019\explicitlyorderedpostbuildtest.map @@ -364,7 +363,7 @@ del "output\release_fastbuild_vs2017\explicitlyorderedpostbuildtest.pdb" >NUL 2> - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2017_win64.vcxproj.filters b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.vcxproj.filters similarity index 74% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2017_win64.vcxproj.filters rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.vcxproj.filters index 70c6b5070..13a9dd01b 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2017_win64.vcxproj.filters +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.vcxproj.filters @@ -1,5 +1,5 @@  - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff index 16476d226..2ec819d36 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff @@ -24,9 +24,9 @@ Settings } //================================================================================================================= -Compiler( 'Compiler-x64-vs2017' ) +Compiler( 'Compiler-x64-vs2019' ) { - .ExecutableRootPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64' + .ExecutableRootPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\bin\HostX64\x64' .Executable = '$ExecutableRootPath$\cl.exe' .ExtraFiles = { '$ExecutableRootPath$\1033\clui.dll', @@ -40,9 +40,12 @@ Compiler( 'Compiler-x64-vs2017' ) '$ExecutableRootPath$\mspft140.dll', '$ExecutableRootPath$\msvcdis140.dll', '$ExecutableRootPath$\msvcp140.dll', + '$ExecutableRootPath$\msvcp140_atomic_wait.dll', '$ExecutableRootPath$\pgodb140.dll', + '$ExecutableRootPath$\tbbmalloc.dll', '$ExecutableRootPath$\vcruntime140.dll', - 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat', + '$ExecutableRootPath$\vcruntime140_1.dll', + 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat', 'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64\api-ms-win-core-console-l1-1-0.dll', 'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64\api-ms-win-core-datetime-l1-1-0.dll', 'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64\api-ms-win-core-debug-l1-1-0.dll', @@ -89,10 +92,10 @@ Compiler( 'Compiler-x64-vs2017' ) .win64Config = [ - .BinPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x64' - .LinkerPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x64' - .ResourceCompiler = 'C:\Program Files (x86)\Windows Kits\10\bin\x64\rc.exe' - .Compiler = 'Compiler-x64-vs2017' + .BinPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x64' + .LinkerPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x64' + .ResourceCompiler = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\rc.exe' + .Compiler = 'Compiler-x64-vs2019' .Librarian = '$LinkerPath$\lib.exe' .Linker = '$LinkerPath$\link.exe' ] diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.bff index b6e86209e..a27e2eea6 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.bff @@ -28,18 +28,18 @@ Exec( 'GenerateHeader' ) //================================================================================================================= // fastbuildfunctionaltest.bff .bff includes //================================================================================================================= -#include ".\explicitlyorderedpostbuildtest_vs2017_win64.bff" -#include ".\mixcppandcexe_vs2017_win64.bff" -#include ".\postbuildcopydirtest_vs2017_win64.bff" -#include ".\postbuildcopysinglefiletest_vs2017_win64.bff" -#include ".\postbuildexecutetest_vs2017_win64.bff" -#include ".\postbuildtestexecution_vs2017_win64.bff" -#include ".\requireprebuildstep_vs2017_win64.bff" -#include ".\spanmultiplesrcdirsfbunityexclude_vs2017_win64.bff" -#include ".\spanmultiplesrcdirsfbunityinclude_vs2017_win64.bff" -#include ".\useprecompexe_vs2017_win64.bff" -#include ".\spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.bff" -#include ".\spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.bff" +#include ".\explicitlyorderedpostbuildtest_vs2019_win64.bff" +#include ".\mixcppandcexe_vs2019_win64.bff" +#include ".\postbuildcopydirtest_vs2019_win64.bff" +#include ".\postbuildcopysinglefiletest_vs2019_win64.bff" +#include ".\postbuildexecutetest_vs2019_win64.bff" +#include ".\postbuildtestexecution_vs2019_win64.bff" +#include ".\requireprebuildstep_vs2019_win64.bff" +#include ".\spanmultiplesrcdirsfbunityexclude_vs2019_win64.bff" +#include ".\spanmultiplesrcdirsfbunityinclude_vs2019_win64.bff" +#include ".\useprecompexe_vs2019_win64.bff" +#include ".\spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.bff" +#include ".\spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.bff" #include ".\fastbuildfunctionaltest_all.bff" @@ -50,9 +50,9 @@ Alias( 'All-Configs' ) { .Targets = { - 'FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2017_win64', - 'FastBuildFunctionalTest_All_Debug_FastBuild_vs2017_win64', - 'FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2017_win64', - 'FastBuildFunctionalTest_All_Release_FastBuild_vs2017_win64' + 'FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2019_win64', + 'FastBuildFunctionalTest_All_Debug_FastBuild_vs2019_win64', + 'FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2019_win64', + 'FastBuildFunctionalTest_All_Release_FastBuild_vs2019_win64' } } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.sln b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.sln index ec20630ae..030125ee9 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.sln +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.sln @@ -1,50 +1,52 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29424.173 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FastBuild", "FastBuild", "{DD960562-8A51-64E6-3C0C-70331C285B31}" ProjectSection(SolutionItems) = preProject fastbuildfunctionaltest-globalsettings.bff = fastbuildfunctionaltest-globalsettings.bff fastbuildfunctionaltest.bff = fastbuildfunctionaltest.bff EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExplicitlyOrderedPostBuildTest", "explicitlyorderedpostbuildtest_vs2017_win64.vcxproj", "{77AE9D0E-D7D9-039E-9DB9-180932FD4AE9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExplicitlyOrderedPostBuildTest", "explicitlyorderedpostbuildtest_vs2019_win64.vcxproj", "{E965FD55-C022-64FC-AB1B-9C299D53E107}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FastBuildFunctionalTest_All", "fastbuildfunctionaltest_all.vcxproj", "{6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}" ProjectSection(ProjectDependencies) = postProject - {7D8A189A-C043-D9EA-2CD4-C5DA529D56F9} = {7D8A189A-C043-D9EA-2CD4-C5DA529D56F9} - {4CB12B72-2C37-A067-2236-AC7AA2926DE3} = {4CB12B72-2C37-A067-2236-AC7AA2926DE3} - {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9} = {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9} - {311CFA15-731D-A99E-EDE1-41AB713BBE48} = {311CFA15-731D-A99E-EDE1-41AB713BBE48} - {0E8AC270-BB93-42F0-4487-E85F2785FCF0} = {0E8AC270-BB93-42F0-4487-E85F2785FCF0} - {B0087514-0636-5209-BC43-4E8096928555} = {B0087514-0636-5209-BC43-4E8096928555} - {B1F3B803-C020-3A59-6346-D0E116BAAA74} = {B1F3B803-C020-3A59-6346-D0E116BAAA74} - {B7852638-591E-EE12-6928-76038779B42A} = {B7852638-591E-EE12-6928-76038779B42A} - {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB} = {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB} - {5A047CB1-D2C4-4765-6F6F-EDD60899737F} = {5A047CB1-D2C4-4765-6F6F-EDD60899737F} - {51338055-3ACC-BA7F-9658-06DC5B06394E} = {51338055-3ACC-BA7F-9658-06DC5B06394E} - {573CBFD5-C93E-15F6-9BFE-132BA37EAE47} = {573CBFD5-C93E-15F6-9BFE-132BA37EAE47} + {09B70182-6E14-896B-E2DF-B4874B8125B1} = {09B70182-6E14-896B-E2DF-B4874B8125B1} + {4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035} = {4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035} + {E965FD55-C022-64FC-AB1B-9C299D53E107} = {E965FD55-C022-64FC-AB1B-9C299D53E107} + {6644576B-DABD-B111-1BB5-47804F5CE2DC} = {6644576B-DABD-B111-1BB5-47804F5CE2DC} + {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E} = {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E} + {BC3341AC-FE51-B984-2CC3-805586205CBC} = {BC3341AC-FE51-B984-2CC3-805586205CBC} + {6C284AF9-4231-78AB-754D-A7143C2B81DD} = {6C284AF9-4231-78AB-754D-A7143C2B81DD} + {907F7CFF-3D45-EE04-7085-E9E2DB067942} = {907F7CFF-3D45-EE04-7085-E9E2DB067942} + {3B88798D-8E0B-330F-7C31-7F761D686B03} = {3B88798D-8E0B-330F-7C31-7F761D686B03} + {C987AAB6-A816-E538-96F5-B2B11C90C207} = {C987AAB6-A816-E538-96F5-B2B11C90C207} + {9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5} = {9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5} + {8DF6E677-91F0-4434-28CE-36FEC6B2B858} = {8DF6E677-91F0-4434-28CE-36FEC6B2B858} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MixCppAndCExe", "mixcppandcexe_vs2017_win64.vcxproj", "{5A047CB1-D2C4-4765-6F6F-EDD60899737F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MixCppAndCExe", "mixcppandcexe_vs2019_win64.vcxproj", "{C987AAB6-A816-E538-96F5-B2B11C90C207}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostBuildCopyDirTest", "postbuildcopydirtest_vs2017_win64.vcxproj", "{B0087514-0636-5209-BC43-4E8096928555}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostBuildCopyDirTest", "postbuildcopydirtest_vs2019_win64.vcxproj", "{BC3341AC-FE51-B984-2CC3-805586205CBC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostBuildCopySingleFileTest", "postbuildcopysinglefiletest_vs2017_win64.vcxproj", "{B1F3B803-C020-3A59-6346-D0E116BAAA74}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostBuildCopySingleFileTest", "postbuildcopysinglefiletest_vs2019_win64.vcxproj", "{6C284AF9-4231-78AB-754D-A7143C2B81DD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostBuildExecuteTest", "postbuildexecutetest_vs2017_win64.vcxproj", "{0E8AC270-BB93-42F0-4487-E85F2785FCF0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostBuildExecuteTest", "postbuildexecutetest_vs2019_win64.vcxproj", "{D4A0C206-AA95-4DD7-C15C-ACEF32DF514E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostBuildTestExecution", "postbuildtestexecution_vs2017_win64.vcxproj", "{311CFA15-731D-A99E-EDE1-41AB713BBE48}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostBuildTestExecution", "postbuildtestexecution_vs2019_win64.vcxproj", "{6644576B-DABD-B111-1BB5-47804F5CE2DC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequirePreBuildStep", "requireprebuildstep_vs2017_win64.vcxproj", "{B7852638-591E-EE12-6928-76038779B42A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequirePreBuildStep", "requireprebuildstep_vs2019_win64.vcxproj", "{907F7CFF-3D45-EE04-7085-E9E2DB067942}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpanMultipleSrcDirsFBNoBlobExclude", "spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.vcxproj", "{51338055-3ACC-BA7F-9658-06DC5B06394E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpanMultipleSrcDirsFBNoBlobExclude", "spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.vcxproj", "{9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpanMultipleSrcDirsFBNoBlobInclude", "spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.vcxproj", "{573CBFD5-C93E-15F6-9BFE-132BA37EAE47}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpanMultipleSrcDirsFBNoBlobInclude", "spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.vcxproj", "{8DF6E677-91F0-4434-28CE-36FEC6B2B858}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpanMultipleSrcDirsFBUnityExclude", "spanmultiplesrcdirsfbunityexclude_vs2017_win64.vcxproj", "{7D8A189A-C043-D9EA-2CD4-C5DA529D56F9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpanMultipleSrcDirsFBUnityExclude", "spanmultiplesrcdirsfbunityexclude_vs2019_win64.vcxproj", "{09B70182-6E14-896B-E2DF-B4874B8125B1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpanMultipleSrcDirsFBUnityInclude", "spanmultiplesrcdirsfbunityinclude_vs2017_win64.vcxproj", "{4CB12B72-2C37-A067-2236-AC7AA2926DE3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpanMultipleSrcDirsFBUnityInclude", "spanmultiplesrcdirsfbunityinclude_vs2019_win64.vcxproj", "{4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UsePrecompExe", "useprecompexe_vs2017_win64.vcxproj", "{099CE96F-04EC-E083-89C0-CE8DDBD8A1BB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UsePrecompExe", "useprecompexe_vs2019_win64.vcxproj", "{3B88798D-8E0B-330F-7C31-7F761D686B03}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -56,104 +58,104 @@ Global Release|MSBuild = Release|MSBuild EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2017|x64 - {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2017|x64 - {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2017|x64 - {77AE9D0E-D7D9-039E-9DB9-180932FD4AE9}.Release|MSBuild.Build.0 = Release_MSBuild_vs2017|x64 - {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Debug|FastBuild.Build.0 = Debug_FastBuild_vs2017|x64 - {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Debug|FastBuild_NoBlob.Build.0 = Debug_FastBuild_NoBlob_vs2017|x64 - {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Debug|MSBuild.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Release|FastBuild.Build.0 = Release_FastBuild_vs2017|x64 - {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Release|FastBuild_NoBlob.Build.0 = Release_FastBuild_NoBlob_vs2017|x64 - {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Release|MSBuild.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {5A047CB1-D2C4-4765-6F6F-EDD60899737F}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {5A047CB1-D2C4-4765-6F6F-EDD60899737F}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {5A047CB1-D2C4-4765-6F6F-EDD60899737F}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2017|x64 - {5A047CB1-D2C4-4765-6F6F-EDD60899737F}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2017|x64 - {5A047CB1-D2C4-4765-6F6F-EDD60899737F}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {5A047CB1-D2C4-4765-6F6F-EDD60899737F}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {5A047CB1-D2C4-4765-6F6F-EDD60899737F}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2017|x64 - {5A047CB1-D2C4-4765-6F6F-EDD60899737F}.Release|MSBuild.Build.0 = Release_MSBuild_vs2017|x64 - {B0087514-0636-5209-BC43-4E8096928555}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {B0087514-0636-5209-BC43-4E8096928555}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {B0087514-0636-5209-BC43-4E8096928555}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2017|x64 - {B0087514-0636-5209-BC43-4E8096928555}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2017|x64 - {B0087514-0636-5209-BC43-4E8096928555}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {B0087514-0636-5209-BC43-4E8096928555}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {B0087514-0636-5209-BC43-4E8096928555}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2017|x64 - {B0087514-0636-5209-BC43-4E8096928555}.Release|MSBuild.Build.0 = Release_MSBuild_vs2017|x64 - {B1F3B803-C020-3A59-6346-D0E116BAAA74}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {B1F3B803-C020-3A59-6346-D0E116BAAA74}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {B1F3B803-C020-3A59-6346-D0E116BAAA74}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2017|x64 - {B1F3B803-C020-3A59-6346-D0E116BAAA74}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2017|x64 - {B1F3B803-C020-3A59-6346-D0E116BAAA74}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {B1F3B803-C020-3A59-6346-D0E116BAAA74}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {B1F3B803-C020-3A59-6346-D0E116BAAA74}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2017|x64 - {B1F3B803-C020-3A59-6346-D0E116BAAA74}.Release|MSBuild.Build.0 = Release_MSBuild_vs2017|x64 - {0E8AC270-BB93-42F0-4487-E85F2785FCF0}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {0E8AC270-BB93-42F0-4487-E85F2785FCF0}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {0E8AC270-BB93-42F0-4487-E85F2785FCF0}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2017|x64 - {0E8AC270-BB93-42F0-4487-E85F2785FCF0}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2017|x64 - {0E8AC270-BB93-42F0-4487-E85F2785FCF0}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {0E8AC270-BB93-42F0-4487-E85F2785FCF0}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {0E8AC270-BB93-42F0-4487-E85F2785FCF0}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2017|x64 - {0E8AC270-BB93-42F0-4487-E85F2785FCF0}.Release|MSBuild.Build.0 = Release_MSBuild_vs2017|x64 - {311CFA15-731D-A99E-EDE1-41AB713BBE48}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {311CFA15-731D-A99E-EDE1-41AB713BBE48}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {311CFA15-731D-A99E-EDE1-41AB713BBE48}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2017|x64 - {311CFA15-731D-A99E-EDE1-41AB713BBE48}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2017|x64 - {311CFA15-731D-A99E-EDE1-41AB713BBE48}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {311CFA15-731D-A99E-EDE1-41AB713BBE48}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {311CFA15-731D-A99E-EDE1-41AB713BBE48}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2017|x64 - {311CFA15-731D-A99E-EDE1-41AB713BBE48}.Release|MSBuild.Build.0 = Release_MSBuild_vs2017|x64 - {B7852638-591E-EE12-6928-76038779B42A}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {B7852638-591E-EE12-6928-76038779B42A}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {B7852638-591E-EE12-6928-76038779B42A}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2017|x64 - {B7852638-591E-EE12-6928-76038779B42A}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2017|x64 - {B7852638-591E-EE12-6928-76038779B42A}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {B7852638-591E-EE12-6928-76038779B42A}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {B7852638-591E-EE12-6928-76038779B42A}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2017|x64 - {B7852638-591E-EE12-6928-76038779B42A}.Release|MSBuild.Build.0 = Release_MSBuild_vs2017|x64 - {51338055-3ACC-BA7F-9658-06DC5B06394E}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {51338055-3ACC-BA7F-9658-06DC5B06394E}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {51338055-3ACC-BA7F-9658-06DC5B06394E}.Debug|MSBuild.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {51338055-3ACC-BA7F-9658-06DC5B06394E}.Release|FastBuild.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {51338055-3ACC-BA7F-9658-06DC5B06394E}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {51338055-3ACC-BA7F-9658-06DC5B06394E}.Release|MSBuild.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {573CBFD5-C93E-15F6-9BFE-132BA37EAE47}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {573CBFD5-C93E-15F6-9BFE-132BA37EAE47}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {573CBFD5-C93E-15F6-9BFE-132BA37EAE47}.Debug|MSBuild.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {573CBFD5-C93E-15F6-9BFE-132BA37EAE47}.Release|FastBuild.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {573CBFD5-C93E-15F6-9BFE-132BA37EAE47}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {573CBFD5-C93E-15F6-9BFE-132BA37EAE47}.Release|MSBuild.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {7D8A189A-C043-D9EA-2CD4-C5DA529D56F9}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {7D8A189A-C043-D9EA-2CD4-C5DA529D56F9}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_vs2017|x64 - {7D8A189A-C043-D9EA-2CD4-C5DA529D56F9}.Debug|MSBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {7D8A189A-C043-D9EA-2CD4-C5DA529D56F9}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {7D8A189A-C043-D9EA-2CD4-C5DA529D56F9}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_vs2017|x64 - {7D8A189A-C043-D9EA-2CD4-C5DA529D56F9}.Release|MSBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {4CB12B72-2C37-A067-2236-AC7AA2926DE3}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {4CB12B72-2C37-A067-2236-AC7AA2926DE3}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_vs2017|x64 - {4CB12B72-2C37-A067-2236-AC7AA2926DE3}.Debug|MSBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {4CB12B72-2C37-A067-2236-AC7AA2926DE3}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {4CB12B72-2C37-A067-2236-AC7AA2926DE3}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_vs2017|x64 - {4CB12B72-2C37-A067-2236-AC7AA2926DE3}.Release|MSBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2017|x64 - {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2017|x64 - {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2017|x64 - {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2017|x64 - {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2017|x64 - {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2017|x64 - {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2017|x64 - {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB}.Release|MSBuild.Build.0 = Release_MSBuild_vs2017|x64 + {E965FD55-C022-64FC-AB1B-9C299D53E107}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {E965FD55-C022-64FC-AB1B-9C299D53E107}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {E965FD55-C022-64FC-AB1B-9C299D53E107}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2019|x64 + {E965FD55-C022-64FC-AB1B-9C299D53E107}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2019|x64 + {E965FD55-C022-64FC-AB1B-9C299D53E107}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {E965FD55-C022-64FC-AB1B-9C299D53E107}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {E965FD55-C022-64FC-AB1B-9C299D53E107}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2019|x64 + {E965FD55-C022-64FC-AB1B-9C299D53E107}.Release|MSBuild.Build.0 = Release_MSBuild_vs2019|x64 + {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Debug|FastBuild.Build.0 = Debug_FastBuild_vs2019|x64 + {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Debug|FastBuild_NoBlob.Build.0 = Debug_FastBuild_NoBlob_vs2019|x64 + {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Debug|MSBuild.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Release|FastBuild.Build.0 = Release_FastBuild_vs2019|x64 + {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Release|FastBuild_NoBlob.Build.0 = Release_FastBuild_NoBlob_vs2019|x64 + {6AE06EC2-B2C7-52F6-C657-FE1FFFA43666}.Release|MSBuild.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {C987AAB6-A816-E538-96F5-B2B11C90C207}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {C987AAB6-A816-E538-96F5-B2B11C90C207}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {C987AAB6-A816-E538-96F5-B2B11C90C207}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2019|x64 + {C987AAB6-A816-E538-96F5-B2B11C90C207}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2019|x64 + {C987AAB6-A816-E538-96F5-B2B11C90C207}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {C987AAB6-A816-E538-96F5-B2B11C90C207}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {C987AAB6-A816-E538-96F5-B2B11C90C207}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2019|x64 + {C987AAB6-A816-E538-96F5-B2B11C90C207}.Release|MSBuild.Build.0 = Release_MSBuild_vs2019|x64 + {BC3341AC-FE51-B984-2CC3-805586205CBC}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {BC3341AC-FE51-B984-2CC3-805586205CBC}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {BC3341AC-FE51-B984-2CC3-805586205CBC}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2019|x64 + {BC3341AC-FE51-B984-2CC3-805586205CBC}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2019|x64 + {BC3341AC-FE51-B984-2CC3-805586205CBC}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {BC3341AC-FE51-B984-2CC3-805586205CBC}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {BC3341AC-FE51-B984-2CC3-805586205CBC}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2019|x64 + {BC3341AC-FE51-B984-2CC3-805586205CBC}.Release|MSBuild.Build.0 = Release_MSBuild_vs2019|x64 + {6C284AF9-4231-78AB-754D-A7143C2B81DD}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {6C284AF9-4231-78AB-754D-A7143C2B81DD}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {6C284AF9-4231-78AB-754D-A7143C2B81DD}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2019|x64 + {6C284AF9-4231-78AB-754D-A7143C2B81DD}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2019|x64 + {6C284AF9-4231-78AB-754D-A7143C2B81DD}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {6C284AF9-4231-78AB-754D-A7143C2B81DD}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {6C284AF9-4231-78AB-754D-A7143C2B81DD}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2019|x64 + {6C284AF9-4231-78AB-754D-A7143C2B81DD}.Release|MSBuild.Build.0 = Release_MSBuild_vs2019|x64 + {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2019|x64 + {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2019|x64 + {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2019|x64 + {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E}.Release|MSBuild.Build.0 = Release_MSBuild_vs2019|x64 + {6644576B-DABD-B111-1BB5-47804F5CE2DC}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {6644576B-DABD-B111-1BB5-47804F5CE2DC}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {6644576B-DABD-B111-1BB5-47804F5CE2DC}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2019|x64 + {6644576B-DABD-B111-1BB5-47804F5CE2DC}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2019|x64 + {6644576B-DABD-B111-1BB5-47804F5CE2DC}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {6644576B-DABD-B111-1BB5-47804F5CE2DC}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {6644576B-DABD-B111-1BB5-47804F5CE2DC}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2019|x64 + {6644576B-DABD-B111-1BB5-47804F5CE2DC}.Release|MSBuild.Build.0 = Release_MSBuild_vs2019|x64 + {907F7CFF-3D45-EE04-7085-E9E2DB067942}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {907F7CFF-3D45-EE04-7085-E9E2DB067942}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {907F7CFF-3D45-EE04-7085-E9E2DB067942}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2019|x64 + {907F7CFF-3D45-EE04-7085-E9E2DB067942}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2019|x64 + {907F7CFF-3D45-EE04-7085-E9E2DB067942}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {907F7CFF-3D45-EE04-7085-E9E2DB067942}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {907F7CFF-3D45-EE04-7085-E9E2DB067942}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2019|x64 + {907F7CFF-3D45-EE04-7085-E9E2DB067942}.Release|MSBuild.Build.0 = Release_MSBuild_vs2019|x64 + {9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5}.Debug|MSBuild.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5}.Release|FastBuild.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5}.Release|MSBuild.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {8DF6E677-91F0-4434-28CE-36FEC6B2B858}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {8DF6E677-91F0-4434-28CE-36FEC6B2B858}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {8DF6E677-91F0-4434-28CE-36FEC6B2B858}.Debug|MSBuild.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {8DF6E677-91F0-4434-28CE-36FEC6B2B858}.Release|FastBuild.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {8DF6E677-91F0-4434-28CE-36FEC6B2B858}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {8DF6E677-91F0-4434-28CE-36FEC6B2B858}.Release|MSBuild.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {09B70182-6E14-896B-E2DF-B4874B8125B1}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {09B70182-6E14-896B-E2DF-B4874B8125B1}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_vs2019|x64 + {09B70182-6E14-896B-E2DF-B4874B8125B1}.Debug|MSBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {09B70182-6E14-896B-E2DF-B4874B8125B1}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {09B70182-6E14-896B-E2DF-B4874B8125B1}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_vs2019|x64 + {09B70182-6E14-896B-E2DF-B4874B8125B1}.Release|MSBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_vs2019|x64 + {4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035}.Debug|MSBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_vs2019|x64 + {4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035}.Release|MSBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {3B88798D-8E0B-330F-7C31-7F761D686B03}.Debug|FastBuild.ActiveCfg = Debug_FastBuild_vs2019|x64 + {3B88798D-8E0B-330F-7C31-7F761D686B03}.Debug|FastBuild_NoBlob.ActiveCfg = Debug_FastBuild_NoBlob_vs2019|x64 + {3B88798D-8E0B-330F-7C31-7F761D686B03}.Debug|MSBuild.ActiveCfg = Debug_MSBuild_vs2019|x64 + {3B88798D-8E0B-330F-7C31-7F761D686B03}.Debug|MSBuild.Build.0 = Debug_MSBuild_vs2019|x64 + {3B88798D-8E0B-330F-7C31-7F761D686B03}.Release|FastBuild.ActiveCfg = Release_FastBuild_vs2019|x64 + {3B88798D-8E0B-330F-7C31-7F761D686B03}.Release|FastBuild_NoBlob.ActiveCfg = Release_FastBuild_NoBlob_vs2019|x64 + {3B88798D-8E0B-330F-7C31-7F761D686B03}.Release|MSBuild.ActiveCfg = Release_MSBuild_vs2019|x64 + {3B88798D-8E0B-330F-7C31-7F761D686B03}.Release|MSBuild.Build.0 = Release_MSBuild_vs2019|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest_all.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest_all.bff index b17a0bfe6..a081dcbfb 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest_all.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest_all.bff @@ -10,73 +10,73 @@ #if WIN64 //================================================================================================================= -Alias( 'FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2017_win64', - 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64', - 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64', - 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64', - 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64', - 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64', - 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64', - 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_win64', - 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_win64', - 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64' + 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64', + 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64', + 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64', + 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64', + 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64', + 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64', + 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64', + 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_win64', + 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_win64', + 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64' } } //================================================================================================================= -Alias( 'FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2017_win64', - 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64', - 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64', - 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64', - 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64', - 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64', - 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64', - 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_win64', - 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_win64', - 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64' + 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64', + 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64', + 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64', + 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64', + 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64', + 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64', + 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64', + 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_win64', + 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_win64', + 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64' } } //================================================================================================================= -Alias( 'FastBuildFunctionalTest_All_Debug_FastBuild_vs2017_win64' ) +Alias( 'FastBuildFunctionalTest_All_Debug_FastBuild_vs2019_win64' ) { .Targets = { - 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2017_win64', - 'MixCppAndCExe_Debug_FastBuild_vs2017_win64', - 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64', - 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64', - 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64', - 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64', - 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64', - 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64', - 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64', - 'UsePrecompExe_Debug_FastBuild_vs2017_win64' + 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64', + 'MixCppAndCExe_Debug_FastBuild_vs2019_win64', + 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64', + 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64', + 'PostBuildExecuteTest_Debug_FastBuild_vs2019_win64', + 'PostBuildTestExecution_Debug_FastBuild_vs2019_win64', + 'RequirePreBuildStep_Debug_FastBuild_vs2019_win64', + 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64', + 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64', + 'UsePrecompExe_Debug_FastBuild_vs2019_win64' } } //================================================================================================================= -Alias( 'FastBuildFunctionalTest_All_Release_FastBuild_vs2017_win64' ) +Alias( 'FastBuildFunctionalTest_All_Release_FastBuild_vs2019_win64' ) { .Targets = { - 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2017_win64', - 'MixCppAndCExe_Release_FastBuild_vs2017_win64', - 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64', - 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64', - 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64', - 'PostBuildTestExecution_Release_FastBuild_vs2017_win64', - 'RequirePreBuildStep_Release_FastBuild_vs2017_win64', - 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64', - 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64', - 'UsePrecompExe_Release_FastBuild_vs2017_win64' + 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64', + 'MixCppAndCExe_Release_FastBuild_vs2019_win64', + 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64', + 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64', + 'PostBuildExecuteTest_Release_FastBuild_vs2019_win64', + 'PostBuildTestExecution_Release_FastBuild_vs2019_win64', + 'RequirePreBuildStep_Release_FastBuild_vs2019_win64', + 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64', + 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64', + 'UsePrecompExe_Release_FastBuild_vs2019_win64' } } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest_all.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest_all.vcxproj index 270dc64ca..5e24f6216 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest_all.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest_all.vcxproj @@ -1,20 +1,20 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 @@ -25,33 +25,33 @@ FastBuildFunctionalTest_All - + Makefile true MultiByte false - v141 + v142 - + Makefile true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 @@ -60,32 +60,32 @@ - + cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff WIN64;_DEBUG - + cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe FastBuildFunctionalTest_All_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe FastBuildFunctionalTest_All_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean FastBuildFunctionalTest_All_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean FastBuildFunctionalTest_All_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff WIN64;_DEBUG - + cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff NDEBUG;WIN64 - + cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe FastBuildFunctionalTest_All_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe FastBuildFunctionalTest_All_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean FastBuildFunctionalTest_All_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean FastBuildFunctionalTest_All_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff NDEBUG;WIN64 diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.bff similarity index 85% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.bff index 18da2d716..a32db7479 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.bff @@ -20,20 +20,20 @@ Unity( 'MixCppAndCExe_FastBuildUnitys_unity' ) #if WIN64 //================================================================================================================= -ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' ) +ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -48,7 +48,6 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -63,7 +62,7 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\mixcppandcexe\mixcppandcexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -97,20 +96,20 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' ) //================================================================================================================= -ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -125,7 +124,6 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -140,7 +138,7 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\mixcppandcexe\mixcppandcexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -174,15 +172,15 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\' .Libraries = { - 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects', - 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' + 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects', + 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_objects' } - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\mixcppandcexe.exe' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\mixcppandcexe.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -190,10 +188,10 @@ Executable( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -214,12 +212,12 @@ Executable( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\mixcppandcexe\mixcppandcexe.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\mixcppandcexe.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\mixcppandcexe.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\mixcppandcexe.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\mixcppandcexe.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\mixcppandcexe.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -244,27 +242,27 @@ Executable( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) //================================================================================================================= -Alias( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64' ) { - .Targets = 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .Targets = 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' ) +ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -279,7 +277,6 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -294,7 +291,7 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\mixcppandcexe\mixcppandcexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -329,20 +326,20 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' ) //================================================================================================================= -ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -357,7 +354,6 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -372,7 +368,7 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\mixcppandcexe\mixcppandcexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -407,15 +403,15 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\' .Libraries = { - 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects', - 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_objects' + 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects', + 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_objects' } - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\mixcppandcexe.exe' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\mixcppandcexe.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -423,10 +419,10 @@ Executable( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -447,12 +443,12 @@ Executable( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\mixcppandcexe\mixcppandcexe.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\mixcppandcexe.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\mixcppandcexe.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\mixcppandcexe.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\mixcppandcexe.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\mixcppandcexe.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -477,27 +473,27 @@ Executable( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) //================================================================================================================= -Alias( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64' ) { - .Targets = 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .Targets = 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_0_objects' ) +ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_0_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -512,7 +508,6 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_0_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -527,7 +522,7 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_0_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\mixcppandcexe\mixcppandcexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -561,20 +556,20 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_0_objects' ) //================================================================================================================= -ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_objects' ) +ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -589,7 +584,6 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -604,7 +598,7 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\mixcppandcexe\mixcppandcexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -638,15 +632,15 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_Executable' ) +Executable( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\' .Libraries = { - 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_0_objects', - 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_objects' + 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_0_objects', + 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_objects' } - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\mixcppandcexe.exe' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\mixcppandcexe.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -654,10 +648,10 @@ Executable( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -678,12 +672,12 @@ Executable( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\mixcppandcexe\mixcppandcexe.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\mixcppandcexe.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\mixcppandcexe.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\mixcppandcexe.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\mixcppandcexe.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\mixcppandcexe.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -708,27 +702,27 @@ Executable( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -Alias( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64' ) +Alias( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64' ) { - .Targets = 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_Executable' + .Targets = 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_0_objects' ) +ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_0_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -743,7 +737,6 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_0_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -758,7 +751,7 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_0_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\mixcppandcexe\mixcppandcexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -793,20 +786,20 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_0_objects' ) //================================================================================================================= -ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_objects' ) +ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -821,7 +814,6 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -836,7 +828,7 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\mixcppandcexe\mixcppandcexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -871,15 +863,15 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_Executable' ) +Executable( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\mixcppandcexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\' .Libraries = { - 'MixCppAndCExe_Release_FastBuild_vs2017_win64_0_objects', - 'MixCppAndCExe_Release_FastBuild_vs2017_win64_objects' + 'MixCppAndCExe_Release_FastBuild_vs2019_win64_0_objects', + 'MixCppAndCExe_Release_FastBuild_vs2019_win64_objects' } - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\mixcppandcexe.exe' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\mixcppandcexe.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -887,10 +879,10 @@ Executable( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -911,12 +903,12 @@ Executable( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\mixcppandcexe\mixcppandcexe.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\mixcppandcexe.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\mixcppandcexe.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\mixcppandcexe.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\mixcppandcexe.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\mixcppandcexe.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -941,9 +933,9 @@ Executable( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -Alias( 'MixCppAndCExe_Release_FastBuild_vs2017_win64' ) +Alias( 'MixCppAndCExe_Release_FastBuild_vs2019_win64' ) { - .Targets = 'MixCppAndCExe_Release_FastBuild_vs2017_win64_Executable' + .Targets = 'MixCppAndCExe_Release_FastBuild_vs2019_win64_Executable' } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.vcxproj similarity index 66% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.vcxproj index 2fa519e66..243c89265 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.vcxproj @@ -1,82 +1,82 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Debug_MSBuild_vs2017 + + Debug_MSBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 - - Release_MSBuild_vs2017 + + Release_MSBuild_vs2019 x64 - {5A047CB1-D2C4-4765-6F6F-EDD60899737F} + {C987AAB6-A816-E538-96F5-B2B11C90C207} en-US MixCppAndCExe MixCppAndCExe - 10.0.10586.0 + 10.0.16299.0 - + Makefile true MultiByte false - v141 + v142 - + Makefile true MultiByte false - v141 + v142 - + Application true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Application false MultiByte false - v141 + v142 @@ -85,113 +85,113 @@ - - output\debug_fastbuild_noblob_vs2017\ - build\debug_fastbuild_noblob_vs2017\mixcppandcexe\ + + output\debug_fastbuild_noblob_vs2019\ + build\debug_fastbuild_noblob_vs2019\mixcppandcexe\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_noblob_vs2017\mixcppandcexe\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\mixcppandcexe\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\mixcppandcexe\*.a" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\mixcppandcexe\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\mixcppandcexe.exe" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\mixcppandcexe.elf" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\mixcppandcexe.exp" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\mixcppandcexe.ilk" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\mixcppandcexe.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\mixcppandcexe.pdb" >NUL 2>NUL - output\debug_fastbuild_noblob_vs2017\mixcppandcexe.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_noblob_vs2019\mixcppandcexe\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\mixcppandcexe\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\mixcppandcexe\*.a" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\mixcppandcexe\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\mixcppandcexe.exe" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\mixcppandcexe.elf" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\mixcppandcexe.exp" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\mixcppandcexe.ilk" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\mixcppandcexe.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\mixcppandcexe.pdb" >NUL 2>NUL + output\debug_fastbuild_noblob_vs2019\mixcppandcexe.exe WIN64;_CONSOLE;_DEBUG mixcppandcexe.exe - - output\debug_fastbuild_vs2017\ - build\debug_fastbuild_vs2017\mixcppandcexe\ + + output\debug_fastbuild_vs2019\ + build\debug_fastbuild_vs2019\mixcppandcexe\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe MixCppAndCExe_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe MixCppAndCExe_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean MixCppAndCExe_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_vs2017\mixcppandcexe\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\mixcppandcexe\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\mixcppandcexe\*.a" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\mixcppandcexe\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\mixcppandcexe.exe" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\mixcppandcexe.elf" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\mixcppandcexe.exp" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\mixcppandcexe.ilk" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\mixcppandcexe.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\mixcppandcexe.pdb" >NUL 2>NUL - output\debug_fastbuild_vs2017\mixcppandcexe.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean MixCppAndCExe_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_vs2019\mixcppandcexe\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\mixcppandcexe\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\mixcppandcexe\*.a" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\mixcppandcexe\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\mixcppandcexe.exe" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\mixcppandcexe.elf" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\mixcppandcexe.exp" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\mixcppandcexe.ilk" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\mixcppandcexe.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\mixcppandcexe.pdb" >NUL 2>NUL + output\debug_fastbuild_vs2019\mixcppandcexe.exe WIN64;_CONSOLE;_DEBUG mixcppandcexe.exe - + mixcppandcexe - output\debug_msbuild_vs2017\ - build\debug_msbuild_vs2017\mixcppandcexe\ + output\debug_msbuild_vs2019\ + build\debug_msbuild_vs2019\mixcppandcexe\ .exe true false - output\debug_msbuild_vs2017\mixcppandcexe.exe + output\debug_msbuild_vs2019\mixcppandcexe.exe false false - - output\release_fastbuild_noblob_vs2017\ - build\release_fastbuild_noblob_vs2017\mixcppandcexe\ + + output\release_fastbuild_noblob_vs2019\ + build\release_fastbuild_noblob_vs2019\mixcppandcexe\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_noblob_vs2017\mixcppandcexe\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\mixcppandcexe\*.obj" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\mixcppandcexe\*.a" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\mixcppandcexe\*.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\mixcppandcexe.exe" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\mixcppandcexe.elf" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\mixcppandcexe.exp" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\mixcppandcexe.ilk" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\mixcppandcexe.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\mixcppandcexe.pdb" >NUL 2>NUL - output\release_fastbuild_noblob_vs2017\mixcppandcexe.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_noblob_vs2019\mixcppandcexe\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\mixcppandcexe\*.obj" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\mixcppandcexe\*.a" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\mixcppandcexe\*.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\mixcppandcexe.exe" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\mixcppandcexe.elf" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\mixcppandcexe.exp" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\mixcppandcexe.ilk" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\mixcppandcexe.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\mixcppandcexe.pdb" >NUL 2>NUL + output\release_fastbuild_noblob_vs2019\mixcppandcexe.exe NDEBUG;WIN64;_CONSOLE mixcppandcexe.exe - - output\release_fastbuild_vs2017\ - build\release_fastbuild_vs2017\mixcppandcexe\ + + output\release_fastbuild_vs2019\ + build\release_fastbuild_vs2019\mixcppandcexe\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe MixCppAndCExe_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe MixCppAndCExe_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean MixCppAndCExe_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_vs2017\mixcppandcexe\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_vs2017\mixcppandcexe\*.obj" >NUL 2>NUL -del "build\release_fastbuild_vs2017\mixcppandcexe\*.a" >NUL 2>NUL -del "build\release_fastbuild_vs2017\mixcppandcexe\*.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\mixcppandcexe.exe" >NUL 2>NUL -del "output\release_fastbuild_vs2017\mixcppandcexe.elf" >NUL 2>NUL -del "output\release_fastbuild_vs2017\mixcppandcexe.exp" >NUL 2>NUL -del "output\release_fastbuild_vs2017\mixcppandcexe.ilk" >NUL 2>NUL -del "output\release_fastbuild_vs2017\mixcppandcexe.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\mixcppandcexe.pdb" >NUL 2>NUL - output\release_fastbuild_vs2017\mixcppandcexe.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean MixCppAndCExe_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_vs2019\mixcppandcexe\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_vs2019\mixcppandcexe\*.obj" >NUL 2>NUL +del "build\release_fastbuild_vs2019\mixcppandcexe\*.a" >NUL 2>NUL +del "build\release_fastbuild_vs2019\mixcppandcexe\*.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\mixcppandcexe.exe" >NUL 2>NUL +del "output\release_fastbuild_vs2019\mixcppandcexe.elf" >NUL 2>NUL +del "output\release_fastbuild_vs2019\mixcppandcexe.exp" >NUL 2>NUL +del "output\release_fastbuild_vs2019\mixcppandcexe.ilk" >NUL 2>NUL +del "output\release_fastbuild_vs2019\mixcppandcexe.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\mixcppandcexe.pdb" >NUL 2>NUL + output\release_fastbuild_vs2019\mixcppandcexe.exe NDEBUG;WIN64;_CONSOLE mixcppandcexe.exe - + mixcppandcexe - output\release_msbuild_vs2017\ - build\release_msbuild_vs2017\mixcppandcexe\ + output\release_msbuild_vs2019\ + build\release_msbuild_vs2019\mixcppandcexe\ .exe true false - output\release_msbuild_vs2017\mixcppandcexe.exe + output\release_msbuild_vs2019\mixcppandcexe.exe false false - + NotUsing Level4 @@ -237,16 +237,16 @@ del "output\release_fastbuild_vs2017\mixcppandcexe.pdb" >NUL 2>NULCdecl Default /Zc:__cplusplus - build\debug_msbuild_vs2017\mixcppandcexe\mixcppandcexe_compiler.pdb + build\debug_msbuild_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb MultiThreadedDebug Console true - output\debug_msbuild_vs2017\mixcppandcexe.exe + output\debug_msbuild_vs2019\mixcppandcexe.exe NotSet - build\debug_msbuild_vs2017\mixcppandcexe\mixcppandcexe.intermediate.manifest - output\debug_msbuild_vs2017\mixcppandcexe.pdb + build\debug_msbuild_vs2019\mixcppandcexe\mixcppandcexe.intermediate.manifest + output\debug_msbuild_vs2019\mixcppandcexe.pdb true false false @@ -271,10 +271,10 @@ del "output\release_fastbuild_vs2017\mixcppandcexe.pdb" >NUL 2>NULfalse true - output\debug_msbuild_vs2017\mixcppandcexe.map + output\debug_msbuild_vs2019\mixcppandcexe.map - + NotUsing Level4 @@ -297,7 +297,6 @@ del "output\release_fastbuild_vs2017\mixcppandcexe.pdb" >NUL 2>NULfalse false true - false false false Default @@ -321,16 +320,16 @@ del "output\release_fastbuild_vs2017\mixcppandcexe.pdb" >NUL 2>NULCdecl Default /Zc:__cplusplus - build\release_msbuild_vs2017\mixcppandcexe\mixcppandcexe_compiler.pdb + build\release_msbuild_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb MultiThreaded Console true - output\release_msbuild_vs2017\mixcppandcexe.exe + output\release_msbuild_vs2019\mixcppandcexe.exe NotSet - build\release_msbuild_vs2017\mixcppandcexe\mixcppandcexe.intermediate.manifest - output\release_msbuild_vs2017\mixcppandcexe.pdb + build\release_msbuild_vs2019\mixcppandcexe\mixcppandcexe.intermediate.manifest + output\release_msbuild_vs2019\mixcppandcexe.pdb true false false @@ -355,7 +354,7 @@ del "output\release_fastbuild_vs2017\mixcppandcexe.pdb" >NUL 2>NULfalse true - output\release_msbuild_vs2017\mixcppandcexe.map + output\release_msbuild_vs2019\mixcppandcexe.map @@ -366,7 +365,7 @@ del "output\release_fastbuild_vs2017\mixcppandcexe.pdb" >NUL 2>NUL - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.vcxproj.filters b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.vcxproj.filters similarity index 83% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.vcxproj.filters rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.vcxproj.filters index 5269731ad..6feace649 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.vcxproj.filters +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.vcxproj.filters @@ -1,5 +1,5 @@  - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.bff similarity index 84% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.bff index 042f319d0..7c72f7524 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.bff @@ -20,20 +20,20 @@ Unity( 'PostBuildCopyDirTest_FastBuildUnitys_unity' ) #if WIN64 //================================================================================================================= -ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildcopydirtest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -48,7 +48,6 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -63,7 +62,7 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -97,12 +96,12 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildcopydirtest\' - .Libraries = 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildcopydirtest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\' + .Libraries = 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildcopydirtest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -110,10 +109,10 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -134,12 +133,12 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildcopydirtest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildcopydirtest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildcopydirtest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildcopydirtest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -164,40 +163,40 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable //================================================================================================================= -CopyDir( 'Copy_95F387B3' ) +CopyDir( 'Copy_0856A229' ) { .SourcePaths = '.\$_CURRENT_BFF_DIR_$\..\codebase\postbuildcopydirtest\' .SourcePathsPattern = { '*.cpp', '*.txt' } .SourcePathsRecurse = true - .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\file_copy_destination\' - .PreBuildDependencies = 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\file_copy_destination\' + .PreBuildDependencies = 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable', - 'Copy_95F387B3' + 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable', + 'Copy_0856A229' } } //================================================================================================================= -ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildcopydirtest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -212,7 +211,6 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects' // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -227,7 +225,7 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects' + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -262,12 +260,12 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects' //================================================================================================================= -Executable( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildcopydirtest\' - .Libraries = 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildcopydirtest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\' + .Libraries = 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildcopydirtest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -275,10 +273,10 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_Executab // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -299,12 +297,12 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_Executab // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildcopydirtest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildcopydirtest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildcopydirtest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildcopydirtest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -329,40 +327,40 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_Executab //================================================================================================================= -CopyDir( 'Copy_54B15627' ) +CopyDir( 'Copy_D0BF3DD9' ) { .SourcePaths = '.\$_CURRENT_BFF_DIR_$\..\codebase\postbuildcopydirtest\' .SourcePathsPattern = { '*.cpp', '*.txt' } .SourcePathsRecurse = true - .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\file_copy_destination\' - .PreBuildDependencies = 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\file_copy_destination\' + .PreBuildDependencies = 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_Executable', - 'Copy_54B15627' + 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64_Executable', + 'Copy_D0BF3DD9' } } //================================================================================================================= -ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' ) +ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildcopydirtest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopydirtest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -377,7 +375,6 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -392,7 +389,7 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -426,12 +423,12 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_Executable' ) +Executable( 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildcopydirtest\' - .Libraries = 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildcopydirtest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopydirtest\' + .Libraries = 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildcopydirtest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -439,10 +436,10 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -463,12 +460,12 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildcopydirtest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildcopydirtest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildcopydirtest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildcopydirtest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -493,40 +490,40 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -CopyDir( 'Copy_CF70E156' ) +CopyDir( 'Copy_FA589A94' ) { .SourcePaths = '.\$_CURRENT_BFF_DIR_$\..\codebase\postbuildcopydirtest\' .SourcePathsPattern = { '*.cpp', '*.txt' } .SourcePathsRecurse = true - .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\file_copy_destination\' - .PreBuildDependencies = 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_Executable' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\file_copy_destination\' + .PreBuildDependencies = 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64' ) +Alias( 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64' ) { .Targets = { - 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_Executable', - 'Copy_CF70E156' + 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64_Executable', + 'Copy_FA589A94' } } //================================================================================================================= -ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' ) +ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildcopydirtest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopydirtest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -541,7 +538,6 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -556,7 +552,7 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -591,12 +587,12 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_Executable' ) +Executable( 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildcopydirtest\' - .Libraries = 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildcopydirtest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopydirtest\' + .Libraries = 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildcopydirtest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -604,10 +600,10 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -628,12 +624,12 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildcopydirtest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildcopydirtest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildcopydirtest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildcopydirtest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -658,21 +654,21 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -CopyDir( 'Copy_C20D120C' ) +CopyDir( 'Copy_A1643CC6' ) { .SourcePaths = '.\$_CURRENT_BFF_DIR_$\..\codebase\postbuildcopydirtest\' .SourcePathsPattern = { '*.cpp', '*.txt' } .SourcePathsRecurse = true - .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\file_copy_destination\' - .PreBuildDependencies = 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_Executable' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\file_copy_destination\' + .PreBuildDependencies = 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64' ) +Alias( 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64' ) { .Targets = { - 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_Executable', - 'Copy_C20D120C' + 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64_Executable', + 'Copy_A1643CC6' } } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.vcxproj similarity index 66% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.vcxproj index 3c082cc7d..c0f6f460c 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.vcxproj @@ -1,82 +1,82 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Debug_MSBuild_vs2017 + + Debug_MSBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 - - Release_MSBuild_vs2017 + + Release_MSBuild_vs2019 x64 - {B0087514-0636-5209-BC43-4E8096928555} + {BC3341AC-FE51-B984-2CC3-805586205CBC} en-US PostBuildCopyDirTest PostBuildCopyDirTest - 10.0.10586.0 + 10.0.16299.0 - + Makefile true MultiByte false - v141 + v142 - + Makefile true MultiByte false - v141 + v142 - + Application true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Application false MultiByte false - v141 + v142 @@ -85,113 +85,113 @@ - - output\debug_fastbuild_noblob_vs2017\ - build\debug_fastbuild_noblob_vs2017\postbuildcopydirtest\ + + output\debug_fastbuild_noblob_vs2019\ + build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_noblob_vs2017\postbuildcopydirtest\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildcopydirtest\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildcopydirtest\*.a" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildcopydirtest\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopydirtest.exe" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopydirtest.elf" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopydirtest.exp" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopydirtest.ilk" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopydirtest.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopydirtest.pdb" >NUL 2>NUL - output\debug_fastbuild_noblob_vs2017\postbuildcopydirtest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\*.a" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopydirtest.exe" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopydirtest.elf" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopydirtest.exp" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopydirtest.ilk" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopydirtest.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopydirtest.pdb" >NUL 2>NUL + output\debug_fastbuild_noblob_vs2019\postbuildcopydirtest.exe WIN64;_CONSOLE;_DEBUG postbuildcopydirtest.exe - - output\debug_fastbuild_vs2017\ - build\debug_fastbuild_vs2017\postbuildcopydirtest\ + + output\debug_fastbuild_vs2019\ + build\debug_fastbuild_vs2019\postbuildcopydirtest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_vs2017\postbuildcopydirtest\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildcopydirtest\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildcopydirtest\*.a" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildcopydirtest\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopydirtest.exe" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopydirtest.elf" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopydirtest.exp" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopydirtest.ilk" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopydirtest.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopydirtest.pdb" >NUL 2>NUL - output\debug_fastbuild_vs2017\postbuildcopydirtest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_vs2019\postbuildcopydirtest\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildcopydirtest\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildcopydirtest\*.a" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildcopydirtest\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopydirtest.exe" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopydirtest.elf" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopydirtest.exp" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopydirtest.ilk" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopydirtest.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopydirtest.pdb" >NUL 2>NUL + output\debug_fastbuild_vs2019\postbuildcopydirtest.exe WIN64;_CONSOLE;_DEBUG postbuildcopydirtest.exe - + postbuildcopydirtest - output\debug_msbuild_vs2017\ - build\debug_msbuild_vs2017\postbuildcopydirtest\ + output\debug_msbuild_vs2019\ + build\debug_msbuild_vs2019\postbuildcopydirtest\ .exe true false - output\debug_msbuild_vs2017\postbuildcopydirtest.exe + output\debug_msbuild_vs2019\postbuildcopydirtest.exe false false - - output\release_fastbuild_noblob_vs2017\ - build\release_fastbuild_noblob_vs2017\postbuildcopydirtest\ + + output\release_fastbuild_noblob_vs2019\ + build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_noblob_vs2017\postbuildcopydirtest\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildcopydirtest\*.obj" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildcopydirtest\*.a" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildcopydirtest\*.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopydirtest.exe" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopydirtest.elf" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopydirtest.exp" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopydirtest.ilk" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopydirtest.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopydirtest.pdb" >NUL 2>NUL - output\release_fastbuild_noblob_vs2017\postbuildcopydirtest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\*.obj" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\*.a" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\*.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopydirtest.exe" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopydirtest.elf" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopydirtest.exp" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopydirtest.ilk" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopydirtest.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopydirtest.pdb" >NUL 2>NUL + output\release_fastbuild_noblob_vs2019\postbuildcopydirtest.exe NDEBUG;WIN64;_CONSOLE postbuildcopydirtest.exe - - output\release_fastbuild_vs2017\ - build\release_fastbuild_vs2017\postbuildcopydirtest\ + + output\release_fastbuild_vs2019\ + build\release_fastbuild_vs2019\postbuildcopydirtest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildCopyDirTest_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildCopyDirTest_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildCopyDirTest_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_vs2017\postbuildcopydirtest\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildcopydirtest\*.obj" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildcopydirtest\*.a" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildcopydirtest\*.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopydirtest.exe" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopydirtest.elf" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopydirtest.exp" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopydirtest.ilk" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopydirtest.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopydirtest.pdb" >NUL 2>NUL - output\release_fastbuild_vs2017\postbuildcopydirtest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildCopyDirTest_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_vs2019\postbuildcopydirtest\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildcopydirtest\*.obj" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildcopydirtest\*.a" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildcopydirtest\*.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopydirtest.exe" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopydirtest.elf" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopydirtest.exp" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopydirtest.ilk" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopydirtest.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopydirtest.pdb" >NUL 2>NUL + output\release_fastbuild_vs2019\postbuildcopydirtest.exe NDEBUG;WIN64;_CONSOLE postbuildcopydirtest.exe - + postbuildcopydirtest - output\release_msbuild_vs2017\ - build\release_msbuild_vs2017\postbuildcopydirtest\ + output\release_msbuild_vs2019\ + build\release_msbuild_vs2019\postbuildcopydirtest\ .exe true false - output\release_msbuild_vs2017\postbuildcopydirtest.exe + output\release_msbuild_vs2019\postbuildcopydirtest.exe false false - + NotUsing Level4 @@ -237,16 +237,16 @@ del "output\release_fastbuild_vs2017\postbuildcopydirtest.pdb" >NUL 2>NULCdecl Default /Zc:__cplusplus - build\debug_msbuild_vs2017\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb + build\debug_msbuild_vs2019\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb MultiThreadedDebug Console true - output\debug_msbuild_vs2017\postbuildcopydirtest.exe + output\debug_msbuild_vs2019\postbuildcopydirtest.exe NotSet - build\debug_msbuild_vs2017\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest - output\debug_msbuild_vs2017\postbuildcopydirtest.pdb + build\debug_msbuild_vs2019\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest + output\debug_msbuild_vs2019\postbuildcopydirtest.pdb true false false @@ -271,10 +271,10 @@ del "output\release_fastbuild_vs2017\postbuildcopydirtest.pdb" >NUL 2>NULfalse true - output\debug_msbuild_vs2017\postbuildcopydirtest.map + output\debug_msbuild_vs2019\postbuildcopydirtest.map - + NotUsing Level4 @@ -297,7 +297,6 @@ del "output\release_fastbuild_vs2017\postbuildcopydirtest.pdb" >NUL 2>NULfalse false true - false false false Default @@ -321,16 +320,16 @@ del "output\release_fastbuild_vs2017\postbuildcopydirtest.pdb" >NUL 2>NULCdecl Default /Zc:__cplusplus - build\release_msbuild_vs2017\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb + build\release_msbuild_vs2019\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb MultiThreaded Console true - output\release_msbuild_vs2017\postbuildcopydirtest.exe + output\release_msbuild_vs2019\postbuildcopydirtest.exe NotSet - build\release_msbuild_vs2017\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest - output\release_msbuild_vs2017\postbuildcopydirtest.pdb + build\release_msbuild_vs2019\postbuildcopydirtest\postbuildcopydirtest.intermediate.manifest + output\release_msbuild_vs2019\postbuildcopydirtest.pdb true false false @@ -355,7 +354,7 @@ del "output\release_fastbuild_vs2017\postbuildcopydirtest.pdb" >NUL 2>NULfalse true - output\release_msbuild_vs2017\postbuildcopydirtest.map + output\release_msbuild_vs2019\postbuildcopydirtest.map @@ -364,7 +363,7 @@ del "output\release_fastbuild_vs2017\postbuildcopydirtest.pdb" >NUL 2>NUL - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.vcxproj.filters b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.vcxproj.filters similarity index 73% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.vcxproj.filters rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.vcxproj.filters index e9cd79899..73b819150 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.vcxproj.filters +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.vcxproj.filters @@ -1,5 +1,5 @@  - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.bff similarity index 84% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.bff index acb28ccba..a8a95bcdf 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.bff @@ -20,20 +20,20 @@ Unity( 'PostBuildCopySingleFileTest_FastBuildUnitys_unity' ) #if WIN64 //================================================================================================================= -ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -48,7 +48,6 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_obj // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -63,7 +62,7 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_obj + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -97,12 +96,12 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_obj //================================================================================================================= -Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\' - .Libraries = 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\' + .Libraries = 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -110,10 +109,10 @@ Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_Exe // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -134,12 +133,12 @@ Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_Exe // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -164,39 +163,39 @@ Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_Exe //================================================================================================================= -Copy( 'Copy_1D5DF622' ) +Copy( 'Copy_AF4B8D62' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.exe' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\file_copy_destination\postbuildcopysinglefiletest.exe' - .PreBuildDependencies = 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exe' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\file_copy_destination\postbuildcopysinglefiletest.exe' + .PreBuildDependencies = 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable', - 'Copy_1D5DF622' + 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable', + 'Copy_AF4B8D62' } } //================================================================================================================= -ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -211,7 +210,6 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_o // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -226,7 +224,7 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_o + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -261,12 +259,12 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_o //================================================================================================================= -Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\' - .Libraries = 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\' + .Libraries = 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -274,10 +272,10 @@ Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_E // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -298,12 +296,12 @@ Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_E // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -328,39 +326,39 @@ Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_E //================================================================================================================= -Copy( 'Copy_8BC3E0C2' ) +Copy( 'Copy_12D176C2' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.exe' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\file_copy_destination\postbuildcopysinglefiletest.exe' - .PreBuildDependencies = 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exe' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\file_copy_destination\postbuildcopysinglefiletest.exe' + .PreBuildDependencies = 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_Executable', - 'Copy_8BC3E0C2' + 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64_Executable', + 'Copy_12D176C2' } } //================================================================================================================= -ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_objects' ) +ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildcopysinglefiletest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -375,7 +373,6 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -390,7 +387,7 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -424,12 +421,12 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_Executable' ) +Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildcopysinglefiletest\' - .Libraries = 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\' + .Libraries = 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -437,10 +434,10 @@ Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_Executable // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -461,12 +458,12 @@ Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_Executable // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -491,39 +488,39 @@ Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_Executable //================================================================================================================= -Copy( 'Copy_6E7A0E5A' ) +Copy( 'Copy_72CB7A7A' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.exe' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\file_copy_destination\postbuildcopysinglefiletest.exe' - .PreBuildDependencies = 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.exe' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\file_copy_destination\postbuildcopysinglefiletest.exe' + .PreBuildDependencies = 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64' ) +Alias( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64' ) { .Targets = { - 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_Executable', - 'Copy_6E7A0E5A' + 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64_Executable', + 'Copy_72CB7A7A' } } //================================================================================================================= -ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_objects' ) +ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildcopysinglefiletest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopysinglefiletest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -538,7 +535,6 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_objects' // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -553,7 +549,7 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_objects' + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -588,12 +584,12 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_objects' //================================================================================================================= -Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_Executable' ) +Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildcopysinglefiletest\' - .Libraries = 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildcopysinglefiletest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopysinglefiletest\' + .Libraries = 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildcopysinglefiletest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -601,10 +597,10 @@ Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_Executab // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -625,12 +621,12 @@ Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_Executab // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildcopysinglefiletest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildcopysinglefiletest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildcopysinglefiletest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildcopysinglefiletest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -655,20 +651,20 @@ Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_Executab //================================================================================================================= -Copy( 'Copy_0E72E88A' ) +Copy( 'Copy_5FB7030A' ) { - .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildcopysinglefiletest.exe' - .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\file_copy_destination\postbuildcopysinglefiletest.exe' - .PreBuildDependencies = 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_Executable' + .Source = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildcopysinglefiletest.exe' + .Dest = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\file_copy_destination\postbuildcopysinglefiletest.exe' + .PreBuildDependencies = 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64' ) +Alias( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64' ) { .Targets = { - 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_Executable', - 'Copy_0E72E88A' + 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64_Executable', + 'Copy_5FB7030A' } } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.vcxproj similarity index 67% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.vcxproj index 9b45706bc..b720776a3 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.vcxproj @@ -1,82 +1,82 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Debug_MSBuild_vs2017 + + Debug_MSBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 - - Release_MSBuild_vs2017 + + Release_MSBuild_vs2019 x64 - {B1F3B803-C020-3A59-6346-D0E116BAAA74} + {6C284AF9-4231-78AB-754D-A7143C2B81DD} en-US PostBuildCopySingleFileTest PostBuildCopySingleFileTest - 10.0.10586.0 + 10.0.16299.0 - + Makefile true MultiByte false - v141 + v142 - + Makefile true MultiByte false - v141 + v142 - + Application true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Application false MultiByte false - v141 + v142 @@ -85,113 +85,113 @@ - - output\debug_fastbuild_noblob_vs2017\ - build\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\ + + output\debug_fastbuild_noblob_vs2019\ + build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\*.a" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.exe" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.elf" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.exp" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.ilk" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.pdb" >NUL 2>NUL - output\debug_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\*.a" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exe" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.elf" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exp" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.ilk" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.pdb" >NUL 2>NUL + output\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exe WIN64;_CONSOLE;_DEBUG postbuildcopysinglefiletest.exe - - output\debug_fastbuild_vs2017\ - build\debug_fastbuild_vs2017\postbuildcopysinglefiletest\ + + output\debug_fastbuild_vs2019\ + build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_vs2017\postbuildcopysinglefiletest\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildcopysinglefiletest\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildcopysinglefiletest\*.a" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildcopysinglefiletest\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.exe" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.elf" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.exp" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.ilk" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.pdb" >NUL 2>NUL - output\debug_fastbuild_vs2017\postbuildcopysinglefiletest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\*.a" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.exe" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.elf" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.exp" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.ilk" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.pdb" >NUL 2>NUL + output\debug_fastbuild_vs2019\postbuildcopysinglefiletest.exe WIN64;_CONSOLE;_DEBUG postbuildcopysinglefiletest.exe - + postbuildcopysinglefiletest - output\debug_msbuild_vs2017\ - build\debug_msbuild_vs2017\postbuildcopysinglefiletest\ + output\debug_msbuild_vs2019\ + build\debug_msbuild_vs2019\postbuildcopysinglefiletest\ .exe true false - output\debug_msbuild_vs2017\postbuildcopysinglefiletest.exe + output\debug_msbuild_vs2019\postbuildcopysinglefiletest.exe false false - - output\release_fastbuild_noblob_vs2017\ - build\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\ + + output\release_fastbuild_noblob_vs2019\ + build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\*.obj" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\*.a" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest\*.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.exe" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.elf" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.exp" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.ilk" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.pdb" >NUL 2>NUL - output\release_fastbuild_noblob_vs2017\postbuildcopysinglefiletest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\*.obj" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\*.a" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\*.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exe" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.elf" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exp" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.ilk" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.pdb" >NUL 2>NUL + output\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest.exe NDEBUG;WIN64;_CONSOLE postbuildcopysinglefiletest.exe - - output\release_fastbuild_vs2017\ - build\release_fastbuild_vs2017\postbuildcopysinglefiletest\ + + output\release_fastbuild_vs2019\ + build\release_fastbuild_vs2019\postbuildcopysinglefiletest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_vs2017\postbuildcopysinglefiletest\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildcopysinglefiletest\*.obj" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildcopysinglefiletest\*.a" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildcopysinglefiletest\*.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.exe" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.elf" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.exp" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.ilk" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.pdb" >NUL 2>NUL - output\release_fastbuild_vs2017\postbuildcopysinglefiletest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_vs2019\postbuildcopysinglefiletest\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildcopysinglefiletest\*.obj" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildcopysinglefiletest\*.a" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildcopysinglefiletest\*.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopysinglefiletest.exe" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopysinglefiletest.elf" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopysinglefiletest.exp" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopysinglefiletest.ilk" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopysinglefiletest.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildcopysinglefiletest.pdb" >NUL 2>NUL + output\release_fastbuild_vs2019\postbuildcopysinglefiletest.exe NDEBUG;WIN64;_CONSOLE postbuildcopysinglefiletest.exe - + postbuildcopysinglefiletest - output\release_msbuild_vs2017\ - build\release_msbuild_vs2017\postbuildcopysinglefiletest\ + output\release_msbuild_vs2019\ + build\release_msbuild_vs2019\postbuildcopysinglefiletest\ .exe true false - output\release_msbuild_vs2017\postbuildcopysinglefiletest.exe + output\release_msbuild_vs2019\postbuildcopysinglefiletest.exe false false - + NotUsing Level4 @@ -237,16 +237,16 @@ del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.pdb" >NUL 2>NUL Cdecl Default /Zc:__cplusplus - build\debug_msbuild_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb + build\debug_msbuild_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb MultiThreadedDebug Console true - output\debug_msbuild_vs2017\postbuildcopysinglefiletest.exe + output\debug_msbuild_vs2019\postbuildcopysinglefiletest.exe NotSet - build\debug_msbuild_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest - output\debug_msbuild_vs2017\postbuildcopysinglefiletest.pdb + build\debug_msbuild_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest + output\debug_msbuild_vs2019\postbuildcopysinglefiletest.pdb true false false @@ -271,10 +271,10 @@ del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.pdb" >NUL 2>NUL false true - output\debug_msbuild_vs2017\postbuildcopysinglefiletest.map + output\debug_msbuild_vs2019\postbuildcopysinglefiletest.map - + NotUsing Level4 @@ -297,7 +297,6 @@ del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.pdb" >NUL 2>NUL false false true - false false false Default @@ -321,16 +320,16 @@ del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.pdb" >NUL 2>NUL Cdecl Default /Zc:__cplusplus - build\release_msbuild_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb + build\release_msbuild_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb MultiThreaded Console true - output\release_msbuild_vs2017\postbuildcopysinglefiletest.exe + output\release_msbuild_vs2019\postbuildcopysinglefiletest.exe NotSet - build\release_msbuild_vs2017\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest - output\release_msbuild_vs2017\postbuildcopysinglefiletest.pdb + build\release_msbuild_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest.intermediate.manifest + output\release_msbuild_vs2019\postbuildcopysinglefiletest.pdb true false false @@ -355,7 +354,7 @@ del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.pdb" >NUL 2>NUL false true - output\release_msbuild_vs2017\postbuildcopysinglefiletest.map + output\release_msbuild_vs2019\postbuildcopysinglefiletest.map @@ -364,7 +363,7 @@ del "output\release_fastbuild_vs2017\postbuildcopysinglefiletest.pdb" >NUL 2>NUL - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.vcxproj.filters b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.vcxproj.filters similarity index 74% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.vcxproj.filters rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.vcxproj.filters index c98839906..4983d3275 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.vcxproj.filters +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.vcxproj.filters @@ -1,5 +1,5 @@  - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.bff similarity index 83% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.bff index b368c10a7..ca685b44d 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.bff @@ -20,20 +20,20 @@ Unity( 'PostBuildExecuteTest_FastBuildUnitys_unity' ) #if WIN64 //================================================================================================================= -ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildexecutetest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -48,7 +48,6 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -63,7 +62,7 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -97,12 +96,12 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildexecutetest\' - .Libraries = 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\' + .Libraries = 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -110,10 +109,10 @@ Executable( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -134,12 +133,12 @@ Executable( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildexecutetest\postbuildexecutetest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\postbuildexecutetest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -164,40 +163,40 @@ Executable( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable //================================================================================================================= -Exec( 'Exec_postbuildexecutetest_exe_6F670091' ) +Exec( 'Exec_postbuildexecutetest_exe_A9847703' ) { - .ExecExecutable = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.exe' - .ExecOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuild_exec_sentinel.txt' + .ExecExecutable = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.exe' + .ExecOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuild_exec_sentinel.txt' .ExecUseStdOutAsOutput = true - .PreBuildDependencies = 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .PreBuildDependencies = 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable', - 'Exec_postbuildexecutetest_exe_6F670091' + 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable', + 'Exec_postbuildexecutetest_exe_A9847703' } } //================================================================================================================= -ObjectList( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildexecutetest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildexecutetest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -212,7 +211,6 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_objects' // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -227,7 +225,7 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_objects' + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -262,12 +260,12 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_objects' //================================================================================================================= -Executable( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildexecutetest\' - .Libraries = 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildexecutetest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildexecutetest\' + .Libraries = 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildexecutetest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -275,10 +273,10 @@ Executable( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_Executab // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -299,12 +297,12 @@ Executable( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_Executab // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildexecutetest\postbuildexecutetest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildexecutetest\postbuildexecutetest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildexecutetest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildexecutetest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildexecutetest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildexecutetest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -329,40 +327,40 @@ Executable( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_Executab //================================================================================================================= -Exec( 'Exec_postbuildexecutetest_exe_CAF85FE1' ) +Exec( 'Exec_postbuildexecutetest_exe_3F4E6497' ) { - .ExecExecutable = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildexecutetest.exe' - .ExecOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuild_exec_sentinel.txt' + .ExecExecutable = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildexecutetest.exe' + .ExecOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuild_exec_sentinel.txt' .ExecUseStdOutAsOutput = true - .PreBuildDependencies = 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .PreBuildDependencies = 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_Executable', - 'Exec_postbuildexecutetest_exe_CAF85FE1' + 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64_Executable', + 'Exec_postbuildexecutetest_exe_3F4E6497' } } //================================================================================================================= -ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_objects' ) +ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildexecutetest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildexecutetest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -377,7 +375,6 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -392,7 +389,7 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -426,12 +423,12 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_Executable' ) +Executable( 'PostBuildExecuteTest_Debug_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildexecutetest\' - .Libraries = 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildexecutetest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildexecutetest\' + .Libraries = 'PostBuildExecuteTest_Debug_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildexecutetest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -439,10 +436,10 @@ Executable( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -463,12 +460,12 @@ Executable( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildexecutetest\postbuildexecutetest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildexecutetest\postbuildexecutetest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildexecutetest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildexecutetest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildexecutetest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildexecutetest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -493,40 +490,40 @@ Executable( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -Exec( 'Exec_postbuildexecutetest_exe_980FD418' ) +Exec( 'Exec_postbuildexecutetest_exe_92FBF0A6' ) { - .ExecExecutable = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildexecutetest.exe' - .ExecOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuild_exec_sentinel.txt' + .ExecExecutable = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildexecutetest.exe' + .ExecOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuild_exec_sentinel.txt' .ExecUseStdOutAsOutput = true - .PreBuildDependencies = 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_Executable' + .PreBuildDependencies = 'PostBuildExecuteTest_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64' ) +Alias( 'PostBuildExecuteTest_Debug_FastBuild_vs2019_win64' ) { .Targets = { - 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_Executable', - 'Exec_postbuildexecutetest_exe_980FD418' + 'PostBuildExecuteTest_Debug_FastBuild_vs2019_win64_Executable', + 'Exec_postbuildexecutetest_exe_92FBF0A6' } } //================================================================================================================= -ObjectList( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_objects' ) +ObjectList( 'PostBuildExecuteTest_Release_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildexecutetest\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildexecutetest\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -541,7 +538,6 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -556,7 +552,7 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -591,12 +587,12 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_Executable' ) +Executable( 'PostBuildExecuteTest_Release_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildexecutetest\' - .Libraries = 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildexecutetest.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildexecutetest\' + .Libraries = 'PostBuildExecuteTest_Release_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildexecutetest.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -604,10 +600,10 @@ Executable( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -628,12 +624,12 @@ Executable( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildexecutetest\postbuildexecutetest.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildexecutetest\postbuildexecutetest.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildexecutetest.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildexecutetest.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildexecutetest.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildexecutetest.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -658,21 +654,21 @@ Executable( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -Exec( 'Exec_postbuildexecutetest_exe_205BA032' ) +Exec( 'Exec_postbuildexecutetest_exe_10F269BC' ) { - .ExecExecutable = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildexecutetest.exe' - .ExecOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuild_exec_sentinel.txt' + .ExecExecutable = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildexecutetest.exe' + .ExecOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuild_exec_sentinel.txt' .ExecUseStdOutAsOutput = true - .PreBuildDependencies = 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_Executable' + .PreBuildDependencies = 'PostBuildExecuteTest_Release_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64' ) +Alias( 'PostBuildExecuteTest_Release_FastBuild_vs2019_win64' ) { .Targets = { - 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_Executable', - 'Exec_postbuildexecutetest_exe_205BA032' + 'PostBuildExecuteTest_Release_FastBuild_vs2019_win64_Executable', + 'Exec_postbuildexecutetest_exe_10F269BC' } } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.vcxproj similarity index 66% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.vcxproj index ecc41e814..f4fa39bcb 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.vcxproj @@ -1,82 +1,82 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Debug_MSBuild_vs2017 + + Debug_MSBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 - - Release_MSBuild_vs2017 + + Release_MSBuild_vs2019 x64 - {0E8AC270-BB93-42F0-4487-E85F2785FCF0} + {D4A0C206-AA95-4DD7-C15C-ACEF32DF514E} en-US PostBuildExecuteTest PostBuildExecuteTest - 10.0.10586.0 + 10.0.16299.0 - + Makefile true MultiByte false - v141 + v142 - + Makefile true MultiByte false - v141 + v142 - + Application true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Application false MultiByte false - v141 + v142 @@ -85,113 +85,113 @@ - - output\debug_fastbuild_noblob_vs2017\ - build\debug_fastbuild_noblob_vs2017\postbuildexecutetest\ + + output\debug_fastbuild_noblob_vs2019\ + build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_noblob_vs2017\postbuildexecutetest\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildexecutetest\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildexecutetest\*.a" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildexecutetest\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.exe" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.elf" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.exp" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.ilk" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.pdb" >NUL 2>NUL - output\debug_fastbuild_noblob_vs2017\postbuildexecutetest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\*.a" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.exe" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.elf" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.exp" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.ilk" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.pdb" >NUL 2>NUL + output\debug_fastbuild_noblob_vs2019\postbuildexecutetest.exe WIN64;_CONSOLE;_DEBUG postbuildexecutetest.exe - - output\debug_fastbuild_vs2017\ - build\debug_fastbuild_vs2017\postbuildexecutetest\ + + output\debug_fastbuild_vs2019\ + build\debug_fastbuild_vs2019\postbuildexecutetest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildExecuteTest_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildExecuteTest_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildExecuteTest_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_vs2017\postbuildexecutetest\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildexecutetest\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildexecutetest\*.a" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildexecutetest\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildexecutetest.exe" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildexecutetest.elf" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildexecutetest.exp" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildexecutetest.ilk" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildexecutetest.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildexecutetest.pdb" >NUL 2>NUL - output\debug_fastbuild_vs2017\postbuildexecutetest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildExecuteTest_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_vs2019\postbuildexecutetest\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildexecutetest\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildexecutetest\*.a" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildexecutetest\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildexecutetest.exe" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildexecutetest.elf" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildexecutetest.exp" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildexecutetest.ilk" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildexecutetest.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildexecutetest.pdb" >NUL 2>NUL + output\debug_fastbuild_vs2019\postbuildexecutetest.exe WIN64;_CONSOLE;_DEBUG postbuildexecutetest.exe - + postbuildexecutetest - output\debug_msbuild_vs2017\ - build\debug_msbuild_vs2017\postbuildexecutetest\ + output\debug_msbuild_vs2019\ + build\debug_msbuild_vs2019\postbuildexecutetest\ .exe true false - output\debug_msbuild_vs2017\postbuildexecutetest.exe + output\debug_msbuild_vs2019\postbuildexecutetest.exe false false - - output\release_fastbuild_noblob_vs2017\ - build\release_fastbuild_noblob_vs2017\postbuildexecutetest\ + + output\release_fastbuild_noblob_vs2019\ + build\release_fastbuild_noblob_vs2019\postbuildexecutetest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_noblob_vs2017\postbuildexecutetest\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildexecutetest\*.obj" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildexecutetest\*.a" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildexecutetest\*.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildexecutetest.exe" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildexecutetest.elf" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildexecutetest.exp" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildexecutetest.ilk" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildexecutetest.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildexecutetest.pdb" >NUL 2>NUL - output\release_fastbuild_noblob_vs2017\postbuildexecutetest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_noblob_vs2019\postbuildexecutetest\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildexecutetest\*.obj" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildexecutetest\*.a" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildexecutetest\*.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildexecutetest.exe" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildexecutetest.elf" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildexecutetest.exp" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildexecutetest.ilk" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildexecutetest.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildexecutetest.pdb" >NUL 2>NUL + output\release_fastbuild_noblob_vs2019\postbuildexecutetest.exe NDEBUG;WIN64;_CONSOLE postbuildexecutetest.exe - - output\release_fastbuild_vs2017\ - build\release_fastbuild_vs2017\postbuildexecutetest\ + + output\release_fastbuild_vs2019\ + build\release_fastbuild_vs2019\postbuildexecutetest\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildExecuteTest_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildExecuteTest_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildExecuteTest_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_vs2017\postbuildexecutetest\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildexecutetest\*.obj" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildexecutetest\*.a" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildexecutetest\*.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildexecutetest.exe" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildexecutetest.elf" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildexecutetest.exp" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildexecutetest.ilk" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildexecutetest.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildexecutetest.pdb" >NUL 2>NUL - output\release_fastbuild_vs2017\postbuildexecutetest.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildExecuteTest_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_vs2019\postbuildexecutetest\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildexecutetest\*.obj" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildexecutetest\*.a" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildexecutetest\*.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildexecutetest.exe" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildexecutetest.elf" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildexecutetest.exp" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildexecutetest.ilk" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildexecutetest.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildexecutetest.pdb" >NUL 2>NUL + output\release_fastbuild_vs2019\postbuildexecutetest.exe NDEBUG;WIN64;_CONSOLE postbuildexecutetest.exe - + postbuildexecutetest - output\release_msbuild_vs2017\ - build\release_msbuild_vs2017\postbuildexecutetest\ + output\release_msbuild_vs2019\ + build\release_msbuild_vs2019\postbuildexecutetest\ .exe true false - output\release_msbuild_vs2017\postbuildexecutetest.exe + output\release_msbuild_vs2019\postbuildexecutetest.exe false false - + NotUsing Level4 @@ -237,16 +237,16 @@ del "output\release_fastbuild_vs2017\postbuildexecutetest.pdb" >NUL 2>NULCdecl Default /Zc:__cplusplus - build\debug_msbuild_vs2017\postbuildexecutetest\postbuildexecutetest_compiler.pdb + build\debug_msbuild_vs2019\postbuildexecutetest\postbuildexecutetest_compiler.pdb MultiThreadedDebug Console true - output\debug_msbuild_vs2017\postbuildexecutetest.exe + output\debug_msbuild_vs2019\postbuildexecutetest.exe NotSet - build\debug_msbuild_vs2017\postbuildexecutetest\postbuildexecutetest.intermediate.manifest - output\debug_msbuild_vs2017\postbuildexecutetest.pdb + build\debug_msbuild_vs2019\postbuildexecutetest\postbuildexecutetest.intermediate.manifest + output\debug_msbuild_vs2019\postbuildexecutetest.pdb true false false @@ -271,10 +271,10 @@ del "output\release_fastbuild_vs2017\postbuildexecutetest.pdb" >NUL 2>NULfalse true - output\debug_msbuild_vs2017\postbuildexecutetest.map + output\debug_msbuild_vs2019\postbuildexecutetest.map - + NotUsing Level4 @@ -297,7 +297,6 @@ del "output\release_fastbuild_vs2017\postbuildexecutetest.pdb" >NUL 2>NULfalse false true - false false false Default @@ -321,16 +320,16 @@ del "output\release_fastbuild_vs2017\postbuildexecutetest.pdb" >NUL 2>NULCdecl Default /Zc:__cplusplus - build\release_msbuild_vs2017\postbuildexecutetest\postbuildexecutetest_compiler.pdb + build\release_msbuild_vs2019\postbuildexecutetest\postbuildexecutetest_compiler.pdb MultiThreaded Console true - output\release_msbuild_vs2017\postbuildexecutetest.exe + output\release_msbuild_vs2019\postbuildexecutetest.exe NotSet - build\release_msbuild_vs2017\postbuildexecutetest\postbuildexecutetest.intermediate.manifest - output\release_msbuild_vs2017\postbuildexecutetest.pdb + build\release_msbuild_vs2019\postbuildexecutetest\postbuildexecutetest.intermediate.manifest + output\release_msbuild_vs2019\postbuildexecutetest.pdb true false false @@ -355,7 +354,7 @@ del "output\release_fastbuild_vs2017\postbuildexecutetest.pdb" >NUL 2>NULfalse true - output\release_msbuild_vs2017\postbuildexecutetest.map + output\release_msbuild_vs2019\postbuildexecutetest.map @@ -364,7 +363,7 @@ del "output\release_fastbuild_vs2017\postbuildexecutetest.pdb" >NUL 2>NUL - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.vcxproj.filters b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.vcxproj.filters similarity index 73% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.vcxproj.filters rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.vcxproj.filters index 1cd81dcd1..11e6cc354 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.vcxproj.filters +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.vcxproj.filters @@ -1,5 +1,5 @@  - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.bff similarity index 83% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.bff index b938f33be..600c09b11 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.bff @@ -20,20 +20,20 @@ Unity( 'PostBuildTestExecution_FastBuildUnitys_unity' ) #if WIN64 //================================================================================================================= -ObjectList( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildtestexecution\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -48,7 +48,6 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_objects' // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -63,7 +62,7 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_objects' + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -97,12 +96,12 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_objects' //================================================================================================================= -Executable( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildtestexecution\' - .Libraries = 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\' + .Libraries = 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -110,10 +109,10 @@ Executable( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_Executab // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -134,12 +133,12 @@ Executable( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_Executab // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\postbuildtestexecution\postbuildtestexecution.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\postbuildtestexecution.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -164,40 +163,40 @@ Executable( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_Executab //================================================================================================================= -Test( 'Test_postbuildtestexecution_exe_07EEB88C' ) +Test( 'Test_postbuildtestexecution_exe_FD148C16' ) { - .TestExecutable = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.exe' - .TestOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\test_execution_output.txt' + .TestExecutable = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.exe' + .TestOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\test_execution_output.txt' .TestAlwaysShowOutput = true - .PreBuildDependencies = 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .PreBuildDependencies = 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_Executable', - 'Test_postbuildtestexecution_exe_07EEB88C' + 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64_Executable', + 'Test_postbuildtestexecution_exe_FD148C16' } } //================================================================================================================= -ObjectList( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildtestexecution\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildtestexecution\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -212,7 +211,6 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_object // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -227,7 +225,7 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_object + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -262,12 +260,12 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_object //================================================================================================================= -Executable( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildtestexecution\' - .Libraries = 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildtestexecution.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildtestexecution\' + .Libraries = 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildtestexecution.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -275,10 +273,10 @@ Executable( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_Execut // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -299,12 +297,12 @@ Executable( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_Execut // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\postbuildtestexecution\postbuildtestexecution.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildtestexecution\postbuildtestexecution.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildtestexecution.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildtestexecution.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildtestexecution.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildtestexecution.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -329,40 +327,40 @@ Executable( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_Execut //================================================================================================================= -Test( 'Test_postbuildtestexecution_exe_739E48FE' ) +Test( 'Test_postbuildtestexecution_exe_A4801F4C' ) { - .TestExecutable = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\postbuildtestexecution.exe' - .TestOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\test_execution_output.txt' + .TestExecutable = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\postbuildtestexecution.exe' + .TestOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\test_execution_output.txt' .TestAlwaysShowOutput = true - .PreBuildDependencies = 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .PreBuildDependencies = 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64' ) { .Targets = { - 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_Executable', - 'Test_postbuildtestexecution_exe_739E48FE' + 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64_Executable', + 'Test_postbuildtestexecution_exe_A4801F4C' } } //================================================================================================================= -ObjectList( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_objects' ) +ObjectList( 'PostBuildTestExecution_Debug_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildtestexecution\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildtestexecution\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -377,7 +375,6 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -392,7 +389,7 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -426,12 +423,12 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_Executable' ) +Executable( 'PostBuildTestExecution_Debug_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildtestexecution\' - .Libraries = 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildtestexecution.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildtestexecution\' + .Libraries = 'PostBuildTestExecution_Debug_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildtestexecution.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -439,10 +436,10 @@ Executable( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -463,12 +460,12 @@ Executable( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\postbuildtestexecution\postbuildtestexecution.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildtestexecution\postbuildtestexecution.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildtestexecution.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildtestexecution.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildtestexecution.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildtestexecution.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -493,40 +490,40 @@ Executable( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -Test( 'Test_postbuildtestexecution_exe_384F0979' ) +Test( 'Test_postbuildtestexecution_exe_75D592BF' ) { - .TestExecutable = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\postbuildtestexecution.exe' - .TestOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\test_execution_output.txt' + .TestExecutable = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\postbuildtestexecution.exe' + .TestOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\test_execution_output.txt' .TestAlwaysShowOutput = true - .PreBuildDependencies = 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_Executable' + .PreBuildDependencies = 'PostBuildTestExecution_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64' ) +Alias( 'PostBuildTestExecution_Debug_FastBuild_vs2019_win64' ) { .Targets = { - 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_Executable', - 'Test_postbuildtestexecution_exe_384F0979' + 'PostBuildTestExecution_Debug_FastBuild_vs2019_win64_Executable', + 'Test_postbuildtestexecution_exe_75D592BF' } } //================================================================================================================= -ObjectList( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_objects' ) +ObjectList( 'PostBuildTestExecution_Release_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildtestexecution\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildtestexecution\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -541,7 +538,6 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -556,7 +552,7 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -591,12 +587,12 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_Executable' ) +Executable( 'PostBuildTestExecution_Release_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildtestexecution\' - .Libraries = 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildtestexecution.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildtestexecution\' + .Libraries = 'PostBuildTestExecution_Release_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildtestexecution.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -604,10 +600,10 @@ Executable( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -628,12 +624,12 @@ Executable( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\postbuildtestexecution\postbuildtestexecution.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildtestexecution\postbuildtestexecution.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildtestexecution.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildtestexecution.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildtestexecution.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildtestexecution.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -658,21 +654,21 @@ Executable( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -Test( 'Test_postbuildtestexecution_exe_C07CFCF9' ) +Test( 'Test_postbuildtestexecution_exe_BBAD16BB' ) { - .TestExecutable = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\postbuildtestexecution.exe' - .TestOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\test_execution_output.txt' + .TestExecutable = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\postbuildtestexecution.exe' + .TestOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\test_execution_output.txt' .TestAlwaysShowOutput = true - .PreBuildDependencies = 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_Executable' + .PreBuildDependencies = 'PostBuildTestExecution_Release_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -Alias( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64' ) +Alias( 'PostBuildTestExecution_Release_FastBuild_vs2019_win64' ) { .Targets = { - 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_Executable', - 'Test_postbuildtestexecution_exe_C07CFCF9' + 'PostBuildTestExecution_Release_FastBuild_vs2019_win64_Executable', + 'Test_postbuildtestexecution_exe_BBAD16BB' } } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.vcxproj similarity index 66% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.vcxproj index 8b7718717..e67685351 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.vcxproj @@ -1,82 +1,82 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Debug_MSBuild_vs2017 + + Debug_MSBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 - - Release_MSBuild_vs2017 + + Release_MSBuild_vs2019 x64 - {311CFA15-731D-A99E-EDE1-41AB713BBE48} + {6644576B-DABD-B111-1BB5-47804F5CE2DC} en-US PostBuildTestExecution PostBuildTestExecution - 10.0.10586.0 + 10.0.16299.0 - + Makefile true MultiByte false - v141 + v142 - + Makefile true MultiByte false - v141 + v142 - + Application true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Application false MultiByte false - v141 + v142 @@ -85,113 +85,113 @@ - - output\debug_fastbuild_noblob_vs2017\ - build\debug_fastbuild_noblob_vs2017\postbuildtestexecution\ + + output\debug_fastbuild_noblob_vs2019\ + build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_noblob_vs2017\postbuildtestexecution\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildtestexecution\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildtestexecution\*.a" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\postbuildtestexecution\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.exe" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.elf" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.exp" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.ilk" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.pdb" >NUL 2>NUL - output\debug_fastbuild_noblob_vs2017\postbuildtestexecution.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\*.a" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.exe" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.elf" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.exp" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.ilk" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.pdb" >NUL 2>NUL + output\debug_fastbuild_noblob_vs2019\postbuildtestexecution.exe WIN64;_CONSOLE;_DEBUG postbuildtestexecution.exe - - output\debug_fastbuild_vs2017\ - build\debug_fastbuild_vs2017\postbuildtestexecution\ + + output\debug_fastbuild_vs2019\ + build\debug_fastbuild_vs2019\postbuildtestexecution\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildTestExecution_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildTestExecution_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildTestExecution_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_vs2017\postbuildtestexecution\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildtestexecution\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildtestexecution\*.a" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\postbuildtestexecution\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildtestexecution.exe" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildtestexecution.elf" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildtestexecution.exp" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildtestexecution.ilk" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildtestexecution.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\postbuildtestexecution.pdb" >NUL 2>NUL - output\debug_fastbuild_vs2017\postbuildtestexecution.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildTestExecution_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_vs2019\postbuildtestexecution\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildtestexecution\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildtestexecution\*.a" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\postbuildtestexecution\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildtestexecution.exe" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildtestexecution.elf" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildtestexecution.exp" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildtestexecution.ilk" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildtestexecution.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\postbuildtestexecution.pdb" >NUL 2>NUL + output\debug_fastbuild_vs2019\postbuildtestexecution.exe WIN64;_CONSOLE;_DEBUG postbuildtestexecution.exe - + postbuildtestexecution - output\debug_msbuild_vs2017\ - build\debug_msbuild_vs2017\postbuildtestexecution\ + output\debug_msbuild_vs2019\ + build\debug_msbuild_vs2019\postbuildtestexecution\ .exe true false - output\debug_msbuild_vs2017\postbuildtestexecution.exe + output\debug_msbuild_vs2019\postbuildtestexecution.exe false false - - output\release_fastbuild_noblob_vs2017\ - build\release_fastbuild_noblob_vs2017\postbuildtestexecution\ + + output\release_fastbuild_noblob_vs2019\ + build\release_fastbuild_noblob_vs2019\postbuildtestexecution\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_noblob_vs2017\postbuildtestexecution\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildtestexecution\*.obj" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildtestexecution\*.a" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\postbuildtestexecution\*.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildtestexecution.exe" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildtestexecution.elf" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildtestexecution.exp" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildtestexecution.ilk" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildtestexecution.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\postbuildtestexecution.pdb" >NUL 2>NUL - output\release_fastbuild_noblob_vs2017\postbuildtestexecution.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_noblob_vs2019\postbuildtestexecution\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildtestexecution\*.obj" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildtestexecution\*.a" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\postbuildtestexecution\*.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildtestexecution.exe" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildtestexecution.elf" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildtestexecution.exp" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildtestexecution.ilk" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildtestexecution.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\postbuildtestexecution.pdb" >NUL 2>NUL + output\release_fastbuild_noblob_vs2019\postbuildtestexecution.exe NDEBUG;WIN64;_CONSOLE postbuildtestexecution.exe - - output\release_fastbuild_vs2017\ - build\release_fastbuild_vs2017\postbuildtestexecution\ + + output\release_fastbuild_vs2019\ + build\release_fastbuild_vs2019\postbuildtestexecution\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe PostBuildTestExecution_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe PostBuildTestExecution_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean PostBuildTestExecution_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_vs2017\postbuildtestexecution\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildtestexecution\*.obj" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildtestexecution\*.a" >NUL 2>NUL -del "build\release_fastbuild_vs2017\postbuildtestexecution\*.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildtestexecution.exe" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildtestexecution.elf" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildtestexecution.exp" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildtestexecution.ilk" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildtestexecution.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\postbuildtestexecution.pdb" >NUL 2>NUL - output\release_fastbuild_vs2017\postbuildtestexecution.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean PostBuildTestExecution_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_vs2019\postbuildtestexecution\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildtestexecution\*.obj" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildtestexecution\*.a" >NUL 2>NUL +del "build\release_fastbuild_vs2019\postbuildtestexecution\*.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildtestexecution.exe" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildtestexecution.elf" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildtestexecution.exp" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildtestexecution.ilk" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildtestexecution.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\postbuildtestexecution.pdb" >NUL 2>NUL + output\release_fastbuild_vs2019\postbuildtestexecution.exe NDEBUG;WIN64;_CONSOLE postbuildtestexecution.exe - + postbuildtestexecution - output\release_msbuild_vs2017\ - build\release_msbuild_vs2017\postbuildtestexecution\ + output\release_msbuild_vs2019\ + build\release_msbuild_vs2019\postbuildtestexecution\ .exe true false - output\release_msbuild_vs2017\postbuildtestexecution.exe + output\release_msbuild_vs2019\postbuildtestexecution.exe false false - + NotUsing Level4 @@ -237,16 +237,16 @@ del "output\release_fastbuild_vs2017\postbuildtestexecution.pdb" >NUL 2>NULCdecl Default /Zc:__cplusplus - build\debug_msbuild_vs2017\postbuildtestexecution\postbuildtestexecution_compiler.pdb + build\debug_msbuild_vs2019\postbuildtestexecution\postbuildtestexecution_compiler.pdb MultiThreadedDebug Console true - output\debug_msbuild_vs2017\postbuildtestexecution.exe + output\debug_msbuild_vs2019\postbuildtestexecution.exe NotSet - build\debug_msbuild_vs2017\postbuildtestexecution\postbuildtestexecution.intermediate.manifest - output\debug_msbuild_vs2017\postbuildtestexecution.pdb + build\debug_msbuild_vs2019\postbuildtestexecution\postbuildtestexecution.intermediate.manifest + output\debug_msbuild_vs2019\postbuildtestexecution.pdb true false false @@ -271,10 +271,10 @@ del "output\release_fastbuild_vs2017\postbuildtestexecution.pdb" >NUL 2>NULfalse true - output\debug_msbuild_vs2017\postbuildtestexecution.map + output\debug_msbuild_vs2019\postbuildtestexecution.map - + NotUsing Level4 @@ -297,7 +297,6 @@ del "output\release_fastbuild_vs2017\postbuildtestexecution.pdb" >NUL 2>NULfalse false true - false false false Default @@ -321,16 +320,16 @@ del "output\release_fastbuild_vs2017\postbuildtestexecution.pdb" >NUL 2>NULCdecl Default /Zc:__cplusplus - build\release_msbuild_vs2017\postbuildtestexecution\postbuildtestexecution_compiler.pdb + build\release_msbuild_vs2019\postbuildtestexecution\postbuildtestexecution_compiler.pdb MultiThreaded Console true - output\release_msbuild_vs2017\postbuildtestexecution.exe + output\release_msbuild_vs2019\postbuildtestexecution.exe NotSet - build\release_msbuild_vs2017\postbuildtestexecution\postbuildtestexecution.intermediate.manifest - output\release_msbuild_vs2017\postbuildtestexecution.pdb + build\release_msbuild_vs2019\postbuildtestexecution\postbuildtestexecution.intermediate.manifest + output\release_msbuild_vs2019\postbuildtestexecution.pdb true false false @@ -355,7 +354,7 @@ del "output\release_fastbuild_vs2017\postbuildtestexecution.pdb" >NUL 2>NULfalse true - output\release_msbuild_vs2017\postbuildtestexecution.map + output\release_msbuild_vs2019\postbuildtestexecution.map @@ -364,7 +363,7 @@ del "output\release_fastbuild_vs2017\postbuildtestexecution.pdb" >NUL 2>NUL - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.vcxproj.filters b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.vcxproj.filters similarity index 73% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.vcxproj.filters rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.vcxproj.filters index 2465bb446..ffcca1e90 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.vcxproj.filters +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.vcxproj.filters @@ -1,5 +1,5 @@  - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.bff similarity index 84% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.bff index 2ac20a330..2029eb93d 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.bff @@ -20,21 +20,21 @@ Unity( 'RequirePreBuildStep_FastBuildUnitys_unity' ) #if WIN64 //================================================================================================================= -ObjectList( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\requireprebuildstep\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\requireprebuildstep\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\generated"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -49,7 +49,6 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -64,7 +63,7 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\requireprebuildstep\requireprebuildstep_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\requireprebuildstep\requireprebuildstep_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -100,12 +99,12 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\requireprebuildstep\' - .Libraries = 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\requireprebuildstep.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\requireprebuildstep\' + .Libraries = 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\requireprebuildstep.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -113,10 +112,10 @@ Executable( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_Executable' // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -137,12 +136,12 @@ Executable( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_Executable' // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\requireprebuildstep\requireprebuildstep.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\requireprebuildstep\requireprebuildstep.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\requireprebuildstep.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\requireprebuildstep.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\requireprebuildstep.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\requireprebuildstep.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -167,28 +166,28 @@ Executable( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_Executable' //================================================================================================================= -Alias( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64' ) { - .Targets = 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .Targets = 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\requireprebuildstep\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\requireprebuildstep\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\generated"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -203,7 +202,6 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_objects' // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -218,7 +216,7 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_objects' + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\requireprebuildstep\requireprebuildstep_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\requireprebuildstep\requireprebuildstep_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -255,12 +253,12 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_objects' //================================================================================================================= -Executable( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\requireprebuildstep\' - .Libraries = 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\requireprebuildstep.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\requireprebuildstep\' + .Libraries = 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\requireprebuildstep.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -268,10 +266,10 @@ Executable( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_Executabl // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -292,12 +290,12 @@ Executable( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_Executabl // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\requireprebuildstep\requireprebuildstep.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\requireprebuildstep\requireprebuildstep.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\requireprebuildstep.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\requireprebuildstep.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\requireprebuildstep.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\requireprebuildstep.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -322,28 +320,28 @@ Executable( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_Executabl //================================================================================================================= -Alias( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64' ) { - .Targets = 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .Targets = 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_objects' ) +ObjectList( 'RequirePreBuildStep_Debug_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\requireprebuildstep\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\requireprebuildstep\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\generated"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -358,7 +356,6 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -373,7 +370,7 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\requireprebuildstep\requireprebuildstep_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\requireprebuildstep\requireprebuildstep_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -409,12 +406,12 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_Executable' ) +Executable( 'RequirePreBuildStep_Debug_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\requireprebuildstep\' - .Libraries = 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\requireprebuildstep.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\requireprebuildstep\' + .Libraries = 'RequirePreBuildStep_Debug_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\requireprebuildstep.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -422,10 +419,10 @@ Executable( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -446,12 +443,12 @@ Executable( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\requireprebuildstep\requireprebuildstep.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\requireprebuildstep\requireprebuildstep.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\requireprebuildstep.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\requireprebuildstep.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\requireprebuildstep.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\requireprebuildstep.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -476,28 +473,28 @@ Executable( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -Alias( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64' ) +Alias( 'RequirePreBuildStep_Debug_FastBuild_vs2019_win64' ) { - .Targets = 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_Executable' + .Targets = 'RequirePreBuildStep_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_objects' ) +ObjectList( 'RequirePreBuildStep_Release_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\requireprebuildstep\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\requireprebuildstep\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\generated"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -512,7 +509,6 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -527,7 +523,7 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\requireprebuildstep\requireprebuildstep_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\requireprebuildstep\requireprebuildstep_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -564,12 +560,12 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_Executable' ) +Executable( 'RequirePreBuildStep_Release_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\requireprebuildstep\' - .Libraries = 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\requireprebuildstep.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\requireprebuildstep\' + .Libraries = 'RequirePreBuildStep_Release_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\requireprebuildstep.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -577,10 +573,10 @@ Executable( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -601,12 +597,12 @@ Executable( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\requireprebuildstep\requireprebuildstep.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\requireprebuildstep\requireprebuildstep.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\requireprebuildstep.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\requireprebuildstep.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\requireprebuildstep.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\requireprebuildstep.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -631,9 +627,9 @@ Executable( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -Alias( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64' ) +Alias( 'RequirePreBuildStep_Release_FastBuild_vs2019_win64' ) { - .Targets = 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_Executable' + .Targets = 'RequirePreBuildStep_Release_FastBuild_vs2019_win64_Executable' } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.vcxproj similarity index 67% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.vcxproj index 0e55a57ae..88c2a148d 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.vcxproj @@ -1,82 +1,82 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Debug_MSBuild_vs2017 + + Debug_MSBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 - - Release_MSBuild_vs2017 + + Release_MSBuild_vs2019 x64 - {B7852638-591E-EE12-6928-76038779B42A} + {907F7CFF-3D45-EE04-7085-E9E2DB067942} en-US RequirePreBuildStep RequirePreBuildStep - 10.0.10586.0 + 10.0.16299.0 - + Makefile true MultiByte false - v141 + v142 - + Makefile true MultiByte false - v141 + v142 - + Application true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Application false MultiByte false - v141 + v142 @@ -85,117 +85,117 @@ - - output\debug_fastbuild_noblob_vs2017\ - build\debug_fastbuild_noblob_vs2017\requireprebuildstep\ + + output\debug_fastbuild_noblob_vs2019\ + build\debug_fastbuild_noblob_vs2019\requireprebuildstep\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_noblob_vs2017\requireprebuildstep\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\requireprebuildstep\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\requireprebuildstep\*.a" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\requireprebuildstep\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\requireprebuildstep.exe" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\requireprebuildstep.elf" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\requireprebuildstep.exp" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\requireprebuildstep.ilk" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\requireprebuildstep.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\requireprebuildstep.pdb" >NUL 2>NUL - output\debug_fastbuild_noblob_vs2017\requireprebuildstep.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_noblob_vs2019\requireprebuildstep\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\requireprebuildstep\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\requireprebuildstep\*.a" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\requireprebuildstep\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\requireprebuildstep.exe" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\requireprebuildstep.elf" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\requireprebuildstep.exp" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\requireprebuildstep.ilk" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\requireprebuildstep.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\requireprebuildstep.pdb" >NUL 2>NUL + output\debug_fastbuild_noblob_vs2019\requireprebuildstep.exe WIN64;_CONSOLE;_DEBUG generated requireprebuildstep.exe - - output\debug_fastbuild_vs2017\ - build\debug_fastbuild_vs2017\requireprebuildstep\ + + output\debug_fastbuild_vs2019\ + build\debug_fastbuild_vs2019\requireprebuildstep\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe RequirePreBuildStep_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe RequirePreBuildStep_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean RequirePreBuildStep_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_vs2017\requireprebuildstep\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\requireprebuildstep\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\requireprebuildstep\*.a" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\requireprebuildstep\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\requireprebuildstep.exe" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\requireprebuildstep.elf" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\requireprebuildstep.exp" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\requireprebuildstep.ilk" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\requireprebuildstep.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\requireprebuildstep.pdb" >NUL 2>NUL - output\debug_fastbuild_vs2017\requireprebuildstep.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean RequirePreBuildStep_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_vs2019\requireprebuildstep\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\requireprebuildstep\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\requireprebuildstep\*.a" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\requireprebuildstep\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\requireprebuildstep.exe" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\requireprebuildstep.elf" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\requireprebuildstep.exp" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\requireprebuildstep.ilk" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\requireprebuildstep.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\requireprebuildstep.pdb" >NUL 2>NUL + output\debug_fastbuild_vs2019\requireprebuildstep.exe WIN64;_CONSOLE;_DEBUG generated requireprebuildstep.exe - + requireprebuildstep - output\debug_msbuild_vs2017\ - build\debug_msbuild_vs2017\requireprebuildstep\ + output\debug_msbuild_vs2019\ + build\debug_msbuild_vs2019\requireprebuildstep\ .exe true false - output\debug_msbuild_vs2017\requireprebuildstep.exe + output\debug_msbuild_vs2019\requireprebuildstep.exe false false - - output\release_fastbuild_noblob_vs2017\ - build\release_fastbuild_noblob_vs2017\requireprebuildstep\ + + output\release_fastbuild_noblob_vs2019\ + build\release_fastbuild_noblob_vs2019\requireprebuildstep\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_noblob_vs2017\requireprebuildstep\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\requireprebuildstep\*.obj" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\requireprebuildstep\*.a" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\requireprebuildstep\*.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\requireprebuildstep.exe" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\requireprebuildstep.elf" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\requireprebuildstep.exp" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\requireprebuildstep.ilk" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\requireprebuildstep.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\requireprebuildstep.pdb" >NUL 2>NUL - output\release_fastbuild_noblob_vs2017\requireprebuildstep.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_noblob_vs2019\requireprebuildstep\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\requireprebuildstep\*.obj" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\requireprebuildstep\*.a" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\requireprebuildstep\*.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\requireprebuildstep.exe" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\requireprebuildstep.elf" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\requireprebuildstep.exp" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\requireprebuildstep.ilk" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\requireprebuildstep.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\requireprebuildstep.pdb" >NUL 2>NUL + output\release_fastbuild_noblob_vs2019\requireprebuildstep.exe NDEBUG;WIN64;_CONSOLE generated requireprebuildstep.exe - - output\release_fastbuild_vs2017\ - build\release_fastbuild_vs2017\requireprebuildstep\ + + output\release_fastbuild_vs2019\ + build\release_fastbuild_vs2019\requireprebuildstep\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe RequirePreBuildStep_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe RequirePreBuildStep_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean RequirePreBuildStep_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_vs2017\requireprebuildstep\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_vs2017\requireprebuildstep\*.obj" >NUL 2>NUL -del "build\release_fastbuild_vs2017\requireprebuildstep\*.a" >NUL 2>NUL -del "build\release_fastbuild_vs2017\requireprebuildstep\*.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\requireprebuildstep.exe" >NUL 2>NUL -del "output\release_fastbuild_vs2017\requireprebuildstep.elf" >NUL 2>NUL -del "output\release_fastbuild_vs2017\requireprebuildstep.exp" >NUL 2>NUL -del "output\release_fastbuild_vs2017\requireprebuildstep.ilk" >NUL 2>NUL -del "output\release_fastbuild_vs2017\requireprebuildstep.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\requireprebuildstep.pdb" >NUL 2>NUL - output\release_fastbuild_vs2017\requireprebuildstep.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean RequirePreBuildStep_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_vs2019\requireprebuildstep\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_vs2019\requireprebuildstep\*.obj" >NUL 2>NUL +del "build\release_fastbuild_vs2019\requireprebuildstep\*.a" >NUL 2>NUL +del "build\release_fastbuild_vs2019\requireprebuildstep\*.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\requireprebuildstep.exe" >NUL 2>NUL +del "output\release_fastbuild_vs2019\requireprebuildstep.elf" >NUL 2>NUL +del "output\release_fastbuild_vs2019\requireprebuildstep.exp" >NUL 2>NUL +del "output\release_fastbuild_vs2019\requireprebuildstep.ilk" >NUL 2>NUL +del "output\release_fastbuild_vs2019\requireprebuildstep.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\requireprebuildstep.pdb" >NUL 2>NUL + output\release_fastbuild_vs2019\requireprebuildstep.exe NDEBUG;WIN64;_CONSOLE generated requireprebuildstep.exe - + requireprebuildstep - output\release_msbuild_vs2017\ - build\release_msbuild_vs2017\requireprebuildstep\ + output\release_msbuild_vs2019\ + build\release_msbuild_vs2019\requireprebuildstep\ .exe true false - output\release_msbuild_vs2017\requireprebuildstep.exe + output\release_msbuild_vs2019\requireprebuildstep.exe false false - + NotUsing Level4 @@ -242,16 +242,16 @@ del "output\release_fastbuild_vs2017\requireprebuildstep.pdb" >NUL 2>NULCdecl Default /Zc:__cplusplus - build\debug_msbuild_vs2017\requireprebuildstep\requireprebuildstep_compiler.pdb + build\debug_msbuild_vs2019\requireprebuildstep\requireprebuildstep_compiler.pdb MultiThreadedDebug Console true - output\debug_msbuild_vs2017\requireprebuildstep.exe + output\debug_msbuild_vs2019\requireprebuildstep.exe NotSet - build\debug_msbuild_vs2017\requireprebuildstep\requireprebuildstep.intermediate.manifest - output\debug_msbuild_vs2017\requireprebuildstep.pdb + build\debug_msbuild_vs2019\requireprebuildstep\requireprebuildstep.intermediate.manifest + output\debug_msbuild_vs2019\requireprebuildstep.pdb true false false @@ -276,10 +276,10 @@ del "output\release_fastbuild_vs2017\requireprebuildstep.pdb" >NUL 2>NULfalse true - output\debug_msbuild_vs2017\requireprebuildstep.map + output\debug_msbuild_vs2019\requireprebuildstep.map - + NotUsing Level4 @@ -303,7 +303,6 @@ del "output\release_fastbuild_vs2017\requireprebuildstep.pdb" >NUL 2>NULfalse false true - false false false Default @@ -327,16 +326,16 @@ del "output\release_fastbuild_vs2017\requireprebuildstep.pdb" >NUL 2>NULCdecl Default /Zc:__cplusplus - build\release_msbuild_vs2017\requireprebuildstep\requireprebuildstep_compiler.pdb + build\release_msbuild_vs2019\requireprebuildstep\requireprebuildstep_compiler.pdb MultiThreaded Console true - output\release_msbuild_vs2017\requireprebuildstep.exe + output\release_msbuild_vs2019\requireprebuildstep.exe NotSet - build\release_msbuild_vs2017\requireprebuildstep\requireprebuildstep.intermediate.manifest - output\release_msbuild_vs2017\requireprebuildstep.pdb + build\release_msbuild_vs2019\requireprebuildstep\requireprebuildstep.intermediate.manifest + output\release_msbuild_vs2019\requireprebuildstep.pdb true false false @@ -361,7 +360,7 @@ del "output\release_fastbuild_vs2017\requireprebuildstep.pdb" >NUL 2>NULfalse true - output\release_msbuild_vs2017\requireprebuildstep.map + output\release_msbuild_vs2019\requireprebuildstep.map @@ -370,7 +369,7 @@ del "output\release_fastbuild_vs2017\requireprebuildstep.pdb" >NUL 2>NUL - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.vcxproj.filters b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.vcxproj.filters similarity index 73% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.vcxproj.filters rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.vcxproj.filters index 976ba324f..2d5bf9c4a 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.vcxproj.filters +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.vcxproj.filters @@ -1,5 +1,5 @@  - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.bff similarity index 87% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.bff index 039bb9b68..40e2c87f2 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.bff @@ -10,22 +10,22 @@ #if WIN64 //================================================================================================================= -ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -40,7 +40,6 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_wi // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -55,7 +54,7 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_wi + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -100,12 +99,12 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_wi //================================================================================================================= -Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\' - .Libraries = 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\' + .Libraries = 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -113,10 +112,10 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_wi // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -137,12 +136,12 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_wi // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -167,29 +166,29 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_wi //================================================================================================================= -Alias( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_win64' ) { - .Targets = 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .Targets = 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -204,7 +203,6 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_ // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -219,7 +217,7 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_ + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -265,12 +263,12 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_ //================================================================================================================= -Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\' - .Libraries = 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\' + .Libraries = 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -278,10 +276,10 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_ // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -302,12 +300,12 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_ // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -332,9 +330,9 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_ //================================================================================================================= -Alias( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_win64' ) { - .Targets = 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .Targets = 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_win64_Executable' } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.vcxproj similarity index 76% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.vcxproj index cab4d8615..baa479312 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.vcxproj @@ -1,60 +1,60 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_MSBuild_vs2017 + + Debug_MSBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_MSBuild_vs2017 + + Release_MSBuild_vs2019 x64 - {51338055-3ACC-BA7F-9658-06DC5B06394E} + {9BA0D009-9D4F-6BD1-2245-32F2E42A6FA5} en-US SpanMultipleSrcDirsFBNoBlobExclude SpanMultipleSrcDirsFBNoBlobExclude - 10.0.10586.0 + 10.0.16299.0 - + Makefile true MultiByte false - v141 + v142 - + Application true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Application false MultiByte false - v141 + v142 @@ -63,73 +63,73 @@ - - output\debug_fastbuild_noblob_vs2017\ - build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\ + + output\debug_fastbuild_noblob_vs2019\ + build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\*.a" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.exe" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.elf" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.exp" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.ilk" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.pdb" >NUL 2>NUL - output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\*.a" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.exe" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.elf" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.exp" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.ilk" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.pdb" >NUL 2>NUL + output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.exe WIN64;_CONSOLE;_DEBUG ..\codebase\spanmultiplesrcdirs\additional_dir;..\codebase\spanmultiplesrcdirs\dir_individual_files spanmultiplesrcdirsfbnoblobexclude.exe - + spanmultiplesrcdirsfbnoblobexclude - output\debug_msbuild_vs2017\ - build\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude\ + output\debug_msbuild_vs2019\ + build\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude\ .exe true false - output\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude.exe + output\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude.exe false false - - output\release_fastbuild_noblob_vs2017\ - build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\ + + output\release_fastbuild_noblob_vs2019\ + build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\*.obj" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\*.a" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude\*.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.exe" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.elf" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.exp" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.ilk" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.pdb" >NUL 2>NUL - output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\*.obj" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\*.a" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\*.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.exe" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.elf" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.exp" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.ilk" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.pdb" >NUL 2>NUL + output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude.exe NDEBUG;WIN64;_CONSOLE ..\codebase\spanmultiplesrcdirs\additional_dir;..\codebase\spanmultiplesrcdirs\dir_individual_files spanmultiplesrcdirsfbnoblobexclude.exe - + spanmultiplesrcdirsfbnoblobexclude - output\release_msbuild_vs2017\ - build\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude\ + output\release_msbuild_vs2019\ + build\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude\ .exe true false - output\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude.exe + output\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude.exe false false - + NotUsing Level4 @@ -176,16 +176,16 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.p Cdecl Default /Zc:__cplusplus - build\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude_compiler.pdb + build\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude_compiler.pdb MultiThreadedDebug Console true - output\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude.exe + output\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude.exe NotSet - build\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude.intermediate.manifest - output\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude.pdb + build\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude.intermediate.manifest + output\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude.pdb true false false @@ -210,10 +210,10 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.p false true - output\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude.map + output\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude.map - + NotUsing Level4 @@ -237,7 +237,6 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.p false false true - false false false Default @@ -261,16 +260,16 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.p Cdecl Default /Zc:__cplusplus - build\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude_compiler.pdb + build\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude_compiler.pdb MultiThreaded Console true - output\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude.exe + output\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude.exe NotSet - build\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude.intermediate.manifest - output\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude.pdb + build\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude.intermediate.manifest + output\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude.pdb true false false @@ -295,7 +294,7 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.p false true - output\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobexclude.map + output\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobexclude.map @@ -314,7 +313,7 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobexclude.p - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.vcxproj.filters b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.vcxproj.filters similarity index 96% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.vcxproj.filters rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.vcxproj.filters index 9de02e36c..cb39e442c 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.vcxproj.filters +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.vcxproj.filters @@ -1,5 +1,5 @@  - + additional_dir diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.bff similarity index 87% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.bff index 6439e85b2..fa8eae75c 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.bff @@ -10,22 +10,22 @@ #if WIN64 //================================================================================================================= -ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -40,7 +40,6 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_wi // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -55,7 +54,7 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_wi + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -97,12 +96,12 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_wi //================================================================================================================= -Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\' - .Libraries = 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\' + .Libraries = 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -110,10 +109,10 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_wi // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -134,12 +133,12 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_wi // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -164,29 +163,29 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_wi //================================================================================================================= -Alias( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_win64' ) { - .Targets = 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .Targets = 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -201,7 +200,6 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_ // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -216,7 +214,7 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_ + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -259,12 +257,12 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_ //================================================================================================================= -Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\' - .Libraries = 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\' + .Libraries = 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -272,10 +270,10 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_ // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -296,12 +294,12 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_ // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -326,9 +324,9 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_ //================================================================================================================= -Alias( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_win64' ) { - .Targets = 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .Targets = 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_win64_Executable' } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.vcxproj similarity index 76% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.vcxproj index 5792629da..b8eb602e9 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.vcxproj @@ -1,60 +1,60 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_MSBuild_vs2017 + + Debug_MSBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_MSBuild_vs2017 + + Release_MSBuild_vs2019 x64 - {573CBFD5-C93E-15F6-9BFE-132BA37EAE47} + {8DF6E677-91F0-4434-28CE-36FEC6B2B858} en-US SpanMultipleSrcDirsFBNoBlobInclude SpanMultipleSrcDirsFBNoBlobInclude - 10.0.10586.0 + 10.0.16299.0 - + Makefile true MultiByte false - v141 + v142 - + Application true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Application false MultiByte false - v141 + v142 @@ -63,73 +63,73 @@ - - output\debug_fastbuild_noblob_vs2017\ - build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\ + + output\debug_fastbuild_noblob_vs2019\ + build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\*.a" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.exe" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.elf" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.exp" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.ilk" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.pdb" >NUL 2>NUL - output\debug_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\*.a" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.exe" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.elf" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.exp" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.ilk" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.pdb" >NUL 2>NUL + output\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.exe WIN64;_CONSOLE;_DEBUG ..\codebase\spanmultiplesrcdirs\additional_dir;..\codebase\spanmultiplesrcdirs\dir_individual_files spanmultiplesrcdirsfbnoblobinclude.exe - + spanmultiplesrcdirsfbnoblobinclude - output\debug_msbuild_vs2017\ - build\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude\ + output\debug_msbuild_vs2019\ + build\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude\ .exe true false - output\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude.exe + output\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude.exe false false - - output\release_fastbuild_noblob_vs2017\ - build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\ + + output\release_fastbuild_noblob_vs2019\ + build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\*.obj" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\*.a" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude\*.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.exe" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.elf" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.exp" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.ilk" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.pdb" >NUL 2>NUL - output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\*.obj" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\*.a" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\*.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.exe" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.elf" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.exp" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.ilk" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.pdb" >NUL 2>NUL + output\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude.exe NDEBUG;WIN64;_CONSOLE ..\codebase\spanmultiplesrcdirs\additional_dir;..\codebase\spanmultiplesrcdirs\dir_individual_files spanmultiplesrcdirsfbnoblobinclude.exe - + spanmultiplesrcdirsfbnoblobinclude - output\release_msbuild_vs2017\ - build\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude\ + output\release_msbuild_vs2019\ + build\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude\ .exe true false - output\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude.exe + output\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude.exe false false - + NotUsing Level4 @@ -176,16 +176,16 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.p Cdecl Default /Zc:__cplusplus - build\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude_compiler.pdb + build\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude_compiler.pdb MultiThreadedDebug Console true - output\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude.exe + output\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude.exe NotSet - build\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude.intermediate.manifest - output\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude.pdb + build\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude.intermediate.manifest + output\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude.pdb true false false @@ -210,10 +210,10 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.p false true - output\debug_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude.map + output\debug_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude.map - + NotUsing Level4 @@ -237,7 +237,6 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.p false false true - false false false Default @@ -261,16 +260,16 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.p Cdecl Default /Zc:__cplusplus - build\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude_compiler.pdb + build\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude_compiler.pdb MultiThreaded Console true - output\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude.exe + output\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude.exe NotSet - build\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude.intermediate.manifest - output\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude.pdb + build\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude.intermediate.manifest + output\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude.pdb true false false @@ -295,7 +294,7 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.p false true - output\release_msbuild_vs2017\spanmultiplesrcdirsfbnoblobinclude.map + output\release_msbuild_vs2019\spanmultiplesrcdirsfbnoblobinclude.map @@ -314,7 +313,7 @@ del "output\release_fastbuild_noblob_vs2017\spanmultiplesrcdirsfbnoblobinclude.p - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.vcxproj.filters b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.vcxproj.filters similarity index 96% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.vcxproj.filters rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.vcxproj.filters index 9de02e36c..cb39e442c 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.vcxproj.filters +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.vcxproj.filters @@ -1,5 +1,5 @@  - + additional_dir diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2019_win64.bff similarity index 87% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2019_win64.bff index f7179e11c..3c715ff39 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2019_win64.bff @@ -27,22 +27,22 @@ Unity( 'SpanMultipleSrcDirsFBUnityExclude_unity' ) #if WIN64 //================================================================================================================= -ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64_objects' ) +ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -57,7 +57,6 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64_obje // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -72,7 +71,7 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64_obje + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\spanmultiplesrcdirsfbunityexclude_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\spanmultiplesrcdirsfbunityexclude_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -106,12 +105,12 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64_obje //================================================================================================================= -Executable( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64_Executable' ) +Executable( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\' - .Libraries = 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\' + .Libraries = 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -119,10 +118,10 @@ Executable( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64_Exec // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -143,12 +142,12 @@ Executable( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64_Exec // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\spanmultiplesrcdirsfbunityexclude.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\spanmultiplesrcdirsfbunityexclude.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -173,29 +172,29 @@ Executable( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64_Exec //================================================================================================================= -Alias( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64' ) +Alias( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64' ) { - .Targets = 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64_Executable' + .Targets = 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64_objects' ) +ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -210,7 +209,6 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64_ob // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -225,7 +223,7 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64_ob + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\spanmultiplesrcdirsfbunityexclude_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\spanmultiplesrcdirsfbunityexclude_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -260,12 +258,12 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64_ob //================================================================================================================= -Executable( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64_Executable' ) +Executable( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\' - .Libraries = 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\' + .Libraries = 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -273,10 +271,10 @@ Executable( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64_Ex // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -297,12 +295,12 @@ Executable( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64_Ex // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\spanmultiplesrcdirsfbunityexclude.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\spanmultiplesrcdirsfbunityexclude.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -327,9 +325,9 @@ Executable( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64_Ex //================================================================================================================= -Alias( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64' ) +Alias( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64' ) { - .Targets = 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64_Executable' + .Targets = 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64_Executable' } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2019_win64.vcxproj similarity index 51% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2019_win64.vcxproj index 15a0d034d..e0efd62fe 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2019_win64.vcxproj @@ -1,35 +1,35 @@ - + - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 - {7D8A189A-C043-D9EA-2CD4-C5DA529D56F9} + {09B70182-6E14-896B-E2DF-B4874B8125B1} en-US SpanMultipleSrcDirsFBUnityExclude SpanMultipleSrcDirsFBUnityExclude - + Makefile true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 @@ -38,52 +38,52 @@ - - output\debug_fastbuild_vs2017\ - build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\ + + output\debug_fastbuild_vs2019\ + build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\*.a" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.exe" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.elf" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.exp" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.ilk" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.pdb" >NUL 2>NUL - output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\*.a" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.exe" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.elf" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.exp" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.ilk" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.pdb" >NUL 2>NUL + output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.exe WIN64;_CONSOLE;_DEBUG ..\codebase\spanmultiplesrcdirs\additional_dir;..\codebase\spanmultiplesrcdirs\dir_individual_files spanmultiplesrcdirsfbunityexclude.exe - - output\release_fastbuild_vs2017\ - build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\ + + output\release_fastbuild_vs2019\ + build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\*.obj" >NUL 2>NUL -del "build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\*.a" >NUL 2>NUL -del "build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude\*.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.exe" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.elf" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.exp" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.ilk" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.pdb" >NUL 2>NUL - output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityexclude.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\*.obj" >NUL 2>NUL +del "build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\*.a" >NUL 2>NUL +del "build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\*.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.exe" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.elf" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.exp" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.ilk" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.pdb" >NUL 2>NUL + output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude.exe NDEBUG;WIN64;_CONSOLE ..\codebase\spanmultiplesrcdirs\additional_dir;..\codebase\spanmultiplesrcdirs\dir_individual_files spanmultiplesrcdirsfbunityexclude.exe - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2019_win64.bff similarity index 87% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2019_win64.bff index 9af4167ec..3449db6b8 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2019_win64.bff @@ -28,22 +28,22 @@ Unity( 'SpanMultipleSrcDirsFBUnityInclude_unity' ) #if WIN64 //================================================================================================================= -ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64_objects' ) +ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -58,7 +58,6 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64_obje // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -73,7 +72,7 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64_obje + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\spanmultiplesrcdirsfbunityinclude_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\spanmultiplesrcdirsfbunityinclude_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -107,12 +106,12 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64_obje //================================================================================================================= -Executable( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64_Executable' ) +Executable( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\' - .Libraries = 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\' + .Libraries = 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -120,10 +119,10 @@ Executable( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64_Exec // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -144,12 +143,12 @@ Executable( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64_Exec // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\spanmultiplesrcdirsfbunityinclude.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\spanmultiplesrcdirsfbunityinclude.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -174,29 +173,29 @@ Executable( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64_Exec //================================================================================================================= -Alias( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64' ) +Alias( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64' ) { - .Targets = 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64_Executable' + .Targets = 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64_objects' ) +ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\' .CompilerExtraOptions = '' // General options // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -211,7 +210,6 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64_ob // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -226,7 +224,7 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64_ob + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\spanmultiplesrcdirsfbunityinclude_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\spanmultiplesrcdirsfbunityinclude_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -261,12 +259,12 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64_ob //================================================================================================================= -Executable( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64_Executable' ) +Executable( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\' - .Libraries = 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.exe' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\' + .Libraries = 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64_objects' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -274,10 +272,10 @@ Executable( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64_Ex // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -298,12 +296,12 @@ Executable( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64_Ex // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\spanmultiplesrcdirsfbunityinclude.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\spanmultiplesrcdirsfbunityinclude.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -328,9 +326,9 @@ Executable( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64_Ex //================================================================================================================= -Alias( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64' ) +Alias( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64' ) { - .Targets = 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64_Executable' + .Targets = 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64_Executable' } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2019_win64.vcxproj similarity index 51% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2019_win64.vcxproj index 4cfc311f9..5c5459e99 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2019_win64.vcxproj @@ -1,35 +1,35 @@ - + - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 - {4CB12B72-2C37-A067-2236-AC7AA2926DE3} + {4CAA3DED-3DBD-71FD-8F76-B3B8ADFA2035} en-US SpanMultipleSrcDirsFBUnityInclude SpanMultipleSrcDirsFBUnityInclude - + Makefile true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 @@ -38,52 +38,52 @@ - - output\debug_fastbuild_vs2017\ - build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\ + + output\debug_fastbuild_vs2019\ + build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\*.a" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.exe" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.elf" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.exp" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.ilk" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.pdb" >NUL 2>NUL - output\debug_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\*.a" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.exe" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.elf" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.exp" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.ilk" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.pdb" >NUL 2>NUL + output\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.exe WIN64;_CONSOLE;_DEBUG ..\codebase\spanmultiplesrcdirs\additional_dir;..\codebase\spanmultiplesrcdirs\dir_individual_files spanmultiplesrcdirsfbunityinclude.exe - - output\release_fastbuild_vs2017\ - build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\ + + output\release_fastbuild_vs2019\ + build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\*.obj" >NUL 2>NUL -del "build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\*.a" >NUL 2>NUL -del "build\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude\*.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.exe" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.elf" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.exp" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.ilk" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.pdb" >NUL 2>NUL - output\release_fastbuild_vs2017\spanmultiplesrcdirsfbunityinclude.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\*.obj" >NUL 2>NUL +del "build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\*.a" >NUL 2>NUL +del "build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\*.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.exe" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.elf" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.exp" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.ilk" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.pdb" >NUL 2>NUL + output\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude.exe NDEBUG;WIN64;_CONSOLE ..\codebase\spanmultiplesrcdirs\additional_dir;..\codebase\spanmultiplesrcdirs\dir_individual_files spanmultiplesrcdirsfbunityinclude.exe - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2017_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.bff similarity index 86% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2017_win64.bff rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.bff index 492c02559..430d4eb92 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2017_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.bff @@ -22,20 +22,20 @@ Unity( 'UsePrecompExe_FastBuildUnitys_unity' ) #if WIN64 //================================================================================================================= -ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' ) +ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -51,7 +51,6 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -66,7 +65,7 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\useprecompexe\useprecompexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\useprecompexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -90,7 +89,7 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' ) // Precompiled Headers options // --------------------------- .PCHInputFile = '.\$_CURRENT_BFF_DIR_$\..\codebase\UsePrecompExe\precomp.cpp' - .PCHOutputFile = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\useprecompexe\UsePrecompExe.pch' + .PCHOutputFile = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\UsePrecompExe.pch' .PCHOptions = '"%1" /Fp"%2" /Fo"%3" /c' + ' /Yc"precomp.h"' + ' $CompilerExtraOptions$' @@ -115,20 +114,20 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' ) //================================================================================================================= -ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -144,7 +143,6 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -159,7 +157,7 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\useprecompexe\useprecompexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\useprecompexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -196,15 +194,15 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\' .Libraries = { - 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects', - 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' + 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects', + 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_objects' } - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\useprecompexe.exe' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\useprecompexe.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -212,10 +210,10 @@ Executable( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -236,12 +234,12 @@ Executable( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2017\useprecompexe\useprecompexe.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\useprecompexe.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\useprecompexe.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2017\useprecompexe.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\useprecompexe.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\useprecompexe.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -266,27 +264,27 @@ Executable( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_Executable' ) //================================================================================================================= -Alias( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64' ) { - .Targets = 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64_Executable' + .Targets = 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' ) +ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -302,7 +300,6 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -317,7 +314,7 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\useprecompexe\useprecompexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\useprecompexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -342,7 +339,7 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' ) // Precompiled Headers options // --------------------------- .PCHInputFile = '.\$_CURRENT_BFF_DIR_$\..\codebase\UsePrecompExe\precomp.cpp' - .PCHOutputFile = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\useprecompexe\UsePrecompExe.pch' + .PCHOutputFile = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\UsePrecompExe.pch' .PCHOptions = '"%1" /Fp"%2" /Fo"%3" /c' + ' /Yc"precomp.h"' + ' $CompilerExtraOptions$' @@ -367,20 +364,20 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' ) //================================================================================================================= -ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_objects' ) +ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -396,7 +393,6 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -411,7 +407,7 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\useprecompexe\useprecompexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\useprecompexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -449,15 +445,15 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) +Executable( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\' .Libraries = { - 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects', - 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_objects' + 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects', + 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_objects' } - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\useprecompexe.exe' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\useprecompexe.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -465,10 +461,10 @@ Executable( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -489,12 +485,12 @@ Executable( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2017\useprecompexe\useprecompexe.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\useprecompexe.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\useprecompexe.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2017\useprecompexe.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\useprecompexe.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\useprecompexe.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -519,27 +515,27 @@ Executable( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_Executable' ) //================================================================================================================= -Alias( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64' ) +Alias( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64' ) { - .Targets = 'UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64_Executable' + .Targets = 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_0_objects' ) +ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2019_win64_0_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -555,7 +551,6 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_0_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -570,7 +565,7 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_0_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\useprecompexe\useprecompexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\useprecompexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -594,7 +589,7 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_0_objects' ) // Precompiled Headers options // --------------------------- .PCHInputFile = '.\$_CURRENT_BFF_DIR_$\..\codebase\UsePrecompExe\precomp.cpp' - .PCHOutputFile = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\useprecompexe\UsePrecompExe.pch' + .PCHOutputFile = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\UsePrecompExe.pch' .PCHOptions = '"%1" /Fp"%2" /Fo"%3" /c' + ' /Yc"precomp.h"' + ' $CompilerExtraOptions$' @@ -616,20 +611,20 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_0_objects' ) //================================================================================================================= -ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_objects' ) +ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -645,7 +640,6 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm' + ' /MTd' + ' /GS' + ' /Gy-' @@ -660,7 +654,7 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\useprecompexe\useprecompexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\useprecompexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -697,15 +691,15 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_Executable' ) +Executable( 'UsePrecompExe_Debug_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\' .Libraries = { - 'UsePrecompExe_Debug_FastBuild_vs2017_win64_0_objects', - 'UsePrecompExe_Debug_FastBuild_vs2017_win64_objects' + 'UsePrecompExe_Debug_FastBuild_vs2019_win64_0_objects', + 'UsePrecompExe_Debug_FastBuild_vs2019_win64_objects' } - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\useprecompexe.exe' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\useprecompexe.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -713,10 +707,10 @@ Executable( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -737,12 +731,12 @@ Executable( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2017\useprecompexe\useprecompexe.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\useprecompexe.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\useprecompexe.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2017\useprecompexe.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\useprecompexe.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\useprecompexe.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -767,27 +761,27 @@ Executable( 'UsePrecompExe_Debug_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -Alias( 'UsePrecompExe_Debug_FastBuild_vs2017_win64' ) +Alias( 'UsePrecompExe_Debug_FastBuild_vs2019_win64' ) { - .Targets = 'UsePrecompExe_Debug_FastBuild_vs2017_win64_Executable' + .Targets = 'UsePrecompExe_Debug_FastBuild_vs2019_win64_Executable' } //================================================================================================================= -ObjectList( 'UsePrecompExe_Release_FastBuild_vs2017_win64_0_objects' ) +ObjectList( 'UsePrecompExe_Release_FastBuild_vs2019_win64_0_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -803,7 +797,6 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2017_win64_0_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -818,7 +811,7 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2017_win64_0_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\useprecompexe\useprecompexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\useprecompexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -843,7 +836,7 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2017_win64_0_objects' ) // Precompiled Headers options // --------------------------- .PCHInputFile = '.\$_CURRENT_BFF_DIR_$\..\codebase\UsePrecompExe\precomp.cpp' - .PCHOutputFile = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\useprecompexe\UsePrecompExe.pch' + .PCHOutputFile = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\UsePrecompExe.pch' .PCHOptions = '"%1" /Fp"%2" /Fo"%3" /c' + ' /Yc"precomp.h"' + ' $CompilerExtraOptions$' @@ -865,20 +858,20 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2017_win64_0_objects' ) //================================================================================================================= -ObjectList( 'UsePrecompExe_Release_FastBuild_vs2017_win64_objects' ) +ObjectList( 'UsePrecompExe_Release_FastBuild_vs2019_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\' .CompilerExtraOptions = '' // General options // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"' - + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"' + + ' /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"' + ' /Zi' + ' /nologo' + ' /W4' @@ -894,7 +887,6 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2017_win64_objects' ) // Code Generation options // --------------------------- + ' /GF' - + ' /Gm-' + ' /MT' + ' /GS-' + ' /Gy' @@ -909,7 +901,7 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2017_win64_objects' ) + ' /openmp-' // Output Files options // --------------------------- - + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\useprecompexe\useprecompexe_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\useprecompexe_compiler.pdb"' // Advanced options // --------------------------- + ' /Gd' @@ -947,15 +939,15 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2017_win64_objects' ) //================================================================================================================= -Executable( 'UsePrecompExe_Release_FastBuild_vs2017_win64_Executable' ) +Executable( 'UsePrecompExe_Release_FastBuild_vs2019_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\useprecompexe\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\' .Libraries = { - 'UsePrecompExe_Release_FastBuild_vs2017_win64_0_objects', - 'UsePrecompExe_Release_FastBuild_vs2017_win64_objects' + 'UsePrecompExe_Release_FastBuild_vs2019_win64_0_objects', + 'UsePrecompExe_Release_FastBuild_vs2019_win64_objects' } - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\useprecompexe.exe' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\useprecompexe.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -963,10 +955,10 @@ Executable( 'UsePrecompExe_Release_FastBuild_vs2017_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"' + + ' /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"' // Input // --------------------------- + ' "kernel32.lib"' @@ -987,12 +979,12 @@ Executable( 'UsePrecompExe_Release_FastBuild_vs2017_win64_Executable' ) // Manifest // --------------------------- + ' /MANIFEST /MANIFESTUAC:"level=^'asInvoker^' uiAccess=^'false^'"' - + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2017\useprecompexe\useprecompexe.intermediate.manifest"' + + ' /ManifestFile:".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\useprecompexe.intermediate.manifest"' // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\useprecompexe.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2017\useprecompexe.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\useprecompexe.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\useprecompexe.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -1017,9 +1009,9 @@ Executable( 'UsePrecompExe_Release_FastBuild_vs2017_win64_Executable' ) //================================================================================================================= -Alias( 'UsePrecompExe_Release_FastBuild_vs2017_win64' ) +Alias( 'UsePrecompExe_Release_FastBuild_vs2019_win64' ) { - .Targets = 'UsePrecompExe_Release_FastBuild_vs2017_win64_Executable' + .Targets = 'UsePrecompExe_Release_FastBuild_vs2019_win64_Executable' } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2017_win64.vcxproj b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.vcxproj similarity index 66% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2017_win64.vcxproj rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.vcxproj index 13f9b7fe0..a966c5c32 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2017_win64.vcxproj +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.vcxproj @@ -1,82 +1,82 @@ - + - - Debug_FastBuild_NoBlob_vs2017 + + Debug_FastBuild_NoBlob_vs2019 x64 - - Debug_FastBuild_vs2017 + + Debug_FastBuild_vs2019 x64 - - Debug_MSBuild_vs2017 + + Debug_MSBuild_vs2019 x64 - - Release_FastBuild_NoBlob_vs2017 + + Release_FastBuild_NoBlob_vs2019 x64 - - Release_FastBuild_vs2017 + + Release_FastBuild_vs2019 x64 - - Release_MSBuild_vs2017 + + Release_MSBuild_vs2019 x64 - {099CE96F-04EC-E083-89C0-CE8DDBD8A1BB} + {3B88798D-8E0B-330F-7C31-7F761D686B03} en-US UsePrecompExe UsePrecompExe - 10.0.10586.0 + 10.0.16299.0 - + Makefile true MultiByte false - v141 + v142 - + Makefile true MultiByte false - v141 + v142 - + Application true MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Makefile false MultiByte false - v141 + v142 - + Application false MultiByte false - v141 + v142 @@ -85,113 +85,113 @@ - - output\debug_fastbuild_noblob_vs2017\ - build\debug_fastbuild_noblob_vs2017\useprecompexe\ + + output\debug_fastbuild_noblob_vs2019\ + build\debug_fastbuild_noblob_vs2019\useprecompexe\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean UsePrecompExe_Debug_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_noblob_vs2017\useprecompexe\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\useprecompexe\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\useprecompexe\*.a" >NUL 2>NUL -del "build\debug_fastbuild_noblob_vs2017\useprecompexe\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\useprecompexe.exe" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\useprecompexe.elf" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\useprecompexe.exp" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\useprecompexe.ilk" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\useprecompexe.lib" >NUL 2>NUL -del "output\debug_fastbuild_noblob_vs2017\useprecompexe.pdb" >NUL 2>NUL - output\debug_fastbuild_noblob_vs2017\useprecompexe.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_noblob_vs2019\useprecompexe\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\useprecompexe\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\useprecompexe\*.a" >NUL 2>NUL +del "build\debug_fastbuild_noblob_vs2019\useprecompexe\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\useprecompexe.exe" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\useprecompexe.elf" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\useprecompexe.exp" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\useprecompexe.ilk" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\useprecompexe.lib" >NUL 2>NUL +del "output\debug_fastbuild_noblob_vs2019\useprecompexe.pdb" >NUL 2>NUL + output\debug_fastbuild_noblob_vs2019\useprecompexe.exe SOME_UTILITY_STRING="UTIL FUNC";WIN64;_CONSOLE;_DEBUG useprecompexe.exe - - output\debug_fastbuild_vs2017\ - build\debug_fastbuild_vs2017\useprecompexe\ + + output\debug_fastbuild_vs2019\ + build\debug_fastbuild_vs2019\useprecompexe\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe UsePrecompExe_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe UsePrecompExe_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean UsePrecompExe_Debug_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\debug_fastbuild_vs2017\useprecompexe\*unity*.cpp" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\useprecompexe\*.obj" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\useprecompexe\*.a" >NUL 2>NUL -del "build\debug_fastbuild_vs2017\useprecompexe\*.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\useprecompexe.exe" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\useprecompexe.elf" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\useprecompexe.exp" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\useprecompexe.ilk" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\useprecompexe.lib" >NUL 2>NUL -del "output\debug_fastbuild_vs2017\useprecompexe.pdb" >NUL 2>NUL - output\debug_fastbuild_vs2017\useprecompexe.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean UsePrecompExe_Debug_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\debug_fastbuild_vs2019\useprecompexe\*unity*.cpp" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\useprecompexe\*.obj" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\useprecompexe\*.a" >NUL 2>NUL +del "build\debug_fastbuild_vs2019\useprecompexe\*.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\useprecompexe.exe" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\useprecompexe.elf" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\useprecompexe.exp" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\useprecompexe.ilk" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\useprecompexe.lib" >NUL 2>NUL +del "output\debug_fastbuild_vs2019\useprecompexe.pdb" >NUL 2>NUL + output\debug_fastbuild_vs2019\useprecompexe.exe SOME_UTILITY_STRING="UTIL FUNC";WIN64;_CONSOLE;_DEBUG useprecompexe.exe - + useprecompexe - output\debug_msbuild_vs2017\ - build\debug_msbuild_vs2017\useprecompexe\ + output\debug_msbuild_vs2019\ + build\debug_msbuild_vs2019\useprecompexe\ .exe true false - output\debug_msbuild_vs2017\useprecompexe.exe + output\debug_msbuild_vs2019\useprecompexe.exe false false - - output\release_fastbuild_noblob_vs2017\ - build\release_fastbuild_noblob_vs2017\useprecompexe\ + + output\release_fastbuild_noblob_vs2019\ + build\release_fastbuild_noblob_vs2019\useprecompexe\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean UsePrecompExe_Release_FastBuild_NoBlob_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_noblob_vs2017\useprecompexe\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\useprecompexe\*.obj" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\useprecompexe\*.a" >NUL 2>NUL -del "build\release_fastbuild_noblob_vs2017\useprecompexe\*.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\useprecompexe.exe" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\useprecompexe.elf" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\useprecompexe.exp" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\useprecompexe.ilk" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\useprecompexe.lib" >NUL 2>NUL -del "output\release_fastbuild_noblob_vs2017\useprecompexe.pdb" >NUL 2>NUL - output\release_fastbuild_noblob_vs2017\useprecompexe.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_noblob_vs2019\useprecompexe\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\useprecompexe\*.obj" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\useprecompexe\*.a" >NUL 2>NUL +del "build\release_fastbuild_noblob_vs2019\useprecompexe\*.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\useprecompexe.exe" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\useprecompexe.elf" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\useprecompexe.exp" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\useprecompexe.ilk" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\useprecompexe.lib" >NUL 2>NUL +del "output\release_fastbuild_noblob_vs2019\useprecompexe.pdb" >NUL 2>NUL + output\release_fastbuild_noblob_vs2019\useprecompexe.exe NDEBUG;SOME_UTILITY_STRING="UTIL FUNC";WIN64;_CONSOLE useprecompexe.exe - - output\release_fastbuild_vs2017\ - build\release_fastbuild_vs2017\useprecompexe\ + + output\release_fastbuild_vs2019\ + build\release_fastbuild_vs2019\useprecompexe\ cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe UsePrecompExe_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe UsePrecompExe_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)..\..\..\tools\FastBuild\FBuild.exe -clean UsePrecompExe_Release_FastBuild_vs2017_win64 -ide -summary -wait -config $(SolutionName).bff - del "build\release_fastbuild_vs2017\useprecompexe\*unity*.cpp" >NUL 2>NUL -del "build\release_fastbuild_vs2017\useprecompexe\*.obj" >NUL 2>NUL -del "build\release_fastbuild_vs2017\useprecompexe\*.a" >NUL 2>NUL -del "build\release_fastbuild_vs2017\useprecompexe\*.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\useprecompexe.exe" >NUL 2>NUL -del "output\release_fastbuild_vs2017\useprecompexe.elf" >NUL 2>NUL -del "output\release_fastbuild_vs2017\useprecompexe.exp" >NUL 2>NUL -del "output\release_fastbuild_vs2017\useprecompexe.ilk" >NUL 2>NUL -del "output\release_fastbuild_vs2017\useprecompexe.lib" >NUL 2>NUL -del "output\release_fastbuild_vs2017\useprecompexe.pdb" >NUL 2>NUL - output\release_fastbuild_vs2017\useprecompexe.exe +$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe -clean UsePrecompExe_Release_FastBuild_vs2019_win64 -ide -summary -wait -config $(SolutionName).bff + del "build\release_fastbuild_vs2019\useprecompexe\*unity*.cpp" >NUL 2>NUL +del "build\release_fastbuild_vs2019\useprecompexe\*.obj" >NUL 2>NUL +del "build\release_fastbuild_vs2019\useprecompexe\*.a" >NUL 2>NUL +del "build\release_fastbuild_vs2019\useprecompexe\*.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\useprecompexe.exe" >NUL 2>NUL +del "output\release_fastbuild_vs2019\useprecompexe.elf" >NUL 2>NUL +del "output\release_fastbuild_vs2019\useprecompexe.exp" >NUL 2>NUL +del "output\release_fastbuild_vs2019\useprecompexe.ilk" >NUL 2>NUL +del "output\release_fastbuild_vs2019\useprecompexe.lib" >NUL 2>NUL +del "output\release_fastbuild_vs2019\useprecompexe.pdb" >NUL 2>NUL + output\release_fastbuild_vs2019\useprecompexe.exe NDEBUG;SOME_UTILITY_STRING="UTIL FUNC";WIN64;_CONSOLE useprecompexe.exe - + useprecompexe - output\release_msbuild_vs2017\ - build\release_msbuild_vs2017\useprecompexe\ + output\release_msbuild_vs2019\ + build\release_msbuild_vs2019\useprecompexe\ .exe true false - output\release_msbuild_vs2017\useprecompexe.exe + output\release_msbuild_vs2019\useprecompexe.exe false false - + Use Level4 @@ -238,17 +238,17 @@ del "output\release_fastbuild_vs2017\useprecompexe.pdb" >NUL 2>NULDefault /Zc:__cplusplus precomp.h - build\debug_msbuild_vs2017\useprecompexe\UsePrecompExe.pch - build\debug_msbuild_vs2017\useprecompexe\useprecompexe_compiler.pdb + build\debug_msbuild_vs2019\useprecompexe\UsePrecompExe.pch + build\debug_msbuild_vs2019\useprecompexe\useprecompexe_compiler.pdb MultiThreadedDebug Console true - output\debug_msbuild_vs2017\useprecompexe.exe + output\debug_msbuild_vs2019\useprecompexe.exe NotSet - build\debug_msbuild_vs2017\useprecompexe\useprecompexe.intermediate.manifest - output\debug_msbuild_vs2017\useprecompexe.pdb + build\debug_msbuild_vs2019\useprecompexe\useprecompexe.intermediate.manifest + output\debug_msbuild_vs2019\useprecompexe.pdb true false false @@ -273,10 +273,10 @@ del "output\release_fastbuild_vs2017\useprecompexe.pdb" >NUL 2>NULfalse true - output\debug_msbuild_vs2017\useprecompexe.map + output\debug_msbuild_vs2019\useprecompexe.map - + Use Level4 @@ -299,7 +299,6 @@ del "output\release_fastbuild_vs2017\useprecompexe.pdb" >NUL 2>NULfalse false true - false false false Default @@ -324,17 +323,17 @@ del "output\release_fastbuild_vs2017\useprecompexe.pdb" >NUL 2>NULDefault /Zc:__cplusplus precomp.h - build\release_msbuild_vs2017\useprecompexe\UsePrecompExe.pch - build\release_msbuild_vs2017\useprecompexe\useprecompexe_compiler.pdb + build\release_msbuild_vs2019\useprecompexe\UsePrecompExe.pch + build\release_msbuild_vs2019\useprecompexe\useprecompexe_compiler.pdb MultiThreaded Console true - output\release_msbuild_vs2017\useprecompexe.exe + output\release_msbuild_vs2019\useprecompexe.exe NotSet - build\release_msbuild_vs2017\useprecompexe\useprecompexe.intermediate.manifest - output\release_msbuild_vs2017\useprecompexe.pdb + build\release_msbuild_vs2019\useprecompexe\useprecompexe.intermediate.manifest + output\release_msbuild_vs2019\useprecompexe.pdb true false false @@ -359,7 +358,7 @@ del "output\release_fastbuild_vs2017\useprecompexe.pdb" >NUL 2>NULfalse true - output\release_msbuild_vs2017\useprecompexe.map + output\release_msbuild_vs2019\useprecompexe.map @@ -372,34 +371,34 @@ del "output\release_fastbuild_vs2017\useprecompexe.pdb" >NUL 2>NUL - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing - Create - Create - Create - Create - Create - Create + Create + Create + Create + Create + Create + Create - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing - + diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2017_win64.vcxproj.filters b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.vcxproj.filters similarity index 93% rename from Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2017_win64.vcxproj.filters rename to Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.vcxproj.filters index b78427fab..d6a2e3568 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2017_win64.vcxproj.filters +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.vcxproj.filters @@ -1,5 +1,5 @@  - + diff --git a/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsimpleexecutable_vs2017_win64.vcxproj b/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsimpleexecutable_vs2017_win64.vcxproj index 854481710..17ede1f16 100644 --- a/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsimpleexecutable_vs2017_win64.vcxproj +++ b/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsimpleexecutable_vs2017_win64.vcxproj @@ -42,9 +42,9 @@ output\win64\debug\ obj\win64\debug\ cd $(SolutionDir) -$(ProjectDir)tools\FastBuild\FBuild.exe FastBuildSimpleExecutable_Debug_win64 -ide -summary -config $(SolutionName).bff +$(ProjectDir)tools\FastBuild\Windows-x64\FBuild.exe FastBuildSimpleExecutable_Debug_win64 -ide -summary -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)tools\FastBuild\FBuild.exe -clean FastBuildSimpleExecutable_Debug_win64 -ide -summary -config $(SolutionName).bff +$(ProjectDir)tools\FastBuild\Windows-x64\FBuild.exe -clean FastBuildSimpleExecutable_Debug_win64 -ide -summary -config $(SolutionName).bff del "obj\win64\debug\*unity*.cpp" >NUL 2>NUL del "obj\win64\debug\*.obj" >NUL 2>NUL del "obj\win64\debug\*.a" >NUL 2>NUL @@ -63,9 +63,9 @@ del "output\win64\debug\fastbuildsimpleexecutable.pdb" >NUL 2>NULoutput\win64\release\ obj\win64\release\ cd $(SolutionDir) -$(ProjectDir)tools\FastBuild\FBuild.exe FastBuildSimpleExecutable_Release_win64 -ide -summary -config $(SolutionName).bff +$(ProjectDir)tools\FastBuild\Windows-x64\FBuild.exe FastBuildSimpleExecutable_Release_win64 -ide -summary -config $(SolutionName).bff cd $(SolutionDir) -$(ProjectDir)tools\FastBuild\FBuild.exe -clean FastBuildSimpleExecutable_Release_win64 -ide -summary -config $(SolutionName).bff +$(ProjectDir)tools\FastBuild\Windows-x64\FBuild.exe -clean FastBuildSimpleExecutable_Release_win64 -ide -summary -config $(SolutionName).bff del "obj\win64\release\*unity*.cpp" >NUL 2>NUL del "obj\win64\release\*.obj" >NUL 2>NUL del "obj\win64\release\*.a" >NUL 2>NUL