Skip to content

Commit 9447378

Browse files
belkissbelkiss
committed
Merge branch 'release-0.14.3'
2 parents a40bb76 + 9fadc55 commit 9447378

29 files changed

+651
-618
lines changed

‎Sharpmake.Application/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@
4343
//
4444
// You can specify all the values or you can default the Build and Revision Numbers
4545
// by using the '*' as shown below:
46-
[assembly: AssemblyVersion("0.14.2.0")]
46+
[assembly: AssemblyVersion("0.14.3.0")]

‎Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.bff‎

Lines changed: 88 additions & 88 deletions
Large diffs are not rendered by default.

‎Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.bff‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
2828
.CompilerExtraOptions = ''
2929
// General options
3030
// ---------------------------
31-
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
32-
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
33-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
34-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
35-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
36-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
31+
+ ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
32+
+ ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
33+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
34+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
35+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
36+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
3737
+ ' /Zi'
3838
+ ' /nologo'
3939
+ ' /W4'
@@ -42,9 +42,9 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
4242
// + ' /MP'
4343
// Preprocessor options
4444
// ---------------------------
45-
+ ' "/D_CONSOLE"'
46-
+ ' "/DWIN64"'
47-
+ ' "/D_DEBUG"'
45+
+ ' /D"WIN64"'
46+
+ ' /D"_CONSOLE"'
47+
+ ' /D"_DEBUG"'
4848
// Code Generation options
4949
// ---------------------------
5050
+ ' /GF'
@@ -110,10 +110,10 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_Executable
110110
// ---------------------------
111111
+ ' /INCREMENTAL:NO'
112112
+ ' /NOLOGO'
113-
+ ' "/LIBPATH:C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"'
114-
+ ' "/LIBPATH:C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"'
115-
+ ' "/LIBPATH:C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"'
116-
+ ' "/LIBPATH:C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"'
113+
+ ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"'
114+
+ ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"'
115+
+ ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"'
116+
+ ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"'
117117
// Input
118118
// ---------------------------
119119
+ ' "kernel32.lib"'
@@ -190,12 +190,12 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects'
190190
.CompilerExtraOptions = ''
191191
// General options
192192
// ---------------------------
193-
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
194-
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
195-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
196-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
197-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
198-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
193+
+ ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
194+
+ ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
195+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
196+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
197+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
198+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
199199
+ ' /Zi'
200200
+ ' /nologo'
201201
+ ' /W4'
@@ -204,9 +204,9 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects'
204204
// + ' /MP'
205205
// Preprocessor options
206206
// ---------------------------
207-
+ ' "/D_CONSOLE"'
208-
+ ' "/DWIN64"'
209-
+ ' "/DNDEBUG"'
207+
+ ' /D"NDEBUG"'
208+
+ ' /D"WIN64"'
209+
+ ' /D"_CONSOLE"'
210210
// Code Generation options
211211
// ---------------------------
212212
+ ' /GF'
@@ -273,10 +273,10 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_Executab
273273
// ---------------------------
274274
+ ' /INCREMENTAL:NO'
275275
+ ' /NOLOGO'
276-
+ ' "/LIBPATH:C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"'
277-
+ ' "/LIBPATH:C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"'
278-
+ ' "/LIBPATH:C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"'
279-
+ ' "/LIBPATH:C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"'
276+
+ ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"'
277+
+ ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"'
278+
+ ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"'
279+
+ ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"'
280280
// Input
281281
// ---------------------------
282282
+ ' "kernel32.lib"'
@@ -353,12 +353,12 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' )
353353
.CompilerExtraOptions = ''
354354
// General options
355355
// ---------------------------
356-
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
357-
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
358-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
359-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
360-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
361-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
356+
+ ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
357+
+ ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
358+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
359+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
360+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
361+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
362362
+ ' /Zi'
363363
+ ' /nologo'
364364
+ ' /W4'
@@ -367,9 +367,9 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' )
367367
// + ' /MP'
368368
// Preprocessor options
369369
// ---------------------------
370-
+ ' "/D_CONSOLE"'
371-
+ ' "/DWIN64"'
372-
+ ' "/D_DEBUG"'
370+
+ ' /D"WIN64"'
371+
+ ' /D"_CONSOLE"'
372+
+ ' /D"_DEBUG"'
373373
// Code Generation options
374374
// ---------------------------
375375
+ ' /GF'
@@ -435,10 +435,10 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_Executable' )
435435
// ---------------------------
436436
+ ' /INCREMENTAL:NO'
437437
+ ' /NOLOGO'
438-
+ ' "/LIBPATH:C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"'
439-
+ ' "/LIBPATH:C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"'
440-
+ ' "/LIBPATH:C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"'
441-
+ ' "/LIBPATH:C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"'
438+
+ ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"'
439+
+ ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"'
440+
+ ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"'
441+
+ ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"'
442442
// Input
443443
// ---------------------------
444444
+ ' "kernel32.lib"'
@@ -515,12 +515,12 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' )
515515
.CompilerExtraOptions = ''
516516
// General options
517517
// ---------------------------
518-
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
519-
+ ' "/IC:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
520-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
521-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
522-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
523-
+ ' "/IC:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
518+
+ ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\include"'
519+
+ ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\include"'
520+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\um"'
521+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\shared"'
522+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\winrt"'
523+
+ ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt"'
524524
+ ' /Zi'
525525
+ ' /nologo'
526526
+ ' /W4'
@@ -529,9 +529,9 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' )
529529
// + ' /MP'
530530
// Preprocessor options
531531
// ---------------------------
532-
+ ' "/D_CONSOLE"'
533-
+ ' "/DWIN64"'
534-
+ ' "/DNDEBUG"'
532+
+ ' /D"NDEBUG"'
533+
+ ' /D"WIN64"'
534+
+ ' /D"_CONSOLE"'
535535
// Code Generation options
536536
// ---------------------------
537537
+ ' /GF'
@@ -598,10 +598,10 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_Executable' )
598598
// ---------------------------
599599
+ ' /INCREMENTAL:NO'
600600
+ ' /NOLOGO'
601-
+ ' "/LIBPATH:C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"'
602-
+ ' "/LIBPATH:C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"'
603-
+ ' "/LIBPATH:C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"'
604-
+ ' "/LIBPATH:C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"'
601+
+ ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\lib\x64"'
602+
+ ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\atlmfc\lib\x64"'
603+
+ ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\ucrt\x64"'
604+
+ ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64"'
605605
// Input
606606
// ---------------------------
607607
+ ' "kernel32.lib"'

0 commit comments

Comments
 (0)