diff --git a/build/pipelines/templates/build-console-audit-job.yml b/build/pipelines/templates/build-console-audit-job.yml
index b5bb0699c..9a4ae932d 100644
--- a/build/pipelines/templates/build-console-audit-job.yml
+++ b/build/pipelines/templates/build-console-audit-job.yml
@@ -8,7 +8,7 @@ jobs:
variables:
BuildConfiguration: AuditMode
BuildPlatform: ${{ parameters.platform }}
- pool: { vmImage: vs2017-win2016 }
+ pool: { vmImage: windows-2019 }
steps:
- checkout: self
@@ -45,7 +45,7 @@ jobs:
displayName: 'Build solution **\OpenConsole.sln'
inputs:
solution: '**\OpenConsole.sln'
- vsVersion: 15.0
+ vsVersion: 16.0
platform: '$(BuildPlatform)'
configuration: '$(BuildConfiguration)'
msbuildArgs: ${{ parameters.additionalBuildArguments }}
diff --git a/build/pipelines/templates/build-console-ci.yml b/build/pipelines/templates/build-console-ci.yml
index a4ac7b6d8..34c8d09ad 100644
--- a/build/pipelines/templates/build-console-ci.yml
+++ b/build/pipelines/templates/build-console-ci.yml
@@ -9,7 +9,7 @@ jobs:
variables:
BuildConfiguration: ${{ parameters.configuration }}
BuildPlatform: ${{ parameters.platform }}
- pool: { vmImage: vs2017-win2016 }
+ pool: { vmImage: windows-2019 }
steps:
- template: build-console-steps.yml
diff --git a/build/pipelines/templates/build-console-steps.yml b/build/pipelines/templates/build-console-steps.yml
index 225b5b7c2..ec26880be 100644
--- a/build/pipelines/templates/build-console-steps.yml
+++ b/build/pipelines/templates/build-console-steps.yml
@@ -39,7 +39,7 @@ steps:
displayName: 'Build solution **\OpenConsole.sln'
inputs:
solution: '**\OpenConsole.sln'
- vsVersion: 15.0
+ vsVersion: 16.0
platform: '$(BuildPlatform)'
configuration: '$(BuildConfiguration)'
msbuildArgs: ${{ parameters.additionalBuildArguments }}
diff --git a/build/pipelines/templates/check-formatting.yml b/build/pipelines/templates/check-formatting.yml
index e06af4e8e..b60c6041a 100644
--- a/build/pipelines/templates/check-formatting.yml
+++ b/build/pipelines/templates/check-formatting.yml
@@ -2,7 +2,7 @@
jobs:
- job: CodeFormatCheck
displayName: Proper Code Formatting Check
- pool: { vmImage: vs2017-win2016 }
+ pool: { vmImage: windows-2019 }
steps:
- checkout: self
diff --git a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
index f9a1d4f08..204dbc047 100644
--- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
+++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
@@ -1,18 +1,15 @@
-
-
0
2
-
- 10.0.17763.0
- 10.0.17763.0
+ 10.0.18362.0
+ 10.0.18362.0
-
-
-
-
+
+
- <_TemporaryFilteredWapProjOutput
- Include="@(_FilteredNonWapProjProjectOutput)" />
- <_FilteredNonWapProjProjectOutput Remove="@(_TemporaryFilteredWapProjOutput)" />
- <_FilteredNonWapProjProjectOutput Include="@(_TemporaryFilteredWapProjOutput)">
+ <_TemporaryFilteredWapProjOutput Include="@(_FilteredNonWapProjProjectOutput)" />
+ <_FilteredNonWapProjProjectOutput Remove="@(_TemporaryFilteredWapProjOutput)" />
+ <_FilteredNonWapProjProjectOutput Include="@(_TemporaryFilteredWapProjOutput)">
conhost.exe
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
index 150331e2c..bb49434fc 100644
--- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
+++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
@@ -1,135 +1,135 @@
-
-
-
-
-
- Application
- Windows
- false
- Windows Store
-
-
-
- 15.0
- {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}
- Win32Proj
- WindowsTerminal
- WindowsTerminal
- WindowsTerminal
-
-
- 10.0.17763.0
-
-
-
- true
-
-
-
-
- $(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;%(AdditionalIncludeDirectories);
-
-
-
- "$(OpenConsoleDir)src\cascadia\TerminalCore\lib\Generated Files";%(AdditionalIncludeDirectories);
-
-
- gdi32.lib;dwmapi.lib;Shcore.lib;%(AdditionalDependencies)
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
- Create
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- PreserveNewest
-
-
-
- true
- PreserveNewest
-
-
-
- true
- PreserveNewest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- WindowsLocalDebugger
-
-
-
- true
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ Application
+ Windows
+ false
+ Windows Store
+
+
+
+ 15.0
+ {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}
+ Win32Proj
+ WindowsTerminal
+ WindowsTerminal
+ WindowsTerminal
+
+
+ 10.0.18362.0
+
+
+
+ true
+
+
+
+
+ $(OpenConsoleDir)\src\inc;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\Console;$(OpenConsoleDir)\dep\Win32K;$(OpenConsoleDir)\dep\gsl\include;%(AdditionalIncludeDirectories);
+
+
+
+ "$(OpenConsoleDir)src\cascadia\TerminalCore\lib\Generated Files";%(AdditionalIncludeDirectories);
+
+
+ gdi32.lib;dwmapi.lib;Shcore.lib;%(AdditionalDependencies)
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ Create
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ PreserveNewest
+
+
+
+ true
+ PreserveNewest
+
+
+
+ true
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ WindowsLocalDebugger
+
+
+
+ true
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/common.build.pre.props b/src/common.build.pre.props
index d7853a892..5cae9bf79 100644
--- a/src/common.build.pre.props
+++ b/src/common.build.pre.props
@@ -40,10 +40,10 @@
- 10.0.17763.0
+ 10.0.18362.0
- v141
+ v142
Unicode
false
diff --git a/src/cppwinrt.build.pre.props b/src/cppwinrt.build.pre.props
index 509d83cbc..f937c4f6b 100644
--- a/src/cppwinrt.build.pre.props
+++ b/src/cppwinrt.build.pre.props
@@ -8,8 +8,9 @@
- 10.0.17763.0
- 10.0.17763.0
+
+ 10.0.18362.0
+ 10.0.18362.0
true
true
en-US
@@ -73,7 +74,7 @@
DynamicLibrary
- v141
+ v142
Unicode
false