diff --git a/.vsconfig b/.vsconfig index 689060c974..3b3c761a1a 100644 --- a/.vsconfig +++ b/.vsconfig @@ -50,7 +50,7 @@ "Microsoft.VisualStudio.Component.VC.ASAN", "Microsoft.VisualStudio.Component.Vcpkg", "Microsoft.VisualStudio.Component.Windows10SDK.19041", - "Microsoft.VisualStudio.Component.Windows11SDK.22000", + "Microsoft.VisualStudio.Component.Windows11SDK.26100", "Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.Component.NetFX.Native", "Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard", diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 26397f7f42..360d3eda05 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,7 +15,7 @@ pr: - schemas/JSON/manifests/* pool: - vmImage: 'windows-latest' + vmImage: 'windows-2025' variables: solution: 'src\AppInstallerCLI.sln' @@ -186,7 +186,7 @@ jobs: Microsoft.Management.Deployment\Microsoft.Management.Deployment.winmd WindowsPackageManager\WindowsPackageManager.dll UndockedRegFreeWinRT\winrtact.dll - TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Client\net8.0-windows10.0.22000.0\SharedDependencies\$(BuildPlatform) + TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Client\net8.0-windows10.0.26100.0\SharedDependencies\$(BuildPlatform) flattenFolders: true - task: CopyFiles@2 @@ -215,7 +215,7 @@ jobs: inputs: SourceFolder: $(buildOutDirAnyCpu) Contents: | - Microsoft.Management.Configuration.Projection\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.Projection.dll + Microsoft.Management.Configuration.Projection\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.Projection.dll TargetFolder: $(buildOutDirAnyCpu)\PowerShell\Microsoft.WinGet.Configuration\SharedDependencies\$(BuildPlatform) flattenFolders: true @@ -351,13 +351,7 @@ jobs: inputs: packageFeedSelector: 'nugetOrg' - # TODO: Repair-WinGetPackageManager will fail because it tries to install x64 for an x86 build machine. - # Remove manual installation of VCLibs (x64) once this is fixed. - powershell: | - if ("$(buildPlatform)" -eq "x86") { - iwr https://aka.ms/Microsoft.VCLibs.x64.14.00.Desktop.appx -OutFile Microsoft.VCLibs.x64.appx - Add-AppxPackage Microsoft.VCLibs.x64.appx - } Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force Install-Module Microsoft.WinGet.Client -Repository PSGallery -Force Repair-WingetPackageManager -AllUsers -Latest @@ -365,7 +359,7 @@ jobs: displayName: Install Sysinternals PsTools Using Winget condition: succeededOrFailed() - - powershell: | + - pwsh: | $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") PsExec -accepteula -s -i $(buildOutDir)\AppInstallerCLITests\AppInstallerCLITests.exe -logto $(artifactsDir)\AICLI-Unpackaged-System.log -s -r junit -o $(artifactsDir)\TEST-AppInstallerCLI-Unpackaged-System.xml displayName: Run Unit Tests Unpackaged Under System Context diff --git a/doc/Developing.md b/doc/Developing.md index de2762a6e2..fcf0da2617 100644 --- a/doc/Developing.md +++ b/doc/Developing.md @@ -12,10 +12,10 @@ * Universal Windows Platform Development * Check [.vsconfig file](../.vsconfig) for full components list -* [Windows SDK for Windows 11 (10.0.22000.194)](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/) +* [Windows SDK for Windows 11 (10.0.26100)](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/) > [!NOTE] -> You can also get it through `winget install Microsoft.WindowsSDK --version 10.0.22000.832` (use --force if you have a newer version installed) or via Visual Studio > Get Tools and Features > Individual Components > Windows 10 SDK (10.0.22000.0) +> You can also get it through `winget install Microsoft.WindowsSDK.10.0.26100` or via Visual Studio > Get Tools and Features > Individual Components > Windows 10 SDK (10.0.26100.0) * The following extensions: diff --git a/src/AppInstallerCLI/AppInstallerCLI.vcxproj b/src/AppInstallerCLI/AppInstallerCLI.vcxproj index e442009f0e..91b470f664 100644 --- a/src/AppInstallerCLI/AppInstallerCLI.vcxproj +++ b/src/AppInstallerCLI/AppInstallerCLI.vcxproj @@ -9,7 +9,7 @@ {5b6f90df-fd19-4bae-83d9-24dad128e777} Win32Proj AppInstallerCLI - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj index 3973b16424..64d31bf255 100644 --- a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj +++ b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj @@ -9,7 +9,7 @@ {1c6e0108-2860-4b17-9f7e-fa5c6c1f3d3d} Win32Proj AppInstallerCLICore - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true diff --git a/src/AppInstallerCLICore/Commands/DebugCommand.cpp b/src/AppInstallerCLICore/Commands/DebugCommand.cpp index e75a55ea76..f9b07bb148 100644 --- a/src/AppInstallerCLICore/Commands/DebugCommand.cpp +++ b/src/AppInstallerCLICore/Commands/DebugCommand.cpp @@ -106,6 +106,7 @@ namespace AppInstaller::CLI OutputProxyStubInterfaceRegistration>(context); OutputProxyStubInterfaceRegistration(context); OutputProxyStubInterfaceRegistration(context); + OutputProxyStubInterfaceRegistration(context); OutputProxyStubInterfaceRegistration(context); OutputProxyStubInterfaceRegistration(context); diff --git a/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp b/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp index f6fb000815..e95712320f 100644 --- a/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp +++ b/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp @@ -551,6 +551,8 @@ namespace AppInstaller::CLI::Workflow m_context.Reporter.Info() << " "_liv << Resource::String::ConfigurationSettings << '\n'; OutputValueSet(settings, 4); } + + m_context.Reporter.Info() << std::flush; } private: diff --git a/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj b/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj index 6c224bf06f..f3339c90dd 100644 --- a/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj +++ b/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj @@ -11,7 +11,7 @@ - 10.0.22000.53 + 10.0.26100.53 @@ -43,7 +43,7 @@ - 10.0.22000.0 + 10.0.26100.0 diff --git a/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj b/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj index 5e1038bbe0..6171da8604 100644 --- a/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj +++ b/src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj @@ -43,7 +43,7 @@ 6aa3791a-0713-4548-a357-87a323e7ac3a - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 en-US false @@ -236,7 +236,7 @@ Microsoft.Management.Configuration.winmd - + ConfigurationRemotingServer true diff --git a/src/AppInstallerCLIPackage/Package.appxmanifest b/src/AppInstallerCLIPackage/Package.appxmanifest index 0af04065e2..de8eb43fd1 100644 --- a/src/AppInstallerCLIPackage/Package.appxmanifest +++ b/src/AppInstallerCLIPackage/Package.appxmanifest @@ -116,6 +116,7 @@ + diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj index aaf282adf2..79ad21b5c6 100644 --- a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj +++ b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj @@ -10,7 +10,7 @@ {89b1aab4-2bbc-4b65-9ed7-a01d5cf88230} Win32Proj AppInstallerCLITests - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 AppInstallerCLITests diff --git a/src/AppInstallerCLITests/Downloader.cpp b/src/AppInstallerCLITests/Downloader.cpp index 530eb41a08..ed891aed63 100644 --- a/src/AppInstallerCLITests/Downloader.cpp +++ b/src/AppInstallerCLITests/Downloader.cpp @@ -82,7 +82,7 @@ TEST_CASE("HttpStream_ReadLastFullPage", "[HttpStream]") for (size_t i = 0; i < 10; ++i) { - stream = GetReadOnlyStreamFromURI("https://cdn.winget.microsoft.com/cache/source.msix"); + stream = GetReadOnlyStreamFromURI("https://cdn.winget.microsoft.com/cache/source2.msix"); stat = { 0 }; REQUIRE(stream->Stat(&stat, STATFLAG_NONAME) == S_OK); @@ -96,7 +96,7 @@ TEST_CASE("HttpStream_ReadLastFullPage", "[HttpStream]") } { - INFO("https://cdn.winget.microsoft.com/cache/source.msix gave back a 0 byte file"); + INFO("https://cdn.winget.microsoft.com/cache/source2.msix gave back a 0 byte file"); REQUIRE(stream); } diff --git a/src/AppInstallerCLITests/MsixInfo.cpp b/src/AppInstallerCLITests/MsixInfo.cpp index c620672d14..caf48b14b8 100644 --- a/src/AppInstallerCLITests/MsixInfo.cpp +++ b/src/AppInstallerCLITests/MsixInfo.cpp @@ -84,7 +84,7 @@ TEST_CASE("MsixInfo_ValidateMsixTrustInfo", "[msixinfo]") TestCommon::TempFile microsoftSigned{ "testIndex"s, ".msix"s }; ProgressCallback callback; - Utility::Download("https://cdn.winget.microsoft.com/cache/source.msix", microsoftSigned.GetPath(), Utility::DownloadType::Index, callback); + Utility::Download("https://cdn.winget.microsoft.com/cache/source2.msix", microsoftSigned.GetPath(), Utility::DownloadType::Index, callback); Msix::WriteLockedMsixFile microsoftSignedWriteLocked{ microsoftSigned }; REQUIRE(microsoftSignedWriteLocked.ValidateTrustInfo(true)); diff --git a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj index d92983178f..fdf11fa807 100644 --- a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj +++ b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj @@ -9,7 +9,7 @@ {5eb88068-5fb9-4e69-89b2-72dbc5e068f9} Win32Proj AppInstallerRepositoryCore - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true diff --git a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj index bdb41273c0..170388d380 100644 --- a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj +++ b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj @@ -8,7 +8,7 @@ 15.0 {F3F6E699-BC5D-4950-8A05-E49DD9EB0D51} Win32Proj - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true diff --git a/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj b/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj index f747b423c3..ad7e0bad1d 100644 --- a/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj +++ b/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj @@ -5,7 +5,7 @@ {6CB84692-5994-407D-B9BD-9216AF77FE83} Win32Proj AppInstallerTestExeInstaller - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true diff --git a/src/AppInstallerTestMsixInstaller/AppInstallerTestMsixInstaller.wapproj b/src/AppInstallerTestMsixInstaller/AppInstallerTestMsixInstaller.wapproj index e3d26dda13..a1ef9bdd74 100644 --- a/src/AppInstallerTestMsixInstaller/AppInstallerTestMsixInstaller.wapproj +++ b/src/AppInstallerTestMsixInstaller/AppInstallerTestMsixInstaller.wapproj @@ -43,7 +43,7 @@ 3e2cba31-ceba-4d63-bf52-49c0718e19ea - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 en-US false diff --git a/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj b/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj index 370527705d..a853256291 100644 --- a/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj +++ b/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj @@ -2,7 +2,7 @@ Exe - net8.0-windows10.0.22000.0 + net8.0-windows10.0.26100.0 enable enable 10.0.17763.0 diff --git a/src/JsonCppLib/JsonCppLib.vcxproj b/src/JsonCppLib/JsonCppLib.vcxproj index 81b6781f81..34e8816724 100644 --- a/src/JsonCppLib/JsonCppLib.vcxproj +++ b/src/JsonCppLib/JsonCppLib.vcxproj @@ -51,7 +51,7 @@ {82B39FDA-E86B-4713-A873-9D56DE00247A} Win32Proj true - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 diff --git a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj index ebc1127180..52b07e4fea 100644 --- a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj +++ b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj @@ -8,7 +8,7 @@ 15.0 Win32Proj MicrosoftManagementConfigurationOutOfProc - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true false diff --git a/src/Microsoft.Management.Configuration.OutOfProc/Prepare-ConfigurationOOPTests.ps1 b/src/Microsoft.Management.Configuration.OutOfProc/Prepare-ConfigurationOOPTests.ps1 index c3c24d8bac..96c925e58c 100644 --- a/src/Microsoft.Management.Configuration.OutOfProc/Prepare-ConfigurationOOPTests.ps1 +++ b/src/Microsoft.Management.Configuration.OutOfProc/Prepare-ConfigurationOOPTests.ps1 @@ -9,13 +9,13 @@ param( # Copy the winmd into the unit test directory since it will be needed for marshalling $Local:winmdSourcePath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration\Microsoft.Management.Configuration.winmd" -$Local:winmdTargetPath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.winmd" +$Local:winmdTargetPath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.winmd" Copy-Item $Local:winmdSourcePath $Local:winmdTargetPath -Force # Copy the OOP helper dll into the unit test directory to make activation look the same as in-proc $Local:dllSourcePath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.OutOfProc\Microsoft.Management.Configuration.OutOfProc.dll" -$Local:dllTargetPath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.dll" +$Local:dllTargetPath = Join-Path $BuildOutputPath "Microsoft.Management.Configuration.UnitTests\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.dll" Copy-Item $Local:dllSourcePath $Local:dllTargetPath -Force diff --git a/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj b/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj index 9b4f0438df..47a73ea867 100644 --- a/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj +++ b/src/Microsoft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj @@ -3,7 +3,7 @@ net8.0 - $(DotNetVersion)-windows10.0.22000.0 + $(DotNetVersion)-windows10.0.26100.0 enable 10.0.17763.0 @@ -21,7 +21,7 @@ - 10.0.22000.53 + 10.0.26100.53 true @@ -39,7 +39,7 @@ true - 10.0.22000.0 + 10.0.26100.0 @@ -89,6 +89,8 @@ Windows.ApplicationModel.AppInstallerPolicySourc; Windows.ApplicationModel.AddResourcePackageOption; Windows.ApplicationModel.IAddResourcePackageOption; + Windows.ApplicationModel.FindRelatedPackagesOption; + Windows.ApplicationModel.IFindRelatedPackagesOption; Windows.ApplicationModel.Packag; Windows.ApplicationModel.IPackag; Windows.ApplicationModel.Core.AppListEntr; @@ -106,12 +108,14 @@ Windows.Networking.IHostNam; Windows.Security.Cryptography.Certificates; Windows.Storage; + Windows.Storage.Provider.FileUpdateStatu; Windows.System.ProcessorArchitectur; Windows.System.Use; Windows.System.IUse; Windows.Foundation.PropertyType; + Windows.Storage.Provider; 10.0.17763.0 diff --git a/src/Microsoft.Management.Configuration.Processor/Properties/AssemblyInfo.cs b/src/Microsoft.Management.Configuration.Processor/Properties/AssemblyInfo.cs index adffc93a88..4ebc6b5a22 100644 --- a/src/Microsoft.Management.Configuration.Processor/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Management.Configuration.Processor/Properties/AssemblyInfo.cs @@ -23,5 +23,5 @@ // Forcibly set the target and supported platforms due to the internal build setup. // Keep in sync with project versions. -[assembly: TargetPlatform("Windows10.0.22000.0")] +[assembly: TargetPlatform("Windows10.0.26100.0")] [assembly: SupportedOSPlatform("Windows10.0.17763.0")] diff --git a/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj b/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj index 3671eb08ac..74b45daa7f 100644 --- a/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj +++ b/src/Microsoft.Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj @@ -1,7 +1,7 @@ - net8.0-windows10.0.22000.0 + net8.0-windows10.0.26100.0 AnyCpu enable enable @@ -11,13 +11,13 @@ - 10.0.22000.53 + 10.0.26100.53 Microsoft.Management.Configuration $(OutDir) - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 diff --git a/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs b/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs index 5450cc13b8..43894f0327 100644 --- a/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs +++ b/src/Microsoft.Management.Configuration.UnitTests/Helpers/OutOfProcAttribute.cs @@ -31,7 +31,7 @@ public OutOfProcAttribute() // The test runner is located somewhere like this: // C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\TestPlatform // and the command line from there is: - // .\vstest.console.exe "\src\x64\Debug\Microsoft.Management.Configuration.UnitTests\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.UnitTests.dll" --TestCaseFilter:Category=OutOfProc + // .\vstest.console.exe "\src\x64\Debug\Microsoft.Management.Configuration.UnitTests\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.UnitTests.dll" --TestCaseFilter:Category=OutOfProc } } } diff --git a/src/Microsoft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj b/src/Microsoft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj index 792ac1ca44..1aea85b881 100644 --- a/src/Microsoft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj +++ b/src/Microsoft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj @@ -1,7 +1,7 @@ - net8.0-windows10.0.22000.0 + net8.0-windows10.0.26100.0 enable 10.0.17763.0 x64;x86;arm64 diff --git a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj index 61abfce864..6358f54c0a 100644 --- a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj +++ b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj @@ -12,7 +12,7 @@ en-US 14.0 10.0 - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true diff --git a/src/Microsoft.Management.Deployment.CsWinRTProjection/Microsoft.Management.Deployment.CsWinRTProjection.csproj b/src/Microsoft.Management.Deployment.CsWinRTProjection/Microsoft.Management.Deployment.CsWinRTProjection.csproj index c1316ed944..44d699df76 100644 --- a/src/Microsoft.Management.Deployment.CsWinRTProjection/Microsoft.Management.Deployment.CsWinRTProjection.csproj +++ b/src/Microsoft.Management.Deployment.CsWinRTProjection/Microsoft.Management.Deployment.CsWinRTProjection.csproj @@ -1,7 +1,7 @@ - net8.0-windows10.0.22000.0 + net8.0-windows10.0.26100.0 AnyCpu enable enable @@ -13,13 +13,13 @@ - 10.0.22000.53 + 10.0.26100.53 Microsoft.Management.Deployment $(OutDir) - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 diff --git a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj index 60d28412e3..b4634ab894 100644 --- a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj +++ b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj @@ -9,7 +9,7 @@ Win32Proj {9ac3c6a4-1875-4d3e-bf9c-c31e81eff6b4} MicrosoftManagementDeploymentInProc - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true false diff --git a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj index 01c3f34d8f..aa33984eb9 100644 --- a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj +++ b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj @@ -8,7 +8,7 @@ 15.0 Win32Proj MicrosoftManagementDeploymentOutOfProc - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true false diff --git a/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj b/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj index b0260252c1..fb969b6835 100644 --- a/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj +++ b/src/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj @@ -10,7 +10,7 @@ - 10.0.22000.53 + 10.0.26100.53 @@ -19,7 +19,7 @@ - 10.0.22000.0 + 10.0.26100.0 Microsoft.Management.Deployment;Windows.Foundation;Windows.System.ProcessorArchitecture Windows.Foundation.Diagnostics diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj index 878026ed47..12dd44774e 100644 --- a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj +++ b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj @@ -12,7 +12,7 @@ en-US 14.0 10.0 - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true -library Microsoft_Management_Deployment diff --git a/src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Microsoft.WinGet.Client.Cmdlets.csproj b/src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Microsoft.WinGet.Client.Cmdlets.csproj index 13b16b7cea..f647b8b077 100644 --- a/src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Microsoft.WinGet.Client.Cmdlets.csproj +++ b/src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Microsoft.WinGet.Client.Cmdlets.csproj @@ -3,7 +3,7 @@ - net8.0-windows10.0.22000.0 + net8.0-windows10.0.26100.0 false net48 Debug;Release;ReleaseStatic diff --git a/src/PowerShell/Microsoft.WinGet.Client.Engine/Microsoft.WinGet.Client.Engine.csproj b/src/PowerShell/Microsoft.WinGet.Client.Engine/Microsoft.WinGet.Client.Engine.csproj index 9894270074..b60ad639d7 100644 --- a/src/PowerShell/Microsoft.WinGet.Client.Engine/Microsoft.WinGet.Client.Engine.csproj +++ b/src/PowerShell/Microsoft.WinGet.Client.Engine/Microsoft.WinGet.Client.Engine.csproj @@ -3,7 +3,7 @@ - 10.0.22000.0 + 10.0.26100.0 net8.0-windows$(TargetWindowsVersion) false net48 @@ -12,7 +12,7 @@ - 10.0.22000.53 + 10.0.26100.53 @@ -54,7 +54,7 @@ - + @@ -134,12 +134,14 @@ Windows.Networking.IHostNam; Windows.Security.Cryptography.Certificates; Windows.Storage; + Windows.Storage.Provider.FileUpdateStatu; Windows.System.ProcessorArchitectur; Windows.System.Use; Windows.System.IUse; Windows.Foundation.PropertyType; + Windows.Storage.Provider; $(TargetWindowsVersion) diff --git a/src/PowerShell/Microsoft.WinGet.Client/ModuleFiles/Microsoft.WinGet.Client.psd1 b/src/PowerShell/Microsoft.WinGet.Client/ModuleFiles/Microsoft.WinGet.Client.psd1 index f6b95ab9fe..2603df2cfa 100644 --- a/src/PowerShell/Microsoft.WinGet.Client/ModuleFiles/Microsoft.WinGet.Client.psd1 +++ b/src/PowerShell/Microsoft.WinGet.Client/ModuleFiles/Microsoft.WinGet.Client.psd1 @@ -9,7 +9,7 @@ # Script module or binary module file associated with this manifest. RootModule = if ($PSEdition -like 'Core') { - "net8.0-windows10.0.22000.0\Microsoft.WinGet.Client.Cmdlets.dll" + "net8.0-windows10.0.26100.0\Microsoft.WinGet.Client.Cmdlets.dll" } else { diff --git a/src/PowerShell/Microsoft.WinGet.Configuration.Cmdlets/Microsoft.WinGet.Configuration.Cmdlets.csproj b/src/PowerShell/Microsoft.WinGet.Configuration.Cmdlets/Microsoft.WinGet.Configuration.Cmdlets.csproj index b9cc0c84ca..8e367879f9 100644 --- a/src/PowerShell/Microsoft.WinGet.Configuration.Cmdlets/Microsoft.WinGet.Configuration.Cmdlets.csproj +++ b/src/PowerShell/Microsoft.WinGet.Configuration.Cmdlets/Microsoft.WinGet.Configuration.Cmdlets.csproj @@ -2,7 +2,7 @@ - net8.0-windows10.0.22000 + net8.0-windows10.0.26100 false $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ true diff --git a/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Microsoft.WinGet.Configuration.Engine.csproj b/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Microsoft.WinGet.Configuration.Engine.csproj index 82acc9312e..9dc318519d 100644 --- a/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Microsoft.WinGet.Configuration.Engine.csproj +++ b/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Microsoft.WinGet.Configuration.Engine.csproj @@ -2,7 +2,7 @@ - net8.0-windows10.0.22000 + net8.0-windows10.0.26100 false enable $(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\ diff --git a/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Properties/AssemblyInfo.cs b/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Properties/AssemblyInfo.cs index ed41e7a4b7..d9d343a224 100644 --- a/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Properties/AssemblyInfo.cs +++ b/src/PowerShell/Microsoft.WinGet.Configuration.Engine/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ // Forcibly set the target and supported platforms due to the internal build setup. // Keep in sync with project versions. -[assembly: TargetPlatform("Windows10.0.22000.0")] +[assembly: TargetPlatform("Windows10.0.26100.0")] [assembly: SupportedOSPlatform("Windows10.0.18362.0")] #endif diff --git a/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 b/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 index 4e5cedb3d9..547a218167 100644 --- a/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 +++ b/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 @@ -202,7 +202,7 @@ if ($moduleToConfigure.HasFlag([ModuleType]::Client)) "WindowsPackageManager\WindowsPackageManager.dll" "UndockedRegFreeWinRT\winrtact.dll" ) - $module.AddArchSpecificFiles($additionalFiles, "net8.0-windows10.0.22000.0\SharedDependencies", $BuildRoot, $Configuration) + $module.AddArchSpecificFiles($additionalFiles, "net8.0-windows10.0.26100.0\SharedDependencies", $BuildRoot, $Configuration) $module.AddArchSpecificFiles($additionalFiles, "net48\SharedDependencies", $BuildRoot, $Configuration) $modules += $module } @@ -226,7 +226,7 @@ if ($moduleToConfigure.HasFlag([ModuleType]::Configuration)) ) $module.AddArchSpecificFiles($additionalFiles, "SharedDependencies", $BuildRoot, $Configuration) $additionalFiles = @( - "Microsoft.Management.Configuration.Projection\net8.0-windows10.0.22000.0\Microsoft.Management.Configuration.Projection.dll" + "Microsoft.Management.Configuration.Projection\net8.0-windows10.0.26100.0\Microsoft.Management.Configuration.Projection.dll" ) $module.AddAnyCpuSpecificFilesToArch($additionalFiles, "SharedDependencies", $BuildRoot, $Configuration) $modules += $module diff --git a/src/PureLib/PureLib.vcxproj b/src/PureLib/PureLib.vcxproj index 6f623b9345..98661d8f8b 100644 --- a/src/PureLib/PureLib.vcxproj +++ b/src/PureLib/PureLib.vcxproj @@ -6,7 +6,7 @@ {BB14D603-F44E-4415-8770-BF3E13F4C17F} true true - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 diff --git a/src/SfsClient/SfsClient.vcxproj b/src/SfsClient/SfsClient.vcxproj index 34818f6253..cdd385a4eb 100644 --- a/src/SfsClient/SfsClient.vcxproj +++ b/src/SfsClient/SfsClient.vcxproj @@ -5,7 +5,7 @@ {1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4} Win32Proj true - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 diff --git a/src/WinGetServer/WinGetServer.vcxproj b/src/WinGetServer/WinGetServer.vcxproj index 5adfc0b776..f5abb4207d 100644 --- a/src/WinGetServer/WinGetServer.vcxproj +++ b/src/WinGetServer/WinGetServer.vcxproj @@ -9,7 +9,7 @@ {2b00d362-ac92-41f3-a8d2-5b1599bdca01} Win32Proj WinGetServer - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true WinGetServer diff --git a/src/WinGetUtil/WinGetUtil.vcxproj b/src/WinGetUtil/WinGetUtil.vcxproj index fa97350735..45bd087534 100644 --- a/src/WinGetUtil/WinGetUtil.vcxproj +++ b/src/WinGetUtil/WinGetUtil.vcxproj @@ -9,7 +9,7 @@ {FB313532-38B0-4676-9303-AB200AA13576} Win32Proj WinGetUtil - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true diff --git a/src/WindowsPackageManager/WindowsPackageManager.vcxproj b/src/WindowsPackageManager/WindowsPackageManager.vcxproj index c199a3c0d6..6f9b016a65 100644 --- a/src/WindowsPackageManager/WindowsPackageManager.vcxproj +++ b/src/WindowsPackageManager/WindowsPackageManager.vcxproj @@ -9,7 +9,7 @@ {2046B5AF-666D-4CE8-8D3E-C32C57908A56} Win32Proj WindowsPackageManager - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 true false diff --git a/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj b/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj index 425df704ae..0b63c2fd9f 100644 --- a/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj +++ b/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj @@ -43,7 +43,7 @@ {31ED69A8-5310-45A9-953F-56C351D2C3E1} Win32Proj UndockedRegFreeWinRT - 10.0.22000.0 + 10.0.26100.0 $(Platform) x86 diff --git a/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/detours/detours.vcxproj b/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/detours/detours.vcxproj index edb7a115cd..5b7626ffb4 100644 --- a/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/detours/detours.vcxproj +++ b/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/detours/detours.vcxproj @@ -59,7 +59,7 @@ {787EC629-C0FB-4BA9-9746-4A82CD06B73E} Win32Proj detours - 10.0.22000.0 + 10.0.26100.0 Detours diff --git a/src/YamlCppLib/YamlCppLib.vcxproj b/src/YamlCppLib/YamlCppLib.vcxproj index d7323b7cee..7ae21aae3f 100644 --- a/src/YamlCppLib/YamlCppLib.vcxproj +++ b/src/YamlCppLib/YamlCppLib.vcxproj @@ -5,7 +5,7 @@ {8BB94BB8-374F-4294-BCA1-C7811514A6B7} Win32Proj true - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 diff --git a/src/cpprestsdk/cpprestsdk.vcxproj b/src/cpprestsdk/cpprestsdk.vcxproj index 081be224d5..38720ded1c 100644 --- a/src/cpprestsdk/cpprestsdk.vcxproj +++ b/src/cpprestsdk/cpprestsdk.vcxproj @@ -5,7 +5,7 @@ {866C3F06-636F-4BE8-BC24-5F86ECC606A1} Win32Proj true - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0 diff --git a/tools/SampleWinGetUWPCaller/AppInstallerCaller/AppInstallerCaller.vcxproj b/tools/SampleWinGetUWPCaller/AppInstallerCaller/AppInstallerCaller.vcxproj index 3424e2fae9..aae9718c21 100644 --- a/tools/SampleWinGetUWPCaller/AppInstallerCaller/AppInstallerCaller.vcxproj +++ b/tools/SampleWinGetUWPCaller/AppInstallerCaller/AppInstallerCaller.vcxproj @@ -14,7 +14,7 @@ true Windows Store 10.0 - 10.0.22000.0 + 10.0.26100.0 10.0.17763.0