diff --git a/build/pgo/Terminal.PGO.DB.nuspec b/build/pgo/Terminal.PGO.DB.nuspec index 306fb4ee32..d49574423a 100644 --- a/build/pgo/Terminal.PGO.DB.nuspec +++ b/build/pgo/Terminal.PGO.DB.nuspec @@ -1,4 +1,4 @@ - + Microsoft.Internal.Windows.Terminal.PGODatabase diff --git a/build/rules/Branding.targets b/build/rules/Branding.targets index f72a2430a4..0ce12dfca5 100644 --- a/build/rules/Branding.targets +++ b/build/rules/Branding.targets @@ -1,5 +1,5 @@ - + <_WTBrandingPreprocessorToken Condition="'$(WindowsTerminalBranding)'=='Preview'">WT_BRANDING_PREVIEW <_WTBrandingPreprocessorToken Condition="'$(WindowsTerminalBranding)'=='Release'">WT_BRANDING_RELEASE diff --git a/build/rules/CollectWildcardResources.targets b/build/rules/CollectWildcardResources.targets index b568989090..4b2139137a 100644 --- a/build/rules/CollectWildcardResources.targets +++ b/build/rules/CollectWildcardResources.targets @@ -1,5 +1,5 @@ - + diff --git a/build/rules/GenerateFeatureFlags.proj b/build/rules/GenerateFeatureFlags.proj index 7ffb313065..686365c0ca 100644 --- a/build/rules/GenerateFeatureFlags.proj +++ b/build/rules/GenerateFeatureFlags.proj @@ -1,5 +1,5 @@ - + diff --git a/build/rules/GenerateSxsManifestsFromWinmds.targets b/build/rules/GenerateSxsManifestsFromWinmds.targets index 7911429a77..600f9980ce 100644 --- a/build/rules/GenerateSxsManifestsFromWinmds.targets +++ b/build/rules/GenerateSxsManifestsFromWinmds.targets @@ -1,5 +1,5 @@ - + $(BeforeLinkTargets); diff --git a/common.openconsole.props b/common.openconsole.props index e92b42f4f9..791c9ad948 100644 --- a/common.openconsole.props +++ b/common.openconsole.props @@ -1,5 +1,5 @@ - + diff --git a/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj b/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj index 42ee961482..42ea2a739d 100644 --- a/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj +++ b/samples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj @@ -1,5 +1,5 @@ - + Debug diff --git a/samples/ConPTY/GUIConsole/GUIConsole.WPF/GUIConsole.WPF.csproj b/samples/ConPTY/GUIConsole/GUIConsole.WPF/GUIConsole.WPF.csproj index 77ce7fa2fb..bfe5dd465b 100644 --- a/samples/ConPTY/GUIConsole/GUIConsole.WPF/GUIConsole.WPF.csproj +++ b/samples/ConPTY/GUIConsole/GUIConsole.WPF/GUIConsole.WPF.csproj @@ -1,5 +1,5 @@ - + Debug diff --git a/samples/ConPTY/MiniTerm/MiniTerm/MiniTerm.csproj b/samples/ConPTY/MiniTerm/MiniTerm/MiniTerm.csproj index fba056d5a9..6ef2ef65c6 100644 --- a/samples/ConPTY/MiniTerm/MiniTerm/MiniTerm.csproj +++ b/samples/ConPTY/MiniTerm/MiniTerm/MiniTerm.csproj @@ -1,5 +1,5 @@ - + Debug diff --git a/scratch/ScratchIslandApp/Package/Package.wapproj b/scratch/ScratchIslandApp/Package/Package.wapproj index 4e4ba1090f..b99e588aac 100644 --- a/scratch/ScratchIslandApp/Package/Package.wapproj +++ b/scratch/ScratchIslandApp/Package/Package.wapproj @@ -1,5 +1,5 @@ - + diff --git a/scratch/ScratchIslandApp/SampleApp/SampleAppLib.vcxproj b/scratch/ScratchIslandApp/SampleApp/SampleAppLib.vcxproj index 3eb935e358..2ed7347b1a 100644 --- a/scratch/ScratchIslandApp/SampleApp/SampleAppLib.vcxproj +++ b/scratch/ScratchIslandApp/SampleApp/SampleAppLib.vcxproj @@ -1,5 +1,5 @@ - + {a4394404-37f7-41c1-802b-49788d3720e3} Win32Proj diff --git a/scratch/ScratchIslandApp/SampleApp/dll/SampleApp.vcxproj b/scratch/ScratchIslandApp/SampleApp/dll/SampleApp.vcxproj index f0579df3c4..77c747b6f9 100644 --- a/scratch/ScratchIslandApp/SampleApp/dll/SampleApp.vcxproj +++ b/scratch/ScratchIslandApp/SampleApp/dll/SampleApp.vcxproj @@ -1,5 +1,5 @@ - + {26c51792-41a3-4fe0-ab5e-8b69d557bf91} SampleApp diff --git a/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj b/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj index 0f2e78cba3..b1dec01d9b 100644 --- a/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj +++ b/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj @@ -1,5 +1,5 @@ - + diff --git a/src/StaticAnalysis.ruleset b/src/StaticAnalysis.ruleset index ef913c804f..fc9c95a660 100644 --- a/src/StaticAnalysis.ruleset +++ b/src/StaticAnalysis.ruleset @@ -1,20 +1,18 @@ - - + + - - - + + + - - diff --git a/src/audio/midi/lib/midi.vcxproj b/src/audio/midi/lib/midi.vcxproj index e6e7318a45..11bb2944ea 100644 --- a/src/audio/midi/lib/midi.vcxproj +++ b/src/audio/midi/lib/midi.vcxproj @@ -1,5 +1,5 @@ - + {3c67784e-1453-49c2-9660-483e2cc7f7ad} Win32Proj diff --git a/src/buffer/out/lib/bufferout.vcxproj b/src/buffer/out/lib/bufferout.vcxproj index 7f48bb3fee..f55f751d98 100644 --- a/src/buffer/out/lib/bufferout.vcxproj +++ b/src/buffer/out/lib/bufferout.vcxproj @@ -1,5 +1,5 @@ - + {0CF235BD-2DA0-407E-90EE-C467E8BBC714} Win32Proj diff --git a/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj b/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj index ca276b2b13..3ed68250f9 100644 --- a/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj +++ b/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj @@ -1,5 +1,5 @@ - + {531C23E7-4B76-4C08-8BBD-04164CB628C9} Win32Proj diff --git a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj index b5274d0910..a00aaecd33 100644 --- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj +++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj @@ -1,5 +1,5 @@ - + diff --git a/src/cascadia/CascadiaResources.build.items b/src/cascadia/CascadiaResources.build.items index d2d522af8b..cfd11c79f4 100644 --- a/src/cascadia/CascadiaResources.build.items +++ b/src/cascadia/CascadiaResources.build.items @@ -1,5 +1,5 @@ - + diff --git a/src/cascadia/ElevateShim/elevate-shim.vcxproj b/src/cascadia/ElevateShim/elevate-shim.vcxproj index ba12ddf62f..95b6240659 100644 --- a/src/cascadia/ElevateShim/elevate-shim.vcxproj +++ b/src/cascadia/ElevateShim/elevate-shim.vcxproj @@ -1,5 +1,5 @@ - + {416fd703-baa7-4f6e-9361-64f550ec8fca} Win32Proj diff --git a/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj b/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj index 76e0f07e29..87704cde00 100644 --- a/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj +++ b/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj @@ -1,5 +1,5 @@ - + diff --git a/src/common.build.tests.props b/src/common.build.tests.props index 0c93e53ed7..f670a1d880 100644 --- a/src/common.build.tests.props +++ b/src/common.build.tests.props @@ -1,5 +1,5 @@ - + INLINE_TEST_METHOD_MARKUP;UNIT_TESTING;%(PreprocessorDefinitions) diff --git a/src/common.nugetversions.props b/src/common.nugetversions.props index 53eb979e79..76c1de8a65 100644 --- a/src/common.nugetversions.props +++ b/src/common.nugetversions.props @@ -1,5 +1,5 @@ - + @@ -18,25 +18,25 @@ $(MSBuildThisFileDirectory)..\packages\Appium.WebDriver.3.0.0.2 - + $(MSBuildThisFileDirectory)..\packages\Castle.Core.4.1.1 - + $(MSBuildThisFileDirectory)..\packages\Newtonsoft.Json.13.0.1 - + $(MSBuildThisFileDirectory)..\packages\Selenium.WebDriver.3.5.0 - + $(MSBuildThisFileDirectory)..\packages\Selenium.Support.3.5.0 - + diff --git a/src/cppwinrt.build.post.props b/src/cppwinrt.build.post.props index 68fc7ec261..5bb74cf526 100644 --- a/src/cppwinrt.build.post.props +++ b/src/cppwinrt.build.post.props @@ -1,4 +1,4 @@ - + diff --git a/src/cppwinrt.build.pre.props b/src/cppwinrt.build.pre.props index 30a659e33c..c83d1196b3 100644 --- a/src/cppwinrt.build.pre.props +++ b/src/cppwinrt.build.pre.props @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ true true en-US - 14.0 + 17.0 10.0 diff --git a/src/dep/fmt/fmt.vcxproj b/src/dep/fmt/fmt.vcxproj index ff67e96423..14222a8652 100644 --- a/src/dep/fmt/fmt.vcxproj +++ b/src/dep/fmt/fmt.vcxproj @@ -1,5 +1,5 @@ - + {6bae5851-50d5-4934-8d5e-30361a8a40f3} Win32Proj diff --git a/src/features.xml b/src/features.xml index c8ebc24568..6e5dc85dfe 100644 --- a/src/features.xml +++ b/src/features.xml @@ -1,4 +1,4 @@ - + @@ -81,7 +81,7 @@ If enabled, the foreground color will, when necessary, be automatically adjusted to make it more visible. AlwaysEnabled - + Feature_VtPassthroughMode Enables passthrough option per profile in Terminal and ConPTY ability to use passthrough API dispatch engine diff --git a/src/host/exe/Host.EXE.vcxproj b/src/host/exe/Host.EXE.vcxproj index 40d3007b2b..13084434d7 100644 --- a/src/host/exe/Host.EXE.vcxproj +++ b/src/host/exe/Host.EXE.vcxproj @@ -1,5 +1,5 @@ - + {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} Win32Proj diff --git a/src/host/ft_fuzzer/Host.FuzzWrapper.vcxproj b/src/host/ft_fuzzer/Host.FuzzWrapper.vcxproj index f18a02561c..7525726d8f 100644 --- a/src/host/ft_fuzzer/Host.FuzzWrapper.vcxproj +++ b/src/host/ft_fuzzer/Host.FuzzWrapper.vcxproj @@ -1,5 +1,5 @@ - + {05d9052f-d78f-478f-968a-2de38a6db996} Win32Proj diff --git a/src/host/ft_host/Host.FeatureTests.vcxproj b/src/host/ft_host/Host.FeatureTests.vcxproj index 507dcfab0b..f3d9d4c6e4 100644 --- a/src/host/ft_host/Host.FeatureTests.vcxproj +++ b/src/host/ft_host/Host.FeatureTests.vcxproj @@ -1,5 +1,5 @@ - + {8CDB8850-7484-4EC7-B45B-181F85B2EE54} Win32Proj diff --git a/src/host/ft_uia/Host.Tests.UIA.csproj b/src/host/ft_uia/Host.Tests.UIA.csproj index c402b647dd..0a3c8dd13a 100644 --- a/src/host/ft_uia/Host.Tests.UIA.csproj +++ b/src/host/ft_uia/Host.Tests.UIA.csproj @@ -1,5 +1,5 @@ - + {C17E1BF3-9D34-4779-9458-A8EF98CC5662} Library @@ -149,7 +149,7 @@ - copy "$(SolutionDir)\dep\WinAppDriver\*" "$(OutDir)\" + copy "$(SolutionDir)\dep\WinAppDriver\*" "$(OutDir)\" - + \ No newline at end of file diff --git a/src/host/host-common.vcxitems b/src/host/host-common.vcxitems index af33f9b31a..3ff022e82c 100644 --- a/src/host/host-common.vcxitems +++ b/src/host/host-common.vcxitems @@ -1,5 +1,5 @@ - + diff --git a/src/host/lib/hostlib.vcxproj b/src/host/lib/hostlib.vcxproj index cf35a1301e..65fef3bffe 100644 --- a/src/host/lib/hostlib.vcxproj +++ b/src/host/lib/hostlib.vcxproj @@ -1,5 +1,5 @@ - + {06EC74CB-9A12-429C-B551-8562EC954746} Win32Proj diff --git a/src/host/proxy/Host.Proxy.vcxproj b/src/host/proxy/Host.Proxy.vcxproj index fc8ff48307..137b1f1a8b 100644 --- a/src/host/proxy/Host.Proxy.vcxproj +++ b/src/host/proxy/Host.Proxy.vcxproj @@ -1,5 +1,5 @@ - + {71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF} Win32Proj @@ -21,7 +21,7 @@ - diff --git a/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj b/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj index 6ddbcdd116..ce28e436e1 100644 --- a/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj +++ b/src/terminal/parser/ut_parser/Parser.UnitTests.vcxproj @@ -1,5 +1,5 @@ - + {12144E07-FE63-4D33-9231-748B8D8C3792} Win32Proj diff --git a/src/til/ut_til/til.unit.tests.vcxproj b/src/til/ut_til/til.unit.tests.vcxproj index ac5fa9bebb..444b0e4cae 100644 --- a/src/til/ut_til/til.unit.tests.vcxproj +++ b/src/til/ut_til/til.unit.tests.vcxproj @@ -1,5 +1,5 @@ - + {767268EE-174A-46FE-96F0-EEE698A1BBC9} Win32Proj diff --git a/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj b/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj index d28ba57c68..0aa07336b9 100644 --- a/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj +++ b/src/tools/MonarchPeasantPackage/MonarchPeasantPackage.wapproj @@ -1,5 +1,5 @@ - + 15.0 diff --git a/src/tools/MonarchPeasantSample/MonarchPeasantSample.vcxproj b/src/tools/MonarchPeasantSample/MonarchPeasantSample.vcxproj index 1e4815a9cf..7385e4abf6 100644 --- a/src/tools/MonarchPeasantSample/MonarchPeasantSample.vcxproj +++ b/src/tools/MonarchPeasantSample/MonarchPeasantSample.vcxproj @@ -1,5 +1,5 @@ - + {21b7ea5e-1ef8-49b6-ac07-11714af0e37d} diff --git a/src/tools/MonarchPeasantSample/PropertySheet.props b/src/tools/MonarchPeasantSample/PropertySheet.props index b0c622690f..9c841ec83e 100644 --- a/src/tools/MonarchPeasantSample/PropertySheet.props +++ b/src/tools/MonarchPeasantSample/PropertySheet.props @@ -1,15 +1,15 @@ - + diff --git a/src/tools/U8U16Test/U8U16Test.vcxproj b/src/tools/U8U16Test/U8U16Test.vcxproj index ef51bf93f3..f708da1f7a 100644 --- a/src/tools/U8U16Test/U8U16Test.vcxproj +++ b/src/tools/U8U16Test/U8U16Test.vcxproj @@ -1,5 +1,5 @@ - + true 15.0 diff --git a/src/tools/buffersize/buffersize.vcxproj b/src/tools/buffersize/buffersize.vcxproj index 998c2ee745..5dd1b02842 100644 --- a/src/tools/buffersize/buffersize.vcxproj +++ b/src/tools/buffersize/buffersize.vcxproj @@ -1,12 +1,12 @@ - + {ED82003F-FC5D-4E94-8B47-F480018ED064} Win32Proj buffersize buffersize buffersize - Application + Application diff --git a/src/tools/closetest/CloseTest.vcxproj b/src/tools/closetest/CloseTest.vcxproj index 6e39b9f444..e5838a2fe7 100644 --- a/src/tools/closetest/CloseTest.vcxproj +++ b/src/tools/closetest/CloseTest.vcxproj @@ -1,12 +1,12 @@ - + {C7A6A5D9-60BE-4AEB-A5F6-AFE352F86CBB} Win32Proj CloseTest CloseTest CloseTest - Application + Application diff --git a/src/tools/echokey/ConEchoKey.vcxproj b/src/tools/echokey/ConEchoKey.vcxproj index 7a9fe839d6..22e44a4204 100644 --- a/src/tools/echokey/ConEchoKey.vcxproj +++ b/src/tools/echokey/ConEchoKey.vcxproj @@ -1,12 +1,12 @@ - + {814CBEEE-894E-4327-A6E1-740504850098} Win32Proj ConEchoKey ConEchoKey ConEchoKey - Application + Application diff --git a/src/tools/fontlist/FontList.vcxproj b/src/tools/fontlist/FontList.vcxproj index 040497286d..d6f4bb75a0 100644 --- a/src/tools/fontlist/FontList.vcxproj +++ b/src/tools/fontlist/FontList.vcxproj @@ -1,12 +1,12 @@ - + {919544AC-D39B-463F-8414-3C3C67CF727C} Win32Proj FontList FontList FontList - Application + Application diff --git a/src/tools/nihilist/Nihilist.vcxproj b/src/tools/nihilist/Nihilist.vcxproj index 1496618430..e001549525 100644 --- a/src/tools/nihilist/Nihilist.vcxproj +++ b/src/tools/nihilist/Nihilist.vcxproj @@ -1,12 +1,12 @@ - + {FC802440-AD6A-4919-8F2C-7701F2B38D79} Win32Proj Nihilist Nihilist Nihilist - Application + Application diff --git a/src/tools/scratch/Scratch.vcxproj b/src/tools/scratch/Scratch.vcxproj index f2493136a3..07c917e124 100644 --- a/src/tools/scratch/Scratch.vcxproj +++ b/src/tools/scratch/Scratch.vcxproj @@ -1,5 +1,5 @@ - + {ED82003F-FC5D-4E94-8B36-F480018ED064} Win32Proj diff --git a/src/tools/vtapp/VTApp.csproj b/src/tools/vtapp/VTApp.csproj index bac290878b..e42b141f0a 100644 --- a/src/tools/vtapp/VTApp.csproj +++ b/src/tools/vtapp/VTApp.csproj @@ -1,5 +1,5 @@ - + {099193A0-1E43-4BBC-BA7F-7B351E1342DF} @@ -83,4 +83,4 @@ --> - + \ No newline at end of file diff --git a/src/tools/vtpipeterm/VtPipeTerm.vcxproj b/src/tools/vtpipeterm/VtPipeTerm.vcxproj index 9b2fcb372b..a224e54425 100644 --- a/src/tools/vtpipeterm/VtPipeTerm.vcxproj +++ b/src/tools/vtpipeterm/VtPipeTerm.vcxproj @@ -1,5 +1,5 @@ - + {814DBDDE-894E-4327-A6E1-740504850098} Win32Proj diff --git a/src/tsf/tsf.vcxproj b/src/tsf/tsf.vcxproj index 1e5a3f0cdf..26da838865 100644 --- a/src/tsf/tsf.vcxproj +++ b/src/tsf/tsf.vcxproj @@ -1,12 +1,12 @@ - + {2FD12FBB-1DDB-46D8-B818-1023C624CACA} Win32Proj tsf TextServicesFramework ConTSF - StaticLibrary + StaticLibrary diff --git a/src/types/lib/types.vcxproj b/src/types/lib/types.vcxproj index 24372906d7..6240434281 100644 --- a/src/types/lib/types.vcxproj +++ b/src/types/lib/types.vcxproj @@ -1,5 +1,5 @@ - + {18D09A24-8240-42D6-8CB6-236EEE820263} Win32Proj diff --git a/src/types/ut_types/Types.Unit.Tests.vcxproj b/src/types/ut_types/Types.Unit.Tests.vcxproj index dfd180e294..45a486c63b 100644 --- a/src/types/ut_types/Types.Unit.Tests.vcxproj +++ b/src/types/ut_types/Types.Unit.Tests.vcxproj @@ -1,5 +1,5 @@ - + {34de34d3-1cd6-4ee3-8bd9-a26b5b27ec73} Win32Proj diff --git a/src/wap-common.build.post.props b/src/wap-common.build.post.props index b375ae3bb9..00177a0483 100644 --- a/src/wap-common.build.post.props +++ b/src/wap-common.build.post.props @@ -1,5 +1,5 @@ - + diff --git a/src/wap-common.build.pre.props b/src/wap-common.build.pre.props index 89fb128f67..bfdb538770 100644 --- a/src/wap-common.build.pre.props +++ b/src/wap-common.build.pre.props @@ -1,7 +1,7 @@ - - - 15.0 + + + 17.0 diff --git a/src/winconpty/dll/winconptydll.vcxproj b/src/winconpty/dll/winconptydll.vcxproj index a9467f61ab..ef86147e67 100644 --- a/src/winconpty/dll/winconptydll.vcxproj +++ b/src/winconpty/dll/winconptydll.vcxproj @@ -1,5 +1,5 @@ - + {a22ec5f6-7851-4b88-ac52-47249d437a52} Win32Proj @@ -29,37 +29,37 @@ winconpty.def - - - <_ContinueOnError Condition="'$(BuildingProject)' == 'true'">true - <_ContinueOnError Condition="'$(BuildingProject)' != 'true'">false - - - - - - - <_PackagingOutputsUnexpanded Include="%(_BuiltProjectOutputGroupOutput.FinalOutputPath)"> - %(_BuiltProjectOutputGroupOutput.TargetPath) - BuiltProjectOutputGroup - $(ProjectName) - - - - - - - <_PackagingOutputsUnexpanded Include="%(_DebugSymbolsProjectOutputGroupOutput.FinalOutputPath)"> - DebugSymbolsProjectOutputGroup - $(ProjectName) - - - - - %(Filename)%(Extension) - - + + + <_ContinueOnError Condition="'$(BuildingProject)' == 'true'">true + <_ContinueOnError Condition="'$(BuildingProject)' != 'true'">false + + + + + + + <_PackagingOutputsUnexpanded Include="%(_BuiltProjectOutputGroupOutput.FinalOutputPath)"> + %(_BuiltProjectOutputGroupOutput.TargetPath) + BuiltProjectOutputGroup + $(ProjectName) + + + + + + + <_PackagingOutputsUnexpanded Include="%(_DebugSymbolsProjectOutputGroupOutput.FinalOutputPath)"> + DebugSymbolsProjectOutputGroup + $(ProjectName) + + + + + %(Filename)%(Extension) + + diff --git a/src/winconpty/ft_pty/winconpty.FeatureTests.vcxproj b/src/winconpty/ft_pty/winconpty.FeatureTests.vcxproj index 503ff27408..9aa2c80894 100644 --- a/src/winconpty/ft_pty/winconpty.FeatureTests.vcxproj +++ b/src/winconpty/ft_pty/winconpty.FeatureTests.vcxproj @@ -1,5 +1,5 @@ - + {024052DE-83FB-4653-AEA4-90790D29D5BD} Win32Proj diff --git a/src/winconpty/lib/winconptylib.vcxproj b/src/winconpty/lib/winconptylib.vcxproj index ce30460c59..8182dbfd6a 100644 --- a/src/winconpty/lib/winconptylib.vcxproj +++ b/src/winconpty/lib/winconptylib.vcxproj @@ -1,5 +1,5 @@ - + {58a03bb2-df5a-4b66-91a0-7ef3ba01269a} Win32Proj @@ -26,37 +26,37 @@ - - - <_ContinueOnError Condition="'$(BuildingProject)' == 'true'">true - <_ContinueOnError Condition="'$(BuildingProject)' != 'true'">false - - - - - - - <_PackagingOutputsUnexpanded Include="%(_BuiltProjectOutputGroupOutput.FinalOutputPath)"> - %(_BuiltProjectOutputGroupOutput.TargetPath) - BuiltProjectOutputGroup - $(ProjectName) - - - - - - - <_PackagingOutputsUnexpanded Include="%(_DebugSymbolsProjectOutputGroupOutput.FinalOutputPath)"> - DebugSymbolsProjectOutputGroup - $(ProjectName) - - - - - %(Filename)%(Extension) - - + + + <_ContinueOnError Condition="'$(BuildingProject)' == 'true'">true + <_ContinueOnError Condition="'$(BuildingProject)' != 'true'">false + + + + + + + <_PackagingOutputsUnexpanded Include="%(_BuiltProjectOutputGroupOutput.FinalOutputPath)"> + %(_BuiltProjectOutputGroupOutput.TargetPath) + BuiltProjectOutputGroup + $(ProjectName) + + + + + + + <_PackagingOutputsUnexpanded Include="%(_DebugSymbolsProjectOutputGroupOutput.FinalOutputPath)"> + DebugSymbolsProjectOutputGroup + $(ProjectName) + + + + + %(Filename)%(Extension) + + diff --git a/src/winconpty/package/managed/Microsoft.Windows.Console.ConPTY.props b/src/winconpty/package/managed/Microsoft.Windows.Console.ConPTY.props index 2aa5b62015..c93abbf37a 100644 --- a/src/winconpty/package/managed/Microsoft.Windows.Console.ConPTY.props +++ b/src/winconpty/package/managed/Microsoft.Windows.Console.ConPTY.props @@ -1,5 +1,5 @@ - - + + $(PlatformTarget) diff --git a/src/winconpty/package/managed/Microsoft.Windows.Console.ConPTY.targets b/src/winconpty/package/managed/Microsoft.Windows.Console.ConPTY.targets index 325cf10a5b..8559c06e3a 100644 --- a/src/winconpty/package/managed/Microsoft.Windows.Console.ConPTY.targets +++ b/src/winconpty/package/managed/Microsoft.Windows.Console.ConPTY.targets @@ -1,5 +1,5 @@ - - + + x86\OpenConsole.exe diff --git a/src/winconpty/package/native/Microsoft.Windows.Console.ConPTY.props b/src/winconpty/package/native/Microsoft.Windows.Console.ConPTY.props index 879cbb4ddd..291b3ef335 100644 --- a/src/winconpty/package/native/Microsoft.Windows.Console.ConPTY.props +++ b/src/winconpty/package/native/Microsoft.Windows.Console.ConPTY.props @@ -1,4 +1,4 @@ - - + + diff --git a/src/winconpty/package/native/Microsoft.Windows.Console.ConPTY.targets b/src/winconpty/package/native/Microsoft.Windows.Console.ConPTY.targets index 00a7a31065..e4c4fb0eda 100644 --- a/src/winconpty/package/native/Microsoft.Windows.Console.ConPTY.targets +++ b/src/winconpty/package/native/Microsoft.Windows.Console.ConPTY.targets @@ -1,5 +1,5 @@ - - + + $(MSBuildThisFileDirectory)..\..\inc\;%(AdditionalIncludeDirectories) diff --git a/tools/FeatureStagingSchema.xsd b/tools/FeatureStagingSchema.xsd index 3e6819244f..49d4f7ce3d 100644 --- a/tools/FeatureStagingSchema.xsd +++ b/tools/FeatureStagingSchema.xsd @@ -1,4 +1,4 @@ - +