Skip to content

Commit

Permalink
Merge branch 'release-0.14.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@belkiss
belkiss committed Jul 20, 2020
2 parents a40bb76 + 9fadc55 commit 9447378
Show file tree
Hide file tree
Showing 29 changed files with 651 additions and 618 deletions.
2 changes: 1 addition & 1 deletion Sharpmake.Application/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.14.2.0")]
[assembly: AssemblyVersion("0.14.3.0")]
176 changes: 88 additions & 88 deletions ...FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.bff
View file

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions ...nalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.bff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
.CompilerExtraOptions = ''
// General options
// ---------------------------
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
+ ' /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"'
+ ' /Zi'
+ ' /nologo'
+ ' /W4'
Expand All @@ -42,9 +42,9 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
+ ' /D"WIN64"'
+ ' /D"_CONSOLE"'
+ ' /D"_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -110,10 +110,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\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"'
// Input
// ---------------------------
+ ' "kernel32.lib"'
Expand Down Expand Up @@ -190,12 +190,12 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects'
.CompilerExtraOptions = ''
// General options
// ---------------------------
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
+ ' /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"'
+ ' /Zi'
+ ' /nologo'
+ ' /W4'
Expand All @@ -204,9 +204,9 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects'
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
+ ' /D"NDEBUG"'
+ ' /D"WIN64"'
+ ' /D"_CONSOLE"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -273,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\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"'
// Input
// ---------------------------
+ ' "kernel32.lib"'
Expand Down Expand Up @@ -353,12 +353,12 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' )
.CompilerExtraOptions = ''
// General options
// ---------------------------
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
+ ' /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"'
+ ' /Zi'
+ ' /nologo'
+ ' /W4'
Expand All @@ -367,9 +367,9 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
+ ' /D"WIN64"'
+ ' /D"_CONSOLE"'
+ ' /D"_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -435,10 +435,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\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"'
// Input
// ---------------------------
+ ' "kernel32.lib"'
Expand Down Expand Up @@ -515,12 +515,12 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' )
.CompilerExtraOptions = ''
// General options
// ---------------------------
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
+ ' /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"'
+ ' /Zi'
+ ' /nologo'
+ ' /W4'
Expand All @@ -529,9 +529,9 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
+ ' /D"NDEBUG"'
+ ' /D"WIN64"'
+ ' /D"_CONSOLE"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -598,10 +598,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\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"'
// Input
// ---------------------------
+ ' "kernel32.lib"'
Expand Down
Loading

0 comments on commit 9447378

Please sign in to comment.