diff --git a/.vsconfig b/.vsconfig index dd0b904b52..ef72b3e7cc 100644 --- a/.vsconfig +++ b/.vsconfig @@ -40,7 +40,6 @@ "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.Graphics.Tools", "Microsoft.VisualStudio.Component.VC.DiagnosticTools", - "Microsoft.VisualStudio.Component.Windows10SDK.19041", "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites", "Microsoft.ComponentGroup.Blend", "Microsoft.VisualStudio.Component.DotNetModelBuilder", @@ -55,7 +54,7 @@ "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", "Microsoft.VisualStudio.Component.VC.ASAN", - "Microsoft.VisualStudio.Component.Windows10SDK.18362", + "Microsoft.VisualStudio.Component.Windows11SDK.22000", "Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.Component.NetFX.Native", "Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard", diff --git a/azure-pipelines.nuget.yml b/azure-pipelines.nuget.yml index fe6b77e01f..48744699ed 100644 --- a/azure-pipelines.nuget.yml +++ b/azure-pipelines.nuget.yml @@ -6,7 +6,7 @@ parameters: type: string pool: - vmImage: "windows-latest" + vmImage: "windows-2019" variables: solution: "src/AppInstallerCLI.sln" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 355c491cbd..65e4bdb602 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,7 @@ pr: - src/* pool: - vmImage: 'windows-latest' + vmImage: 'windows-2019' variables: solution: 'src\AppInstallerCLI.sln' diff --git a/src/AppInstallerCLI/AppInstallerCLI.vcxproj b/src/AppInstallerCLI/AppInstallerCLI.vcxproj index 5133cc7af0..ad8607ef85 100644 --- a/src/AppInstallerCLI/AppInstallerCLI.vcxproj +++ b/src/AppInstallerCLI/AppInstallerCLI.vcxproj @@ -9,7 +9,7 @@ {5b6f90df-fd19-4bae-83d9-24dad128e777} Win32Proj AppInstallerCLI - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 true true diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj index 50b644faca..c2445f5371 100644 --- a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj +++ b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj @@ -9,7 +9,7 @@ {1c6e0108-2860-4b17-9f7e-fa5c6c1f3d3d} Win32Proj AppInstallerCLICore - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 true true diff --git a/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj b/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj index c702da8c7f..0c49ab12e0 100644 --- a/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj +++ b/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj @@ -51,7 +51,7 @@ 6aa3791a-0713-4548-a357-87a323e7ac3a - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 en-US false diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj index b160747783..7b0dd7f277 100644 --- a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj +++ b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj @@ -10,8 +10,8 @@ {89b1aab4-2bbc-4b65-9ed7-a01d5cf88230} Win32Proj AppInstallerCLITests - 10.0.18362.0 - 10.0.17134.0 + 10.0.22000.0 + 10.0.17763.0 AppInstallerCLITests diff --git a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj index 8b4e91634b..b5c15e781f 100644 --- a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj +++ b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj @@ -9,7 +9,7 @@ {5890d6ed-7c3b-40f3-b436-b54f640d9e65} Win32Proj AppInstallerLoggingCore - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 true true diff --git a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj index a4295380fa..5e325d9949 100644 --- a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj +++ b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj @@ -9,7 +9,7 @@ {5eb88068-5fb9-4e69-89b2-72dbc5e068f9} Win32Proj AppInstallerRepositoryCore - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 true true diff --git a/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj b/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj index 3b062acd69..20c683d80b 100644 --- a/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj +++ b/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj @@ -5,7 +5,7 @@ {6CB84692-5994-407D-B9BD-9216AF77FE83} Win32Proj AppInstallerTestExeInstaller - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 true true diff --git a/src/AppInstallerTestMsixInstaller/AppInstallerTestMsixInstaller.wapproj b/src/AppInstallerTestMsixInstaller/AppInstallerTestMsixInstaller.wapproj index 7358830275..aebdfad1f2 100644 --- a/src/AppInstallerTestMsixInstaller/AppInstallerTestMsixInstaller.wapproj +++ b/src/AppInstallerTestMsixInstaller/AppInstallerTestMsixInstaller.wapproj @@ -51,7 +51,7 @@ 3e2cba31-ceba-4d63-bf52-49c0718e19ea - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 en-US false diff --git a/src/JsonCppLib/JsonCppLib.vcxproj b/src/JsonCppLib/JsonCppLib.vcxproj index b381d73904..be733bfbe8 100644 --- a/src/JsonCppLib/JsonCppLib.vcxproj +++ b/src/JsonCppLib/JsonCppLib.vcxproj @@ -42,7 +42,10 @@ 16.0 {82B39FDA-E86B-4713-A873-9D56DE00247A} Win32Proj - 10.0 + true + true + 10.0.22000.0 + 10.0.17763.0 diff --git a/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj b/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj index bd9367627f..fc9db158eb 100644 --- a/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj +++ b/src/Microsoft.Management.Deployment.Client/Microsoft.Management.Deployment.Client.vcxproj @@ -14,8 +14,10 @@ true Windows Store 10.0 - 10.0.19041.0 - 10.0.17134.0 + 10.0.22000.0 + 10.0.17763.0 + true + true diff --git a/src/Microsoft.Management.Deployment.Server.Test/Microsoft.Management.Deployment.Server.Test.vcxproj b/src/Microsoft.Management.Deployment.Server.Test/Microsoft.Management.Deployment.Server.Test.vcxproj index 84961d9c0d..c9fde8dbfe 100644 --- a/src/Microsoft.Management.Deployment.Server.Test/Microsoft.Management.Deployment.Server.Test.vcxproj +++ b/src/Microsoft.Management.Deployment.Server.Test/Microsoft.Management.Deployment.Server.Test.vcxproj @@ -10,7 +10,7 @@ {7DE2CFC7-5AAE-4F89-BF42-8D231E389687} Win32Proj Microsoft.Management.Deployment.Server.Test - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 true true diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj index 51da40e86c..675325591d 100644 --- a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj +++ b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj @@ -12,8 +12,10 @@ en-US 14.0 10.0 - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 + true + true -library Microsoft_Management_Deployment diff --git a/src/PackagedTests/PackagedTests.csproj b/src/PackagedTests/PackagedTests.csproj index e049ca2853..447b65c838 100644 --- a/src/PackagedTests/PackagedTests.csproj +++ b/src/PackagedTests/PackagedTests.csproj @@ -11,7 +11,7 @@ PackagedUnitTests en-US UAP - 10.0.19041.0 + 10.0.22000.0 10.0.17763.0 14 true diff --git a/src/WinGetServer/WinGetServer.vcxproj b/src/WinGetServer/WinGetServer.vcxproj index e97ba23714..3d3a06e9b9 100644 --- a/src/WinGetServer/WinGetServer.vcxproj +++ b/src/WinGetServer/WinGetServer.vcxproj @@ -10,7 +10,7 @@ {2b00d362-ac92-41f3-a8d2-5b1599bdca01} Win32Proj WinGetServer - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 true true diff --git a/src/WinGetUtil/WinGetUtil.vcxproj b/src/WinGetUtil/WinGetUtil.vcxproj index c4e6e814cd..d249fc0ed2 100644 --- a/src/WinGetUtil/WinGetUtil.vcxproj +++ b/src/WinGetUtil/WinGetUtil.vcxproj @@ -9,7 +9,7 @@ {FB313532-38B0-4676-9303-AB200AA13576} Win32Proj WinGetUtil - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 true true diff --git a/src/WindowsPackageManager/WindowsPackageManager.vcxproj b/src/WindowsPackageManager/WindowsPackageManager.vcxproj index 8f2c5cc709..84dfdc61bc 100644 --- a/src/WindowsPackageManager/WindowsPackageManager.vcxproj +++ b/src/WindowsPackageManager/WindowsPackageManager.vcxproj @@ -9,7 +9,7 @@ {2046B5AF-666D-4CE8-8D3E-C32C57908A56} Win32Proj WindowsPackageManager - 10.0.18362.0 + 10.0.22000.0 10.0.17763.0 true true diff --git a/src/WindowsPackageManager/main.cpp b/src/WindowsPackageManager/main.cpp index 7157f5be3f..791b0d829c 100644 --- a/src/WindowsPackageManager/main.cpp +++ b/src/WindowsPackageManager/main.cpp @@ -1,7 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. #include +#pragma warning( push ) +#pragma warning ( disable : 4324 ) #include +#pragma warning( pop ) #include #include "WindowsPackageManager.h" diff --git a/src/YamlCppLib/YamlCppLib.vcxproj b/src/YamlCppLib/YamlCppLib.vcxproj index 2743df9e7f..a42bda6a31 100644 --- a/src/YamlCppLib/YamlCppLib.vcxproj +++ b/src/YamlCppLib/YamlCppLib.vcxproj @@ -6,7 +6,8 @@ Win32Proj true true - 10.0 + 10.0.22000.0 + 10.0.17763.0 diff --git a/src/cpprestsdk/cpprestsdk.vcxproj b/src/cpprestsdk/cpprestsdk.vcxproj index 129dacf166..c9b855fc0f 100644 --- a/src/cpprestsdk/cpprestsdk.vcxproj +++ b/src/cpprestsdk/cpprestsdk.vcxproj @@ -6,7 +6,8 @@ Win32Proj true true - 10.0 + 10.0.22000.0 + 10.0.17763.0