From aa65bce5eed67b0d02ad440895ab21a78d024a8a Mon Sep 17 00:00:00 2001 From: Chris Savoie Date: Mon, 7 Feb 2022 21:54:38 -0800 Subject: [PATCH] [Paths] Remove lower casing of paths which can cause issues on case sensitive platforms * Updated all sample projects except fastbuild since those include local installation into --- Sharpmake.UnitTests/UtilTest.cs | 34 ++++-------- Sharpmake/PathUtil.cs | 14 ++--- .../OtherCSharpProj.vs2017.v4_6_2.csproj | 8 +-- .../OtherCSharpProj.vs2019.v4_7_2.csproj | 8 +-- .../TestCSharpConsole.vs2017.v4_6_2.csproj | 8 +-- .../TestCSharpConsole.vs2019.v4_7_2.csproj | 8 +-- .../projects/clrcppproj.vs2017.v4_6_2.vcxproj | 32 +++++------ .../projects/clrcppproj.vs2019.v4_7_2.vcxproj | 32 +++++------ .../theemptycppproject.vs2017.v4_6_2.vcxproj | 20 +++---- .../theemptycppproject.vs2019.v4_7_2.vcxproj | 20 +++---- .../HelloWorldSolution.vs2017.v4_6_1.sln | 2 +- .../HelloWorld.vs2017.v4_6_1.csproj | 8 +-- .../CSharpImportsSolution.vs2019.v4_7_2.sln | 2 +- .../CSharpImports.vs2019.v4_7_2.csproj | 8 +-- .../CSharpVsixSolution.vs2017.v4_7_2.sln | 2 +- .../CSharpVsix.vs2017.v4_7_2.csproj | 10 ++-- .../csharpwcf/CSharpWCF.vs2015.v4_5_2.csproj | 8 +-- .../CSharpWCFApp.vs2015.v4_5_2.csproj | 8 +-- .../reference/projects/childproject.vcxproj | 14 ++--- .../reference/projects/foobarproject.vcxproj | 14 ++--- .../reference/projects/parentproject.vcxproj | 14 ++--- ...uildsample_vs2019_win64-globalsettings.bff | 55 +++---------------- ...fastbuildsimpleexecutable_vs2019_win64.bff | 40 +++++++------- ...buildsimpleexecutable_vs2019_win64.vcxproj | 52 +++++++++--------- .../projects/helloworld_vs2019_win32.vcxproj | 32 +++++------ .../projects/helloworld_vs2019_win64.vcxproj | 32 +++++------ ...elloWorldMultiFrameworkSolution.vs2019.sln | 2 +- .../HelloWorldSolution.vs2017.netcore2_1.sln | 2 +- .../HelloWorldSolution.vs2019.netcore3_1.sln | 2 +- .../HelloWorld.vs2017.netcore2_1.csproj | 8 +-- .../HelloWorld.vs2019.netcore3_1.csproj | 8 +-- .../HelloWorldMultiFramework.vs2019.csproj | 16 +++--- ...elloWorldMultiFrameworkSolution.vs2019.sln | 2 +- .../HelloWorldSolution.vs2017.v4_6_1.sln | 2 +- .../HelloWorldSolution.vs2019.v4_7_2.sln | 2 +- .../HelloWorld.vs2017.v4_6_1.csproj | 8 +-- .../HelloWorld.vs2019.v4_7_2.csproj | 8 +-- .../HelloWorldMultiFramework.vs2019.csproj | 16 +++--- ...lloWorldMultiFrameworksSolution.vs2019.sln | 4 +- .../helloworldlib/HelloWorldLib.vs2019.csproj | 32 +++++------ .../HelloWorldMultiFrameworks.vs2019.csproj | 26 ++++----- ...PackageReferenceSolution.vs2017.v4_7_2.sln | 2 +- ...PackageReferenceSolution.vs2019.v4_7_2.sln | 2 +- .../PackageReferences.vs2017.v4_7_2.csproj | 8 +-- .../PackageReferences.vs2019.v4_7_2.csproj | 8 +-- .../qtfilecustombuild_vs2017_win64.vcxproj | 48 ++++++++-------- .../LibStuffProject_ProjectName.vcxproj | 4 +- .../SimpleExeProjectName_vs2017_win64.vcxproj | 14 ++--- 48 files changed, 325 insertions(+), 384 deletions(-) diff --git a/Sharpmake.UnitTests/UtilTest.cs b/Sharpmake.UnitTests/UtilTest.cs index df2405c99..e2a899ce4 100644 --- a/Sharpmake.UnitTests/UtilTest.cs +++ b/Sharpmake.UnitTests/UtilTest.cs @@ -62,8 +62,6 @@ public void LeavesEmptyStringsUntouched() public void LeavesVariablesUntouched() { string expectedResult = "$(Console_SdkPackagesRoot)"; - if (!Util.IsRunningInMono()) - expectedResult = expectedResult.ToLower(); Assert.That(Util.PathMakeStandard("$(Console_SdkPackagesRoot)"), Is.EqualTo(expectedResult)); } @@ -71,8 +69,6 @@ public void LeavesVariablesUntouched() public void ProcessesPathWithTrailingBackslash() { string expectedResult = Path.Combine("rd", "project", "dev", "projects", "sharpmake", "..", "..", "extern", "Geometrics"); - if (!Util.IsRunningInMono()) - expectedResult = expectedResult.ToLower(); Assert.That(Util.PathMakeStandard(@"rd\project\dev\projects\sharpmake\..\..\extern\Geometrics\"), Is.EqualTo(expectedResult)); } @@ -80,8 +76,6 @@ public void ProcessesPathWithTrailingBackslash() public void ProcessesPathWithTrailingBackslashAndADot() { var expectedResult = Path.Combine("rd", "project", "dev", "projects", "sharpmake", "..", "..", "extern", "Microsoft.CNG", "Lib"); - if (!Util.IsRunningInMono()) - expectedResult = expectedResult.ToLower(); Assert.That(Util.PathMakeStandard(@"rd\project\dev\projects\sharpmake\..\..\extern\Microsoft.CNG\Lib\"), Is.EqualTo(expectedResult)); } @@ -89,8 +83,6 @@ public void ProcessesPathWithTrailingBackslashAndADot() public void ProcessesPathWithMultipleTrailingBackslashes() { var expectedResult = Path.Combine("rd", "project", "dev", "projects", "sharpmake", "..", "..", "extern", "Microsoft.CNG", "Lib"); - if (!Util.IsRunningInMono()) - expectedResult = expectedResult.ToLower(); Assert.That(Util.PathMakeStandard(@"rd\project\dev\projects\sharpmake\..\..\extern\Microsoft.CNG\Lib\\\"), Is.EqualTo(expectedResult)); } @@ -108,9 +100,6 @@ public void ProcessesWithAListAsArgument() }; var expectedList = listString; - if (!Util.IsRunningInMono()) - expectedList = expectedList.Select((p) => p.ToLower()).ToList(); - Util.PathMakeStandard(listString); Assert.AreEqual(expectedList, listString); @@ -753,7 +742,7 @@ public void CanBeComputedFromOutputPath() var referenceFileFullPath = outputFileFullPath.ReplaceHeadPath(outputPath, referencePath); Assert.That(referenceFileFullPath, Is.EqualTo( - Util.PathMakeStandard(@"F:\OnePath\With\Reference\with\a\file.cs", false))); + Util.PathMakeStandard(@"F:\OnePath\With\Reference\with\a\file.cs"))); } [Test] @@ -766,7 +755,7 @@ public void IsCaseInsensitiveButPreservesCase() var referenceFileFullPath = outputFileFullPath.ReplaceHeadPath(outputPath, referencePath); Assert.That(referenceFileFullPath, Is.EqualTo( - Util.PathMakeStandard(@"F:\OnePath\with\Reference\with\a\File.cs", false))); + Util.PathMakeStandard(@"F:\OnePath\with\Reference\with\a\File.cs"))); } [Test] @@ -779,7 +768,7 @@ public void AcceptsOutputPathWithoutTrailingSlash() var referenceFileFullPath = outputFileFullPath.ReplaceHeadPath(outputPath, referencePath); Assert.That(referenceFileFullPath, Is.EqualTo( - Util.PathMakeStandard(@"F:\OnePath\With\Reference\with\a\file.cs", false))); + Util.PathMakeStandard(@"F:\OnePath\With\Reference\with\a\file.cs"))); } } @@ -1000,7 +989,7 @@ public void PathGetAbsoluteStringsReturnList() string filename = Path.GetFileName(mockPath); string stringsSource = Path.GetDirectoryName(mockPath); - Assert.AreEqual(Path.Combine(stringsSource.ToLower(), filename), Util.PathGetAbsolute(stringsSource, new Strings(filename))[0]); + Assert.AreEqual(Path.Combine(stringsSource, filename), Util.PathGetAbsolute(stringsSource, new Strings(filename))[0]); File.Delete(mockPath); } @@ -1015,7 +1004,7 @@ public void PathGetAbsoluteStringsReturnString() var separator = Path.DirectorySeparatorChar; string stringsSource = mockPath.Substring(0, mockPath.IndexOf(separator)); string stringsDest = mockPath.Substring(mockPath.IndexOf(separator, mockPath.IndexOf(separator) + 1)); - string expectedOutputPath = stringsSource.ToLower() + stringsDest; + string expectedOutputPath = stringsSource + stringsDest; //v Assert.AreEqual(expectedOutputPath, Util.PathGetAbsolute(stringsSource, stringsDest)); @@ -1032,7 +1021,6 @@ public void ResolvePathString() Strings paths = new Strings(Path.GetDirectoryName(mockPath)); string root = mockPath.Substring(0, mockPath.IndexOf(Path.DirectorySeparatorChar)); Strings expectedOutputPath = new Strings(paths.Select((p) => Path.Combine(root, p))); - expectedOutputPath.ToLower(); Util.ResolvePath(root, ref paths); @@ -1057,7 +1045,7 @@ public void ResolvePathOrderableString() mockPath3.Substring(mockPath3.IndexOf(Path.DirectorySeparatorChar)), }; string root = mockPath1.Substring(0, mockPath1.IndexOf(Path.DirectorySeparatorChar)); - OrderableStrings expectedOutputPath = new OrderableStrings(paths.Select((p) => (root + p).ToLower())); + OrderableStrings expectedOutputPath = new OrderableStrings(paths.Select((p) => (root + p))); Util.ResolvePath(root, ref paths); expectedOutputPath.Sort(); @@ -1114,8 +1102,8 @@ public void PathGetRelativeOrderableStrings() Util.PathMakeStandard(stringsDest); OrderableStrings listResult = Util.PathGetRelative(stringsSource, stringsDest, false); - Assert.AreEqual(Util.PathMakeStandard(@"..\Sharpmake.Generators\Generic", !Util.IsRunningInMono()), listResult[0]); - Assert.AreEqual(Util.PathMakeStandard(@"subdir\test.txt", !Util.IsRunningInMono()), listResult[1]); + Assert.AreEqual(Util.PathMakeStandard(@"..\Sharpmake.Generators\Generic"), listResult[0]); + Assert.AreEqual(Util.PathMakeStandard(@"subdir\test.txt"), listResult[1]); Assert.AreEqual("test2.txt", listResult[2]); } @@ -1192,11 +1180,11 @@ public void GetConvertedRelativePathRoot() var root = @"C:\SharpMake\sharpmake\Sharpmake.Application\Properties"; var newRelativeToFullPath = ""; - Assert.AreEqual(Path.Combine(absolutePath.ToLower(), fileName), Util.GetConvertedRelativePath(absolutePath, fileName, newRelativeToFullPath, false, null)); + Assert.AreEqual(Path.Combine(absolutePath, fileName), Util.GetConvertedRelativePath(absolutePath, fileName, newRelativeToFullPath, false, null)); Assert.AreEqual(mockPath, Util.GetConvertedRelativePath(absolutePath, mockPath, newRelativeToFullPath, false, root)); - Assert.AreEqual(Path.Combine(absolutePath.ToLower(), fileName), Util.GetConvertedRelativePath(absolutePath, fileName, newRelativeToFullPath, false, "")); + Assert.AreEqual(Path.Combine(absolutePath, fileName), Util.GetConvertedRelativePath(absolutePath, fileName, newRelativeToFullPath, false, "")); Assert.AreEqual(absolutePath, Util.GetConvertedRelativePath(absolutePath, null, newRelativeToFullPath, false, null)); - Assert.AreEqual(Path.Combine(root.ToLower(), Path.GetTempPath()), Util.GetConvertedRelativePath(root, Path.GetTempPath(), newRelativeToFullPath, false, null)); + Assert.AreEqual(Path.Combine(root, Path.GetTempPath()), Util.GetConvertedRelativePath(root, Path.GetTempPath(), newRelativeToFullPath, false, null)); File.Delete(mockPath); } diff --git a/Sharpmake/PathUtil.cs b/Sharpmake/PathUtil.cs index fa33c961a..fb90355a3 100644 --- a/Sharpmake/PathUtil.cs +++ b/Sharpmake/PathUtil.cs @@ -40,16 +40,10 @@ public static void PathMakeStandard(IList paths) } public static string PathMakeStandard(string path) - { - return PathMakeStandard(path, !Util.IsRunningOnUnix()); - } - - public static string PathMakeStandard(string path, bool forceToLower) { // cleanup the path by replacing the other separator by the correct one for this OS // then trim every trailing separators - var standardPath = path.Replace(OtherSeparator, Path.DirectorySeparatorChar).TrimEnd(Path.DirectorySeparatorChar); - return forceToLower ? standardPath.ToLower() : standardPath; + return path.Replace(OtherSeparator, Path.DirectorySeparatorChar).TrimEnd(Path.DirectorySeparatorChar); } public static string EnsureTrailingSeparator(string path) @@ -797,9 +791,9 @@ internal static string ConvertToMountedUnixPath(string path) public static string ReplaceHeadPath(this string fullInputPath, string inputHeadPath, string replacementHeadPath) { // Normalize paths before comparing and combining them, to prevent false mismatch between '\\' and '/'. - fullInputPath = Util.PathMakeStandard(fullInputPath, false); - inputHeadPath = Util.PathMakeStandard(inputHeadPath, false); - replacementHeadPath = Util.PathMakeStandard(replacementHeadPath, false); + fullInputPath = PathMakeStandard(fullInputPath); + inputHeadPath = PathMakeStandard(inputHeadPath); + replacementHeadPath = PathMakeStandard(replacementHeadPath); inputHeadPath = EnsureTrailingSeparator(inputHeadPath); diff --git a/samples/CPPCLI/reference/projects/OtherCSharpProj.vs2017.v4_6_2.csproj b/samples/CPPCLI/reference/projects/OtherCSharpProj.vs2017.v4_6_2.csproj index 9caea88d0..3c99d08ae 100644 --- a/samples/CPPCLI/reference/projects/OtherCSharpProj.vs2017.v4_6_2.csproj +++ b/samples/CPPCLI/reference/projects/OtherCSharpProj.vs2017.v4_6_2.csproj @@ -17,8 +17,8 @@ true full false - output\vs2017\v4_6_2\debug - temp\othercsharpproj\vs2017\v4_6_2\debug + output\vs2017\v4_6_2\Debug + temp\OtherCSharpProj\vs2017\v4_6_2\Debug DEBUG;TRACE;WIN32 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\vs2017\v4_6_2\release - temp\othercsharpproj\vs2017\v4_6_2\release + output\vs2017\v4_6_2\Release + temp\OtherCSharpProj\vs2017\v4_6_2\Release TRACE;WIN32 4 true diff --git a/samples/CPPCLI/reference/projects/OtherCSharpProj.vs2019.v4_7_2.csproj b/samples/CPPCLI/reference/projects/OtherCSharpProj.vs2019.v4_7_2.csproj index bb5d3f675..1c6b44ce6 100644 --- a/samples/CPPCLI/reference/projects/OtherCSharpProj.vs2019.v4_7_2.csproj +++ b/samples/CPPCLI/reference/projects/OtherCSharpProj.vs2019.v4_7_2.csproj @@ -17,8 +17,8 @@ true full false - output\vs2019\v4_7_2\debug - temp\othercsharpproj\vs2019\v4_7_2\debug + output\vs2019\v4_7_2\Debug + temp\OtherCSharpProj\vs2019\v4_7_2\Debug DEBUG;TRACE;WIN32 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\vs2019\v4_7_2\release - temp\othercsharpproj\vs2019\v4_7_2\release + output\vs2019\v4_7_2\Release + temp\OtherCSharpProj\vs2019\v4_7_2\Release TRACE;WIN32 4 true diff --git a/samples/CPPCLI/reference/projects/TestCSharpConsole.vs2017.v4_6_2.csproj b/samples/CPPCLI/reference/projects/TestCSharpConsole.vs2017.v4_6_2.csproj index 5f1f0e629..b1ed2e0e9 100644 --- a/samples/CPPCLI/reference/projects/TestCSharpConsole.vs2017.v4_6_2.csproj +++ b/samples/CPPCLI/reference/projects/TestCSharpConsole.vs2017.v4_6_2.csproj @@ -17,8 +17,8 @@ true full false - output\vs2017\v4_6_2\debug - temp\testcsharpconsole\vs2017\v4_6_2\debug + output\vs2017\v4_6_2\Debug + temp\TestCSharpConsole\vs2017\v4_6_2\Debug DEBUG;TRACE;WIN32 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\vs2017\v4_6_2\release - temp\testcsharpconsole\vs2017\v4_6_2\release + output\vs2017\v4_6_2\Release + temp\TestCSharpConsole\vs2017\v4_6_2\Release TRACE;WIN32 4 true diff --git a/samples/CPPCLI/reference/projects/TestCSharpConsole.vs2019.v4_7_2.csproj b/samples/CPPCLI/reference/projects/TestCSharpConsole.vs2019.v4_7_2.csproj index b00745fb9..417afa299 100644 --- a/samples/CPPCLI/reference/projects/TestCSharpConsole.vs2019.v4_7_2.csproj +++ b/samples/CPPCLI/reference/projects/TestCSharpConsole.vs2019.v4_7_2.csproj @@ -17,8 +17,8 @@ true full false - output\vs2019\v4_7_2\debug - temp\testcsharpconsole\vs2019\v4_7_2\debug + output\vs2019\v4_7_2\Debug + temp\TestCSharpConsole\vs2019\v4_7_2\Debug DEBUG;TRACE;WIN32 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\vs2019\v4_7_2\release - temp\testcsharpconsole\vs2019\v4_7_2\release + output\vs2019\v4_7_2\Release + temp\TestCSharpConsole\vs2019\v4_7_2\Release TRACE;WIN32 4 true diff --git a/samples/CPPCLI/reference/projects/clrcppproj.vs2017.v4_6_2.vcxproj b/samples/CPPCLI/reference/projects/clrcppproj.vs2017.v4_6_2.vcxproj index 24492cee1..1d6da83bf 100644 --- a/samples/CPPCLI/reference/projects/clrcppproj.vs2017.v4_6_2.vcxproj +++ b/samples/CPPCLI/reference/projects/clrcppproj.vs2017.v4_6_2.vcxproj @@ -47,22 +47,22 @@ clrcppproj - output\win32\debug\ - temp\clrcppproj\vs2017\v4_6_2\debug\ + output\win32\Debug\ + temp\CLRCPPProj\vs2017\v4_6_2\Debug\ .dll true false - output\win32\debug\clrcppproj.dll + output\win32\Debug\clrcppproj.dll false clrcppproj - output\win32\release\ - temp\clrcppproj\vs2017\v4_6_2\release\ + output\win32\Release\ + temp\CLRCPPProj\vs2017\v4_6_2\Release\ .dll true false - output\win32\release\clrcppproj.dll + output\win32\Release\clrcppproj.dll false @@ -110,17 +110,17 @@ Cdecl Default /Zc:__cplusplus - temp\clrcppproj\vs2017\v4_6_2\debug\clrcppproj_compiler.pdb + temp\CLRCPPProj\vs2017\v4_6_2\Debug\CLRCPPProj_compiler.pdb MultiThreadedDebugDLL Console DebugFull true - output\win32\debug\clrcppproj.dll + output\win32\Debug\clrcppproj.dll NotSet - output\win32\debug - output\win32\debug\clrcppproj.pdb + output\win32\Debug + output\win32\Debug\CLRCPPProj.pdb true false false @@ -145,7 +145,7 @@ false true - output\win32\debug\clrcppproj.map + output\win32\Debug\clrcppproj.map @@ -193,17 +193,17 @@ Cdecl Default /Zc:__cplusplus - temp\clrcppproj\vs2017\v4_6_2\release\clrcppproj_compiler.pdb + temp\CLRCPPProj\vs2017\v4_6_2\Release\CLRCPPProj_compiler.pdb MultiThreadedDLL Console DebugFull true - output\win32\release\clrcppproj.dll + output\win32\Release\clrcppproj.dll NotSet - output\win32\release - output\win32\release\clrcppproj.pdb + output\win32\Release + output\win32\Release\CLRCPPProj.pdb true false false @@ -228,7 +228,7 @@ false true - output\win32\release\clrcppproj.map + output\win32\Release\clrcppproj.map diff --git a/samples/CPPCLI/reference/projects/clrcppproj.vs2019.v4_7_2.vcxproj b/samples/CPPCLI/reference/projects/clrcppproj.vs2019.v4_7_2.vcxproj index e31acb208..e5af7a2cb 100644 --- a/samples/CPPCLI/reference/projects/clrcppproj.vs2019.v4_7_2.vcxproj +++ b/samples/CPPCLI/reference/projects/clrcppproj.vs2019.v4_7_2.vcxproj @@ -47,22 +47,22 @@ clrcppproj - output\win32\debug\ - temp\clrcppproj\vs2019\v4_7_2\debug\ + output\win32\Debug\ + temp\CLRCPPProj\vs2019\v4_7_2\Debug\ .dll true false - output\win32\debug\clrcppproj.dll + output\win32\Debug\clrcppproj.dll false clrcppproj - output\win32\release\ - temp\clrcppproj\vs2019\v4_7_2\release\ + output\win32\Release\ + temp\CLRCPPProj\vs2019\v4_7_2\Release\ .dll true false - output\win32\release\clrcppproj.dll + output\win32\Release\clrcppproj.dll false @@ -110,17 +110,17 @@ Cdecl Default /Zc:__cplusplus - temp\clrcppproj\vs2019\v4_7_2\debug\clrcppproj_compiler.pdb + temp\CLRCPPProj\vs2019\v4_7_2\Debug\CLRCPPProj_compiler.pdb MultiThreadedDebugDLL Console DebugFull true - output\win32\debug\clrcppproj.dll + output\win32\Debug\clrcppproj.dll NotSet - output\win32\debug - output\win32\debug\clrcppproj.pdb + output\win32\Debug + output\win32\Debug\CLRCPPProj.pdb true false false @@ -145,7 +145,7 @@ false true - output\win32\debug\clrcppproj.map + output\win32\Debug\clrcppproj.map @@ -193,17 +193,17 @@ Cdecl Default /Zc:__cplusplus - temp\clrcppproj\vs2019\v4_7_2\release\clrcppproj_compiler.pdb + temp\CLRCPPProj\vs2019\v4_7_2\Release\CLRCPPProj_compiler.pdb MultiThreadedDLL Console DebugFull true - output\win32\release\clrcppproj.dll + output\win32\Release\clrcppproj.dll NotSet - output\win32\release - output\win32\release\clrcppproj.pdb + output\win32\Release + output\win32\Release\CLRCPPProj.pdb true false false @@ -228,7 +228,7 @@ false true - output\win32\release\clrcppproj.map + output\win32\Release\clrcppproj.map diff --git a/samples/CPPCLI/reference/projects/theemptycppproject.vs2017.v4_6_2.vcxproj b/samples/CPPCLI/reference/projects/theemptycppproject.vs2017.v4_6_2.vcxproj index f01813b6b..f37a3e588 100644 --- a/samples/CPPCLI/reference/projects/theemptycppproject.vs2017.v4_6_2.vcxproj +++ b/samples/CPPCLI/reference/projects/theemptycppproject.vs2017.v4_6_2.vcxproj @@ -43,22 +43,22 @@ theemptycppproject - output\win32\debug\ - temp\theemptycppproject\vs2017\v4_6_2\debug\ + output\win32\Debug\ + temp\theEmptyCPPProject\vs2017\v4_6_2\Debug\ .lib true false - output\win32\debug\theemptycppproject.lib + output\win32\Debug\theemptycppproject.lib false theemptycppproject - output\win32\release\ - temp\theemptycppproject\vs2017\v4_6_2\release\ + output\win32\Release\ + temp\theEmptyCPPProject\vs2017\v4_6_2\Release\ .lib true false - output\win32\release\theemptycppproject.lib + output\win32\Release\theemptycppproject.lib false @@ -106,7 +106,7 @@ Cdecl Default /Zc:__cplusplus - temp\theemptycppproject\vs2017\v4_6_2\debug\theemptycppproject_compiler.pdb + temp\theEmptyCPPProject\vs2017\v4_6_2\Debug\theEmptyCPPProject_compiler.pdb MultiThreadedDebugDLL @@ -118,7 +118,7 @@ MachineX86 false - output\win32\debug\theemptycppproject.lib + output\win32\Debug\theemptycppproject.lib @@ -167,7 +167,7 @@ Cdecl Default /Zc:__cplusplus - temp\theemptycppproject\vs2017\v4_6_2\release\theemptycppproject_compiler.pdb + temp\theEmptyCPPProject\vs2017\v4_6_2\Release\theEmptyCPPProject_compiler.pdb MultiThreadedDLL @@ -179,7 +179,7 @@ MachineX86 false - output\win32\release\theemptycppproject.lib + output\win32\Release\theemptycppproject.lib diff --git a/samples/CPPCLI/reference/projects/theemptycppproject.vs2019.v4_7_2.vcxproj b/samples/CPPCLI/reference/projects/theemptycppproject.vs2019.v4_7_2.vcxproj index cbd4542f6..13109190d 100644 --- a/samples/CPPCLI/reference/projects/theemptycppproject.vs2019.v4_7_2.vcxproj +++ b/samples/CPPCLI/reference/projects/theemptycppproject.vs2019.v4_7_2.vcxproj @@ -43,22 +43,22 @@ theemptycppproject - output\win32\debug\ - temp\theemptycppproject\vs2019\v4_7_2\debug\ + output\win32\Debug\ + temp\theEmptyCPPProject\vs2019\v4_7_2\Debug\ .lib true false - output\win32\debug\theemptycppproject.lib + output\win32\Debug\theemptycppproject.lib false theemptycppproject - output\win32\release\ - temp\theemptycppproject\vs2019\v4_7_2\release\ + output\win32\Release\ + temp\theEmptyCPPProject\vs2019\v4_7_2\Release\ .lib true false - output\win32\release\theemptycppproject.lib + output\win32\Release\theemptycppproject.lib false @@ -106,7 +106,7 @@ Cdecl Default /Zc:__cplusplus - temp\theemptycppproject\vs2019\v4_7_2\debug\theemptycppproject_compiler.pdb + temp\theEmptyCPPProject\vs2019\v4_7_2\Debug\theEmptyCPPProject_compiler.pdb MultiThreadedDebugDLL @@ -118,7 +118,7 @@ MachineX86 false - output\win32\debug\theemptycppproject.lib + output\win32\Debug\theemptycppproject.lib @@ -166,7 +166,7 @@ Cdecl Default /Zc:__cplusplus - temp\theemptycppproject\vs2019\v4_7_2\release\theemptycppproject_compiler.pdb + temp\theEmptyCPPProject\vs2019\v4_7_2\Release\theEmptyCPPProject_compiler.pdb MultiThreadedDLL @@ -178,7 +178,7 @@ MachineX86 false - output\win32\release\theemptycppproject.lib + output\win32\Release\theemptycppproject.lib diff --git a/samples/CSharpHelloWorld/reference/projects/HelloWorldSolution.vs2017.v4_6_1.sln b/samples/CSharpHelloWorld/reference/projects/HelloWorldSolution.vs2017.v4_6_1.sln index 640f42a32..56188cb3b 100644 --- a/samples/CSharpHelloWorld/reference/projects/HelloWorldSolution.vs2017.v4_6_1.sln +++ b/samples/CSharpHelloWorld/reference/projects/HelloWorldSolution.vs2017.v4_6_1.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "helloworld\HelloWorld.vs2017.v4_6_1.csproj", "{756E7D29-4FC3-9875-8B88-8C98634A56D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "HelloWorld\HelloWorld.vs2017.v4_6_1.csproj", "{756E7D29-4FC3-9875-8B88-8C98634A56D5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/CSharpHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.v4_6_1.csproj b/samples/CSharpHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.v4_6_1.csproj index 614508238..d6273bb51 100644 --- a/samples/CSharpHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.v4_6_1.csproj +++ b/samples/CSharpHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.v4_6_1.csproj @@ -17,8 +17,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/CSharpImports/reference/projects/CSharpImportsSolution.vs2019.v4_7_2.sln b/samples/CSharpImports/reference/projects/CSharpImportsSolution.vs2019.v4_7_2.sln index 38571711f..011b0b544 100644 --- a/samples/CSharpImports/reference/projects/CSharpImportsSolution.vs2019.v4_7_2.sln +++ b/samples/CSharpImports/reference/projects/CSharpImportsSolution.vs2019.v4_7_2.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29424.173 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpImports", "csharpimports\CSharpImports.vs2019.v4_7_2.csproj", "{B5C3E9AD-72C3-C739-6FF9-A08615FBA6C0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpImports", "CSharpImports\CSharpImports.vs2019.v4_7_2.csproj", "{B5C3E9AD-72C3-C739-6FF9-A08615FBA6C0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/CSharpImports/reference/projects/csharpimports/CSharpImports.vs2019.v4_7_2.csproj b/samples/CSharpImports/reference/projects/csharpimports/CSharpImports.vs2019.v4_7_2.csproj index b22b04d04..8868c958e 100644 --- a/samples/CSharpImports/reference/projects/csharpimports/CSharpImports.vs2019.v4_7_2.csproj +++ b/samples/CSharpImports/reference/projects/csharpimports/CSharpImports.vs2019.v4_7_2.csproj @@ -18,8 +18,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -30,8 +30,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/CSharpVsix/reference/projects/CSharpVsixSolution.vs2017.v4_7_2.sln b/samples/CSharpVsix/reference/projects/CSharpVsixSolution.vs2017.v4_7_2.sln index a35c23745..98b81c218 100644 --- a/samples/CSharpVsix/reference/projects/CSharpVsixSolution.vs2017.v4_7_2.sln +++ b/samples/CSharpVsix/reference/projects/CSharpVsixSolution.vs2017.v4_7_2.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpVsix", "csharpvsix\CSharpVsix.vs2017.v4_7_2.csproj", "{199F07AD-EC4C-BF75-597B-1B2976D1D0ED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpVsix", "CSharpVsix\CSharpVsix.vs2017.v4_7_2.csproj", "{199F07AD-EC4C-BF75-597B-1B2976D1D0ED}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/CSharpVsix/reference/projects/csharpvsix/CSharpVsix.vs2017.v4_7_2.csproj b/samples/CSharpVsix/reference/projects/csharpvsix/CSharpVsix.vs2017.v4_7_2.csproj index de0788fb8..02b6c2502 100644 --- a/samples/CSharpVsix/reference/projects/csharpvsix/CSharpVsix.vs2017.v4_7_2.csproj +++ b/samples/CSharpVsix/reference/projects/csharpvsix/CSharpVsix.vs2017.v4_7_2.csproj @@ -10,7 +10,7 @@ CSharpVsix CSharpVsix true - ..\..\codebase\csharpvsix\key.snk + ..\..\codebase\CSharpVsix\Key.snk v4.7.2 512 {82B43B9B-A64C-4715-B499-D71E9CA2BD60};{60DC8134-EBA5-43B8-BCC9-BB4BC16C2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -29,8 +29,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 True @@ -42,8 +42,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 True diff --git a/samples/CSharpWCF/reference/csharpwcf/CSharpWCF.vs2015.v4_5_2.csproj b/samples/CSharpWCF/reference/csharpwcf/CSharpWCF.vs2015.v4_5_2.csproj index dfa3f5d24..63f96aeaf 100644 --- a/samples/CSharpWCF/reference/csharpwcf/CSharpWCF.vs2015.v4_5_2.csproj +++ b/samples/CSharpWCF/reference/csharpwcf/CSharpWCF.vs2015.v4_5_2.csproj @@ -17,8 +17,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 false @@ -28,8 +28,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 false diff --git a/samples/CSharpWCF/reference/csharpwcfapp/CSharpWCFApp.vs2015.v4_5_2.csproj b/samples/CSharpWCF/reference/csharpwcfapp/CSharpWCFApp.vs2015.v4_5_2.csproj index d1c2c7a43..0c86e824d 100644 --- a/samples/CSharpWCF/reference/csharpwcfapp/CSharpWCFApp.vs2015.v4_5_2.csproj +++ b/samples/CSharpWCF/reference/csharpwcfapp/CSharpWCFApp.vs2015.v4_5_2.csproj @@ -26,8 +26,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 false @@ -37,8 +37,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 false diff --git a/samples/ConfigureOrder/reference/projects/childproject.vcxproj b/samples/ConfigureOrder/reference/projects/childproject.vcxproj index 44d28d030..d9d156338 100644 --- a/samples/ConfigureOrder/reference/projects/childproject.vcxproj +++ b/samples/ConfigureOrder/reference/projects/childproject.vcxproj @@ -32,12 +32,12 @@ childproject - output\win32\release\ - obj\childproject\win32\release\ + output\win32\Release\ + obj\ChildProject\win32\Release\ .exe true false - output\win32\release\childproject.exe + output\win32\Release\childproject.exe false @@ -86,15 +86,15 @@ Cdecl Default /Zc:__cplusplus - obj\childproject\win32\release\childproject_compiler.pdb + obj\ChildProject\win32\Release\ChildProject_compiler.pdb MultiThreaded Console true - output\win32\release\childproject.exe + output\win32\Release\childproject.exe NotSet - output\win32\release\childproject.pdb + output\win32\Release\ChildProject.pdb true false false @@ -119,7 +119,7 @@ false true - output\win32\release\childproject.map + output\win32\Release\childproject.map diff --git a/samples/ConfigureOrder/reference/projects/foobarproject.vcxproj b/samples/ConfigureOrder/reference/projects/foobarproject.vcxproj index 60630c066..6c20dbb40 100644 --- a/samples/ConfigureOrder/reference/projects/foobarproject.vcxproj +++ b/samples/ConfigureOrder/reference/projects/foobarproject.vcxproj @@ -32,12 +32,12 @@ foobarproject - output\win32\release\ - obj\foobarproject\win32\release\ + output\win32\Release\ + obj\FooBarProject\win32\Release\ .exe true false - output\win32\release\foobarproject.exe + output\win32\Release\foobarproject.exe false @@ -86,15 +86,15 @@ Cdecl Default /Zc:__cplusplus - obj\foobarproject\win32\release\foobarproject_compiler.pdb + obj\FooBarProject\win32\Release\FooBarProject_compiler.pdb MultiThreaded Console true - output\win32\release\foobarproject.exe + output\win32\Release\foobarproject.exe NotSet - output\win32\release\foobarproject.pdb + output\win32\Release\FooBarProject.pdb true false false @@ -119,7 +119,7 @@ false true - output\win32\release\foobarproject.map + output\win32\Release\foobarproject.map diff --git a/samples/ConfigureOrder/reference/projects/parentproject.vcxproj b/samples/ConfigureOrder/reference/projects/parentproject.vcxproj index b78e2951c..07cb5c75e 100644 --- a/samples/ConfigureOrder/reference/projects/parentproject.vcxproj +++ b/samples/ConfigureOrder/reference/projects/parentproject.vcxproj @@ -32,12 +32,12 @@ parentproject - output\win32\release\ - obj\parentproject\win32\release\ + output\win32\Release\ + obj\ParentProject\win32\Release\ .exe true false - output\win32\release\parentproject.exe + output\win32\Release\parentproject.exe false @@ -86,15 +86,15 @@ Cdecl Default /Zc:__cplusplus - obj\parentproject\win32\release\parentproject_compiler.pdb + obj\ParentProject\win32\Release\ParentProject_compiler.pdb MultiThreaded Console true - output\win32\release\parentproject.exe + output\win32\Release\parentproject.exe NotSet - output\win32\release\parentproject.pdb + output\win32\Release\ParentProject.pdb true false false @@ -119,7 +119,7 @@ false true - output\win32\release\parentproject.map + output\win32\Release\parentproject.map diff --git a/samples/FastBuildSimpleExecutable/reference/fastbuildsample_vs2019_win64-globalsettings.bff b/samples/FastBuildSimpleExecutable/reference/fastbuildsample_vs2019_win64-globalsettings.bff index 18ac54a2e..ca770c5d8 100644 --- a/samples/FastBuildSimpleExecutable/reference/fastbuildsample_vs2019_win64-globalsettings.bff +++ b/samples/FastBuildSimpleExecutable/reference/fastbuildsample_vs2019_win64-globalsettings.bff @@ -19,7 +19,7 @@ Settings "TEMP=$TEMP$", "USERPROFILE=$USERPROFILE$", "SystemRoot=C:\WINDOWS" - "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64" + "PATH=C:\Program Files (x86)\Windows Kits\10\bin\x64" } } @@ -27,7 +27,7 @@ Settings //================================================================================================================= Compiler( 'Compiler-x64-vs2019' ) { - .ExecutableRootPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64' + .ExecutableRootPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\bin\HostX64\x64' .Executable = '$ExecutableRootPath$\cl.exe' .ExtraFiles = { '$ExecutableRootPath$\1033\clui.dll', @@ -46,62 +46,21 @@ Compiler( 'Compiler-x64-vs2019' ) '$ExecutableRootPath$\tbbmalloc.dll', '$ExecutableRootPath$\vcruntime140.dll', '$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\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-console-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-console-l1-2-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-datetime-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-debug-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-errorhandling-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-file-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-file-l1-2-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-file-l2-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-handle-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-heap-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-interlocked-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-libraryloader-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-localization-l1-2-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-memory-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-namedpipe-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-processenvironment-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-processthreads-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-processthreads-l1-1-1.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-profile-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-rtlsupport-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-string-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-synch-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-synch-l1-2-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-sysinfo-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-timezone-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-core-util-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-conio-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-convert-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-environment-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-filesystem-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-heap-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-locale-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-math-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-multibyte-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-private-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-process-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-runtime-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-stdio-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-string-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-time-l1-1-0.dll', - 'C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\api-ms-win-crt-utility-l1-1-0.dll' + 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat' } .CompilerFamily = 'msvc' } Compiler( 'RC.win64Config' ) { - .Executable = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\rc.exe' + .Executable = 'C:\Program Files (x86)\Windows Kits\10\bin\x64\rc.exe' .CompilerFamily = 'custom' } .win64Config = [ - .BinPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64' - .LinkerPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64' + .BinPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\bin\Hostx64\x64' + .LinkerPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\bin\Hostx64\x64' .ResourceCompiler = 'RC.win64Config' .Compiler = 'Compiler-x64-vs2019' .Librarian = '$LinkerPath$\lib.exe' @@ -110,7 +69,7 @@ Compiler( 'RC.win64Config' ) Compiler( 'ML.win64ConfigMasm' ) { - .Executable = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\ml64.exe' + .Executable = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\bin\Hostx64\x64\ml64.exe' .CompilerFamily = 'custom' } diff --git a/samples/FastBuildSimpleExecutable/reference/fastbuildsimpleexecutable_vs2019_win64.bff b/samples/FastBuildSimpleExecutable/reference/fastbuildsimpleexecutable_vs2019_win64.bff index fed003ae6..3a3a58ef7 100644 --- a/samples/FastBuildSimpleExecutable/reference/fastbuildsimpleexecutable_vs2019_win64.bff +++ b/samples/FastBuildSimpleExecutable/reference/fastbuildsimpleexecutable_vs2019_win64.bff @@ -13,11 +13,11 @@ ObjectList( 'FastBuildSimpleExecutable_Debug_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\obj\win64\debug\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\obj\win64\Debug\' .CompilerExtraOptions = '' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -41,7 +41,7 @@ ObjectList( 'FastBuildSimpleExecutable_Debug_win64_objects' ) + ' /Zc:inline' + ' /GR-' + ' /openmp-' - + ' /Fd".\$_CURRENT_BFF_DIR_$\obj\win64\debug\fastbuildsimpleexecutable_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\obj\win64\Debug\FastBuildSimpleExecutable_compiler.pdb"' + ' /Gd' + ' /TP' + ' /errorReport:queue' @@ -70,9 +70,9 @@ ObjectList( 'FastBuildSimpleExecutable_Debug_win64_objects' ) Executable( 'FastBuildSimpleExecutable_Debug_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\obj\win64\debug\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\obj\win64\Debug\' .Libraries = 'FastBuildSimpleExecutable_Debug_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\win64\debug\fastbuildsimpleexecutable.exe' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\win64\Debug\fastbuildsimpleexecutable.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -80,8 +80,8 @@ Executable( 'FastBuildSimpleExecutable_Debug_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -108,8 +108,8 @@ Executable( 'FastBuildSimpleExecutable_Debug_win64_Executable' ) // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\win64\debug\fastbuildsimpleexecutable.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\win64\debug\fastbuildsimpleexecutable.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\win64\Debug\FastBuildSimpleExecutable.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\win64\Debug\fastbuildsimpleexecutable.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' @@ -151,11 +151,11 @@ Alias( 'FastBuildSimpleExecutable_Debug_win64_LibraryDependency' ) ObjectList( 'FastBuildSimpleExecutable_Release_win64_objects' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\obj\win64\release\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\obj\win64\Release\' .CompilerExtraOptions = '' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -179,7 +179,7 @@ ObjectList( 'FastBuildSimpleExecutable_Release_win64_objects' ) + ' /Zc:inline' + ' /GR-' + ' /openmp-' - + ' /Fd".\$_CURRENT_BFF_DIR_$\obj\win64\release\fastbuildsimpleexecutable_compiler.pdb"' + + ' /Fd".\$_CURRENT_BFF_DIR_$\obj\win64\Release\FastBuildSimpleExecutable_compiler.pdb"' + ' /Gd' + ' /TP' + ' /errorReport:queue' @@ -209,9 +209,9 @@ ObjectList( 'FastBuildSimpleExecutable_Release_win64_objects' ) Executable( 'FastBuildSimpleExecutable_Release_win64_Executable' ) { Using( .win64Config ) - .Intermediate = '.\$_CURRENT_BFF_DIR_$\obj\win64\release\' + .Intermediate = '.\$_CURRENT_BFF_DIR_$\obj\win64\Release\' .Libraries = 'FastBuildSimpleExecutable_Release_win64_objects' - .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\win64\release\fastbuildsimpleexecutable.exe' + .LinkerOutput = '.\$_CURRENT_BFF_DIR_$\output\win64\Release\fastbuildsimpleexecutable.exe' .LinkerLinkObjects = false .LinkerOptions = '/OUT:"%2"' @@ -219,8 +219,8 @@ Executable( 'FastBuildSimpleExecutable_Release_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -247,8 +247,8 @@ Executable( 'FastBuildSimpleExecutable_Release_win64_Executable' ) // Debugging // --------------------------- + ' /DEBUG' - + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\win64\release\fastbuildsimpleexecutable.pdb"' - + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\win64\release\fastbuildsimpleexecutable.map"' + + ' /PDB:".\$_CURRENT_BFF_DIR_$\output\win64\Release\FastBuildSimpleExecutable.pdb"' + + ' /MAP":.\$_CURRENT_BFF_DIR_$\output\win64\Release\fastbuildsimpleexecutable.map"' // System // --------------------------- + ' /SUBSYSTEM:CONSOLE' diff --git a/samples/FastBuildSimpleExecutable/reference/fastbuildsimpleexecutable_vs2019_win64.vcxproj b/samples/FastBuildSimpleExecutable/reference/fastbuildsimpleexecutable_vs2019_win64.vcxproj index 5207838c0..2fdcfd841 100644 --- a/samples/FastBuildSimpleExecutable/reference/fastbuildsimpleexecutable_vs2019_win64.vcxproj +++ b/samples/FastBuildSimpleExecutable/reference/fastbuildsimpleexecutable_vs2019_win64.vcxproj @@ -39,43 +39,43 @@ - output\win64\debug\ - obj\win64\debug\ + output\win64\Debug\ + obj\win64\Debug\ cd $(SolutionDir) "$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe" FastBuildSimpleExecutable_Debug_win64 -ide -summary -config $(SolutionName).bff cd $(SolutionDir) "$(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 -del "obj\win64\debug\*.lib" >NUL 2>NUL -del "output\win64\debug\fastbuildsimpleexecutable.exe" >NUL 2>NUL -del "output\win64\debug\fastbuildsimpleexecutable.elf" >NUL 2>NUL -del "output\win64\debug\fastbuildsimpleexecutable.exp" >NUL 2>NUL -del "output\win64\debug\fastbuildsimpleexecutable.ilk" >NUL 2>NUL -del "output\win64\debug\fastbuildsimpleexecutable.lib" >NUL 2>NUL -del "output\win64\debug\fastbuildsimpleexecutable.pdb" >NUL 2>NUL - output\win64\debug\fastbuildsimpleexecutable.exe + 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 +del "obj\win64\Debug\*.lib" >NUL 2>NUL +del "output\win64\Debug\fastbuildsimpleexecutable.exe" >NUL 2>NUL +del "output\win64\Debug\fastbuildsimpleexecutable.elf" >NUL 2>NUL +del "output\win64\Debug\fastbuildsimpleexecutable.exp" >NUL 2>NUL +del "output\win64\Debug\fastbuildsimpleexecutable.ilk" >NUL 2>NUL +del "output\win64\Debug\fastbuildsimpleexecutable.lib" >NUL 2>NUL +del "output\win64\Debug\fastbuildsimpleexecutable.pdb" >NUL 2>NUL + output\win64\Debug\fastbuildsimpleexecutable.exe WIN64;_CONSOLE;_DEBUG - output\win64\release\ - obj\win64\release\ + output\win64\Release\ + obj\win64\Release\ cd $(SolutionDir) "$(ProjectDir)..\..\..\tools\FastBuild\Windows-x64\FBuild.exe" FastBuildSimpleExecutable_Release_win64 -ide -summary -config $(SolutionName).bff cd $(SolutionDir) "$(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 -del "obj\win64\release\*.lib" >NUL 2>NUL -del "output\win64\release\fastbuildsimpleexecutable.exe" >NUL 2>NUL -del "output\win64\release\fastbuildsimpleexecutable.elf" >NUL 2>NUL -del "output\win64\release\fastbuildsimpleexecutable.exp" >NUL 2>NUL -del "output\win64\release\fastbuildsimpleexecutable.ilk" >NUL 2>NUL -del "output\win64\release\fastbuildsimpleexecutable.lib" >NUL 2>NUL -del "output\win64\release\fastbuildsimpleexecutable.pdb" >NUL 2>NUL - output\win64\release\fastbuildsimpleexecutable.exe + 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 +del "obj\win64\Release\*.lib" >NUL 2>NUL +del "output\win64\Release\fastbuildsimpleexecutable.exe" >NUL 2>NUL +del "output\win64\Release\fastbuildsimpleexecutable.elf" >NUL 2>NUL +del "output\win64\Release\fastbuildsimpleexecutable.exp" >NUL 2>NUL +del "output\win64\Release\fastbuildsimpleexecutable.ilk" >NUL 2>NUL +del "output\win64\Release\fastbuildsimpleexecutable.lib" >NUL 2>NUL +del "output\win64\Release\fastbuildsimpleexecutable.pdb" >NUL 2>NUL + output\win64\Release\fastbuildsimpleexecutable.exe NDEBUG;WIN64;_CONSOLE diff --git a/samples/HelloWorld/reference/projects/helloworld_vs2019_win32.vcxproj b/samples/HelloWorld/reference/projects/helloworld_vs2019_win32.vcxproj index c19495eda..eebec100c 100644 --- a/samples/HelloWorld/reference/projects/helloworld_vs2019_win32.vcxproj +++ b/samples/HelloWorld/reference/projects/helloworld_vs2019_win32.vcxproj @@ -43,22 +43,22 @@ helloworld - output\win32\debug\ - obj\win32\debug\ + output\win32\Debug\ + obj\win32\Debug\ .exe true false - output\win32\debug\helloworld.exe + output\win32\Debug\helloworld.exe false helloworld - output\win32\release\ - obj\win32\release\ + output\win32\Release\ + obj\win32\Release\ .exe true false - output\win32\release\helloworld.exe + output\win32\Release\helloworld.exe false @@ -107,16 +107,16 @@ Default /Zc:__cplusplus stdafx.h - obj\win32\debug\HelloWorld.pch - obj\win32\debug\helloworld_compiler.pdb + obj\win32\Debug\HelloWorld.pch + obj\win32\Debug\HelloWorld_compiler.pdb MultiThreadedDebug Console true - output\win32\debug\helloworld.exe + output\win32\Debug\helloworld.exe NotSet - output\win32\debug\helloworld.pdb + output\win32\Debug\HelloWorld.pdb true false false @@ -141,7 +141,7 @@ false true - output\win32\debug\helloworld.map + output\win32\Debug\helloworld.map @@ -190,16 +190,16 @@ Default /Zc:__cplusplus stdafx.h - obj\win32\release\HelloWorld.pch - obj\win32\release\helloworld_compiler.pdb + obj\win32\Release\HelloWorld.pch + obj\win32\Release\HelloWorld_compiler.pdb MultiThreaded Console true - output\win32\release\helloworld.exe + output\win32\Release\helloworld.exe NotSet - output\win32\release\helloworld.pdb + output\win32\Release\HelloWorld.pdb true false false @@ -224,7 +224,7 @@ false true - output\win32\release\helloworld.map + output\win32\Release\helloworld.map diff --git a/samples/HelloWorld/reference/projects/helloworld_vs2019_win64.vcxproj b/samples/HelloWorld/reference/projects/helloworld_vs2019_win64.vcxproj index 84fd6c965..bc4c6b503 100644 --- a/samples/HelloWorld/reference/projects/helloworld_vs2019_win64.vcxproj +++ b/samples/HelloWorld/reference/projects/helloworld_vs2019_win64.vcxproj @@ -43,22 +43,22 @@ helloworld - output\win64\debug\ - obj\win64\debug\ + output\win64\Debug\ + obj\win64\Debug\ .exe true false - output\win64\debug\helloworld.exe + output\win64\Debug\helloworld.exe false helloworld - output\win64\release\ - obj\win64\release\ + output\win64\Release\ + obj\win64\Release\ .exe true false - output\win64\release\helloworld.exe + output\win64\Release\helloworld.exe false @@ -107,16 +107,16 @@ Default /Zc:__cplusplus stdafx.h - obj\win64\debug\HelloWorld.pch - obj\win64\debug\helloworld_compiler.pdb + obj\win64\Debug\HelloWorld.pch + obj\win64\Debug\HelloWorld_compiler.pdb MultiThreadedDebug Console true - output\win64\debug\helloworld.exe + output\win64\Debug\helloworld.exe NotSet - output\win64\debug\helloworld.pdb + output\win64\Debug\HelloWorld.pdb true false false @@ -141,7 +141,7 @@ false true - output\win64\debug\helloworld.map + output\win64\Debug\helloworld.map @@ -190,16 +190,16 @@ Default /Zc:__cplusplus stdafx.h - obj\win64\release\HelloWorld.pch - obj\win64\release\helloworld_compiler.pdb + obj\win64\Release\HelloWorld.pch + obj\win64\Release\HelloWorld_compiler.pdb MultiThreaded Console true - output\win64\release\helloworld.exe + output\win64\Release\helloworld.exe NotSet - output\win64\release\helloworld.pdb + output\win64\Release\HelloWorld.pdb true false false @@ -224,7 +224,7 @@ false true - output\win64\release\helloworld.map + output\win64\Release\helloworld.map diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln index d4380f97f..9843d7a72 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29424.173 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldMultiFramework", "helloworldmultiframework\HelloWorldMultiFramework.vs2019.csproj", "{898E2314-FD0E-0054-6BD6-A944C0C1C723}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldMultiFramework", "HelloWorldMultiFramework\HelloWorldMultiFramework.vs2019.csproj", "{898E2314-FD0E-0054-6BD6-A944C0C1C723}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.netcore2_1.sln b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.netcore2_1.sln index c92e5f49d..9c046a860 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.netcore2_1.sln +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.netcore2_1.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "helloworld\HelloWorld.vs2017.netcore2_1.csproj", "{FBDAB658-9F80-4FEA-7DA3-5888504E98FE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "HelloWorld\HelloWorld.vs2017.netcore2_1.csproj", "{FBDAB658-9F80-4FEA-7DA3-5888504E98FE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2019.netcore3_1.sln b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2019.netcore3_1.sln index 9624cf64e..66fbbdc97 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2019.netcore3_1.sln +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2019.netcore3_1.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29424.173 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "helloworld\HelloWorld.vs2019.netcore3_1.csproj", "{EC7E2BED-FDCB-4D1B-00EE-3F029FD5E086}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "HelloWorld\HelloWorld.vs2019.netcore3_1.csproj", "{EC7E2BED-FDCB-4D1B-00EE-3F029FD5E086}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.netcore2_1.csproj b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.netcore2_1.csproj index d9a66c8c8..0aad370f5 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.netcore2_1.csproj +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.netcore2_1.csproj @@ -17,8 +17,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2019.netcore3_1.csproj b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2019.netcore3_1.csproj index 13b92d789..feb2ebe92 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2019.netcore3_1.csproj +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2019.netcore3_1.csproj @@ -17,8 +17,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj index 418104e96..d3de2a36c 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj @@ -17,8 +17,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -41,8 +41,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true @@ -53,8 +53,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln index d4380f97f..9843d7a72 100644 --- a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln +++ b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29424.173 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldMultiFramework", "helloworldmultiframework\HelloWorldMultiFramework.vs2019.csproj", "{898E2314-FD0E-0054-6BD6-A944C0C1C723}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldMultiFramework", "HelloWorldMultiFramework\HelloWorldMultiFramework.vs2019.csproj", "{898E2314-FD0E-0054-6BD6-A944C0C1C723}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.v4_6_1.sln b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.v4_6_1.sln index 640f42a32..56188cb3b 100644 --- a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.v4_6_1.sln +++ b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.v4_6_1.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "helloworld\HelloWorld.vs2017.v4_6_1.csproj", "{756E7D29-4FC3-9875-8B88-8C98634A56D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "HelloWorld\HelloWorld.vs2017.v4_6_1.csproj", "{756E7D29-4FC3-9875-8B88-8C98634A56D5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2019.v4_7_2.sln b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2019.v4_7_2.sln index e33ce0a38..7a7375d89 100644 --- a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2019.v4_7_2.sln +++ b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2019.v4_7_2.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29424.173 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "helloworld\HelloWorld.vs2019.v4_7_2.csproj", "{AA8FA7D7-B647-16D9-001F-40E3B47416DF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "HelloWorld\HelloWorld.vs2019.v4_7_2.csproj", "{AA8FA7D7-B647-16D9-001F-40E3B47416DF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.v4_6_1.csproj b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.v4_6_1.csproj index 712718ee0..ed6cc3e65 100644 --- a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.v4_6_1.csproj +++ b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.v4_6_1.csproj @@ -17,8 +17,8 @@ true full false - output\vs2017\debug - obj\anycpu\debug + output\vs2017\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\vs2017\release - obj\anycpu\release + output\vs2017\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2019.v4_7_2.csproj b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2019.v4_7_2.csproj index 0f008fb81..a03e368db 100644 --- a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2019.v4_7_2.csproj +++ b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2019.v4_7_2.csproj @@ -17,8 +17,8 @@ true full false - output\vs2019\debug - obj\anycpu\debug + output\vs2019\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\vs2019\release - obj\anycpu\release + output\vs2019\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj index d0b9ae972..f35a7a7b5 100644 --- a/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj +++ b/samples/NetCore/DotNetFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj @@ -17,8 +17,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -41,8 +41,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true @@ -53,8 +53,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/HelloWorldMultiFrameworksSolution.vs2019.sln b/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/HelloWorldMultiFrameworksSolution.vs2019.sln index 1492c6d09..dbf9d552f 100644 --- a/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/HelloWorldMultiFrameworksSolution.vs2019.sln +++ b/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/HelloWorldMultiFrameworksSolution.vs2019.sln @@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29424.173 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldMultiFrameworks", "helloworldmultiframeworks\HelloWorldMultiFrameworks.vs2019.csproj", "{39A4FB20-F152-B28B-4386-81262F615392}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldMultiFrameworks", "HelloWorldMultiFrameworks\HelloWorldMultiFrameworks.vs2019.csproj", "{39A4FB20-F152-B28B-4386-81262F615392}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldLib", "helloworldlib\HelloWorldLib.vs2019.csproj", "{2118A95F-4FDA-D7C9-6CC8-A7A85A81062E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldLib", "HelloWorldLib\HelloWorldLib.vs2019.csproj", "{2118A95F-4FDA-D7C9-6CC8-A7A85A81062E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/helloworldlib/HelloWorldLib.vs2019.csproj b/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/helloworldlib/HelloWorldLib.vs2019.csproj index bbe6f1b47..5d37bfea5 100644 --- a/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/helloworldlib/HelloWorldLib.vs2019.csproj +++ b/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/helloworldlib/HelloWorldLib.vs2019.csproj @@ -17,8 +17,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -41,8 +41,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -53,8 +53,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -65,8 +65,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true @@ -77,8 +77,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true @@ -89,8 +89,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true @@ -101,8 +101,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/helloworldmultiframeworks/HelloWorldMultiFrameworks.vs2019.csproj b/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/helloworldmultiframeworks/HelloWorldMultiFrameworks.vs2019.csproj index c100bf410..a2572c17d 100644 --- a/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/helloworldmultiframeworks/HelloWorldMultiFrameworks.vs2019.csproj +++ b/samples/NetCore/DotNetMultiFrameworksHelloWorld/reference/projects/helloworldmultiframeworks/HelloWorldMultiFrameworks.vs2019.csproj @@ -17,8 +17,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -41,8 +41,8 @@ true full false - output\anycpu\debug - obj\anycpu\debug + output\anycpu\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -53,8 +53,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true @@ -65,8 +65,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true @@ -77,8 +77,8 @@ false pdbonly true - output\anycpu\release - obj\anycpu\release + output\anycpu\Release + obj\anycpu\Release TRACE 4 true @@ -94,7 +94,7 @@ - + {2118a95f-4fda-d7c9-6cc8-a7a85a81062e} HelloWorldLib diff --git a/samples/PackageReferences/reference/projects/PackageReferenceSolution.vs2017.v4_7_2.sln b/samples/PackageReferences/reference/projects/PackageReferenceSolution.vs2017.v4_7_2.sln index 12b3b4c42..46177d504 100644 --- a/samples/PackageReferences/reference/projects/PackageReferenceSolution.vs2017.v4_7_2.sln +++ b/samples/PackageReferences/reference/projects/PackageReferenceSolution.vs2017.v4_7_2.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageReferences", "packagereferences\PackageReferences.vs2017.v4_7_2.csproj", "{EFF94431-45DF-6D89-7216-60D79A2DFD88}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageReferences", "PackageReferences\PackageReferences.vs2017.v4_7_2.csproj", "{EFF94431-45DF-6D89-7216-60D79A2DFD88}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/PackageReferences/reference/projects/PackageReferenceSolution.vs2019.v4_7_2.sln b/samples/PackageReferences/reference/projects/PackageReferenceSolution.vs2019.v4_7_2.sln index c35994fbb..bbf6c756a 100644 --- a/samples/PackageReferences/reference/projects/PackageReferenceSolution.vs2019.v4_7_2.sln +++ b/samples/PackageReferences/reference/projects/PackageReferenceSolution.vs2019.v4_7_2.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29424.173 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageReferences", "packagereferences\PackageReferences.vs2019.v4_7_2.csproj", "{06517B8B-4E36-4591-FB37-BF1B4CE0A69B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageReferences", "PackageReferences\PackageReferences.vs2019.v4_7_2.csproj", "{06517B8B-4E36-4591-FB37-BF1B4CE0A69B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/PackageReferences/reference/projects/packagereferences/PackageReferences.vs2017.v4_7_2.csproj b/samples/PackageReferences/reference/projects/packagereferences/PackageReferences.vs2017.v4_7_2.csproj index 706027125..a165f88df 100644 --- a/samples/PackageReferences/reference/projects/packagereferences/PackageReferences.vs2017.v4_7_2.csproj +++ b/samples/PackageReferences/reference/projects/packagereferences/PackageReferences.vs2017.v4_7_2.csproj @@ -17,8 +17,8 @@ true full false - output\vs2017\debug - obj\anycpu\debug + output\vs2017\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\vs2017\release - obj\anycpu\release + output\vs2017\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/PackageReferences/reference/projects/packagereferences/PackageReferences.vs2019.v4_7_2.csproj b/samples/PackageReferences/reference/projects/packagereferences/PackageReferences.vs2019.v4_7_2.csproj index 2bdffde5b..515c71bfd 100644 --- a/samples/PackageReferences/reference/projects/packagereferences/PackageReferences.vs2019.v4_7_2.csproj +++ b/samples/PackageReferences/reference/projects/packagereferences/PackageReferences.vs2019.v4_7_2.csproj @@ -17,8 +17,8 @@ true full false - output\vs2019\debug - obj\anycpu\debug + output\vs2019\Debug + obj\anycpu\Debug DEBUG;TRACE 4 true @@ -29,8 +29,8 @@ false pdbonly true - output\vs2019\release - obj\anycpu\release + output\vs2019\Release + obj\anycpu\Release TRACE 4 true diff --git a/samples/QTFileCustomBuild/reference/projects/qtfilecustombuild_vs2017_win64.vcxproj b/samples/QTFileCustomBuild/reference/projects/qtfilecustombuild_vs2017_win64.vcxproj index 914e989b0..b85043e45 100644 --- a/samples/QTFileCustomBuild/reference/projects/qtfilecustombuild_vs2017_win64.vcxproj +++ b/samples/QTFileCustomBuild/reference/projects/qtfilecustombuild_vs2017_win64.vcxproj @@ -54,32 +54,32 @@ qtfilecustombuild - output\win64\debug\ - obj\win64\debug\ + output\win64\Debug\ + obj\win64\Debug\ .exe true false - output\win64\debug\qtfilecustombuild.exe + output\win64\Debug\qtfilecustombuild.exe false qtfilecustombuild - output\win64\release\ - obj\win64\release\ + output\win64\Release\ + obj\win64\Release\ .exe true false - output\win64\release\qtfilecustombuild.exe + output\win64\Release\qtfilecustombuild.exe false qtfilecustombuild - output\win64\retail\ - obj\win64\retail\ + output\win64\Retail\ + obj\win64\Retail\ .exe true false - output\win64\retail\qtfilecustombuild.exe + output\win64\Retail\qtfilecustombuild.exe false @@ -129,17 +129,17 @@ Default /Zc:__cplusplus stdafx.h - obj\win64\debug\QTFileCustomBuild.pch - obj\win64\debug\qtfilecustombuild_compiler.pdb + obj\win64\Debug\QTFileCustomBuild.pch + obj\win64\Debug\QTFileCustomBuild_compiler.pdb MultiThreadedDebug Console true - output\win64\debug\qtfilecustombuild.exe + output\win64\Debug\qtfilecustombuild.exe NotSet ..\qt\5.9.2\msvc2017_64\lib - output\win64\debug\qtfilecustombuild.pdb + output\win64\Debug\QTFileCustomBuild.pdb true false false @@ -164,7 +164,7 @@ false true - output\win64\debug\qtfilecustombuild.map + output\win64\Debug\qtfilecustombuild.map @@ -215,17 +215,17 @@ Default /Zc:__cplusplus stdafx.h - obj\win64\release\QTFileCustomBuild.pch - obj\win64\release\qtfilecustombuild_compiler.pdb + obj\win64\Release\QTFileCustomBuild.pch + obj\win64\Release\QTFileCustomBuild_compiler.pdb MultiThreaded Console true - output\win64\release\qtfilecustombuild.exe + output\win64\Release\qtfilecustombuild.exe NotSet ..\qt\5.9.2\msvc2017_64\lib - output\win64\release\qtfilecustombuild.pdb + output\win64\Release\QTFileCustomBuild.pdb true false false @@ -250,7 +250,7 @@ false true - output\win64\release\qtfilecustombuild.map + output\win64\Release\qtfilecustombuild.map @@ -301,17 +301,17 @@ Default /Zc:__cplusplus stdafx.h - obj\win64\retail\QTFileCustomBuild.pch - obj\win64\retail\qtfilecustombuild_compiler.pdb + obj\win64\Retail\QTFileCustomBuild.pch + obj\win64\Retail\QTFileCustomBuild_compiler.pdb MultiThreaded Console true - output\win64\retail\qtfilecustombuild.exe + output\win64\Retail\qtfilecustombuild.exe NotSet ..\qt\5.9.2\msvc2017_64\lib - output\win64\retail\qtfilecustombuild.pdb + output\win64\Retail\QTFileCustomBuild.pdb true false false @@ -336,7 +336,7 @@ false true - output\win64\retail\qtfilecustombuild.map + output\win64\Retail\qtfilecustombuild.map diff --git a/samples/SimpleExeLibDependency/reference/projects/LibStuffProject_ProjectName.vcxproj b/samples/SimpleExeLibDependency/reference/projects/LibStuffProject_ProjectName.vcxproj index 84d5f4d86..ee098e151 100644 --- a/samples/SimpleExeLibDependency/reference/projects/LibStuffProject_ProjectName.vcxproj +++ b/samples/SimpleExeLibDependency/reference/projects/LibStuffProject_ProjectName.vcxproj @@ -33,7 +33,7 @@ libstuffproject_projectname ..\libstuff\lib\ - obj\libstuffproject_projectname\win64_debug_vs2017\ + obj\LibStuffProject_ProjectName\win64_Debug_vs2017\ .lib true false @@ -86,7 +86,7 @@ Cdecl Default /Zc:__cplusplus - obj\libstuffproject_projectname\win64_debug_vs2017\libstuffproject_projectname_compiler.pdb + obj\LibStuffProject_ProjectName\win64_Debug_vs2017\LibStuffProject_ProjectName_compiler.pdb MultiThreadedDebug diff --git a/samples/SimpleExeLibDependency/reference/projects/SimpleExeProjectName_vs2017_win64.vcxproj b/samples/SimpleExeLibDependency/reference/projects/SimpleExeProjectName_vs2017_win64.vcxproj index 70aa3f23a..63d2d86af 100644 --- a/samples/SimpleExeLibDependency/reference/projects/SimpleExeProjectName_vs2017_win64.vcxproj +++ b/samples/SimpleExeLibDependency/reference/projects/SimpleExeProjectName_vs2017_win64.vcxproj @@ -32,12 +32,12 @@ simpleexeprojectname - output\win64\debug\ - obj\simpleexeprojectname\win64_debug_vs2017\ + output\win64\Debug\ + obj\SimpleExeProjectName\win64_Debug_vs2017\ .exe true false - output\win64\debug\simpleexeprojectname.exe + output\win64\Debug\simpleexeprojectname.exe false @@ -86,16 +86,16 @@ Cdecl Default /Zc:__cplusplus - obj\simpleexeprojectname\win64_debug_vs2017\simpleexeprojectname_compiler.pdb + obj\SimpleExeProjectName\win64_Debug_vs2017\SimpleExeProjectName_compiler.pdb MultiThreadedDebug Console true - output\win64\debug\simpleexeprojectname.exe + output\win64\Debug\simpleexeprojectname.exe NotSet ..\libstuff\lib - output\win64\debug\simpleexeprojectname.pdb + output\win64\Debug\SimpleExeProjectName.pdb true false false @@ -120,7 +120,7 @@ false true - output\win64\debug\simpleexeprojectname.map + output\win64\Debug\simpleexeprojectname.map true