Attempt to fix build 2

README.md

@@ -158,7 +158,7 @@ You can install the prerequisites in one of two ways:
 * The following workloads:
    * .NET Desktop Development
    * Universal Windows Platform Development
-* Windows 11 SDK (10.0.22000.0) (Tools -> Get Tools and Features -> Individual Components)
+* Windows 11 SDK (10.0.26100.0) (Tools -> Get Tools and Features -> Individual Components)
 
 ### Building
 

pipelines/azure-pipelines.release.yml

@@ -20,7 +20,7 @@ variables:
   buildPlatform: "x64"
 
   # Docker image which is used to build the project
-  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2019/vse2022:latest'
+  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
 
 resources:
   repositories:
@@ -84,6 +84,15 @@ extends:
             ob_symbolsPublishing_enabled: true
 
           steps:
+            - task: PowerShell@2
+              name: InspectSDKs
+              displayName: 'Inspect installed UAP SDKs'
+              inputs:
+                targetType: inline
+                script: |
+                  Write-Host "Installed Windows Kits:"
+                  Get-ChildItem 'C:\Program Files (x86)\Windows Kits\10\Platforms\UAP' -ErrorAction SilentlyContinue | Select Name
+                  Get-ChildItem 'C:\Program Files (x86)\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP' -ErrorAction SilentlyContinue | Select Name
             - task: PowerShell@2
               name: OutputVersionStep
               displayName: Set output variables for UpdateManifest job
@@ -225,40 +234,3 @@ extends:
               timeoutInMinutes: 1440 # task times out in 1 day
               inputs:
                 instructions: "Please update aka.ms vanity URLs for latest release"
-
-        - job: UpdateManifest
-          dependsOn:
-            - Build
-            - Wait
-          pool:
-            type: windows
-
-          variables:
-            runCodesignValidationInjection: ${{ false }}
-            skipComponentGovernanceDetection: ${{ true }}
-            manifestVersion: $[dependencies.Build.outputs['OutputVersionStep.manifestVersion']]
-            appxBundleFile: $[dependencies.Build.outputs['OutputVersionStep.appxBundleFile']]
-            vcLibsBundleFile: "Microsoft.VCLibs.x64.14.00.Desktop.appx"
-            msixPackageUrl: "https://github.com/microsoft/winget-create/releases/download/v$(manifestVersion)/$(appxBundleFile)"
-            portablePackageUrl: "https://github.com/microsoft/winget-create/releases/download/v$(manifestVersion)/wingetcreate.exe"
-            ob_outputDirectory: $(Build.ArtifactStagingDirectory)
-            ob_git_checkout: false
-
-          steps:
-            - task: PowerShell@2
-              displayName: Update package manifest in the OWC
-              inputs:
-                targetType: inline
-                script: |
-                  # These are the steps you would run in your CI/CD pipeline to update your OWC manifest using wingetcreate.
-                  # More information about using wingetcreate in your CI/CD pipeline can be found here:
-                  # https://github.com/microsoft/winget-create#using-windows-package-manager-manifest-creator-in-a-cicd-pipeline
-
-                  # Download and install C++ Runtime framework package.
-                  iwr https://aka.ms/Microsoft.VCLibs.x64.14.00.Desktop.appx -OutFile $(vcLibsBundleFile)
-                  Add-AppxPackage $(vcLibsBundleFile)
-
-                  # Download, install, and execute update.
-                  iwr https://aka.ms/wingetcreate/latest/msixbundle -OutFile $(appxBundleFile)
-                  Add-AppxPackage $(appxBundleFile)
-                  wingetcreate update Microsoft.WingetCreate --urls $(msixPackageUrl) '$(portablePackageUrl)|x64' '$(portablePackageUrl)|x86' -v $(manifestVersion) -t $(GITHUB_PAT) --submit

pipelines/azure-pipelines.yml

@@ -34,7 +34,7 @@ variables:
   buildPlatform: "x64"
 
   # Target framework
-  targetFramework: "net8.0-windows10.0.22000.0"
+  targetFramework: "net8.0-windows10.0.26100.0"
 
 resources:
   repositories:

src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\x64\Release\net8.0-windows10.0.22000.0\win-x64\publish\</PublishDir>
+    <PublishDir>bin\x64\Release\net8.0-windows10.0.26100.0\win-x64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>

src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
-    <PublishDir>bin\x86\Release\net8.0-windows10.0.22000.0\win-x86\publish\</PublishDir>
+    <PublishDir>bin\x86\Release\net8.0-windows10.0.26100.0\win-x86\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>

src/WingetCreateCLI/WingetCreateCLI.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <AssemblyName>WingetCreateCLI</AssemblyName>
     <RootNamespace>Microsoft.WingetCreateCLI</RootNamespace>
     <Version>1.12</Version>

src/WingetCreateCore/WingetCreateCore.csproj

@@ -4,7 +4,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <RootNamespace>Microsoft.WingetCreateCore</RootNamespace>
-    <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <Platforms>x86;x64</Platforms>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/WingetCreatePackage/WingetCreatePackage.wapproj

@@ -27,7 +27,7 @@
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
   <PropertyGroup>
     <ProjectGuid>ac37dfd2-1332-4282-b373-8dcf8bb4e3ba</ProjectGuid>
-    <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <EntryPointProjectUniqueName>..\WingetCreateCLI\WingetCreateCLI.csproj</EntryPointProjectUniqueName>

src/WingetCreateTests/WingetCreateTestMsixInstaller/WingetCreateTestMsixInstaller.wapproj

@@ -39,7 +39,7 @@
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
   <PropertyGroup>
     <ProjectGuid>154eb646-d902-41b5-9ce1-e78acc63aa0a</ProjectGuid>
-    <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>

src/WingetCreateTests/WingetCreateTests/Resources/TestPublisher.DontMoveInstallerFieldsToRoot.yaml

@@ -37,7 +37,7 @@ Installers:
     ExpectedReturnCodes:
     - InstallerReturnCode: 1001
       ReturnResponse: installInProgress
-    MinimumOSVersion: 10.0.22000.0
+    MinimumOSVersion: 10.0.26100.0
     PackageFamilyName: TestPackageFamilyName1
     Platform:
     - Windows.Desktop

src/WingetCreateTests/WingetCreateTests/Resources/TestPublisher.MoveInstallerFieldsToRoot.yaml

@@ -36,7 +36,7 @@ Installers:
     ExpectedReturnCodes:
     - InstallerReturnCode: 1000
       ReturnResponse: installInProgress
-    MinimumOSVersion: 10.0.22000.0
+    MinimumOSVersion: 10.0.26100.0
     PackageFamilyName: TestPackageFamilyName
     Platform:
     - Windows.Desktop
@@ -106,7 +106,7 @@ Installers:
     ExpectedReturnCodes:
     - InstallerReturnCode: 1000
       ReturnResponse: installInProgress
-    MinimumOSVersion: 10.0.22000.0
+    MinimumOSVersion: 10.0.26100.0
     PackageFamilyName: TestPackageFamilyName
     Platform:
     - Windows.Desktop
@@ -177,7 +177,7 @@ Installers:
     ExpectedReturnCodes:
     - InstallerReturnCode: 1000
       ReturnResponse: installInProgress
-    MinimumOSVersion: 10.0.22000.0
+    MinimumOSVersion: 10.0.26100.0
     PackageFamilyName: TestPackageFamilyName
     Platform:
     - Windows.Desktop

src/WingetCreateTests/WingetCreateTests/Resources/TestPublisher.OverwriteNullInstallerFields.yaml

@@ -39,7 +39,7 @@ Dependencies:
 ExpectedReturnCodes:
   - InstallerReturnCode: 1001
     ReturnResponse: installInProgress
-MinimumOSVersion: 10.0.22000.0
+MinimumOSVersion: 10.0.26100.0
 PackageFamilyName: TestPackageFamilyName1
 Platform:
 - Windows.Desktop

src/WingetCreateTests/WingetCreateTests/Resources/TestPublisher.RetainInstallerFields.yaml

@@ -35,7 +35,7 @@ Dependencies:
 ExpectedReturnCodes:
   - InstallerReturnCode: 1001
     ReturnResponse: installInProgress
-MinimumOSVersion: 10.0.22000.0
+MinimumOSVersion: 10.0.26100.0
 PackageFamilyName: TestPackageFamilyName1
 Platform:
 - Windows.Desktop

src/WingetCreateTests/WingetCreateTests/UnitTests/UpdateCommandTests.cs

@@ -1482,7 +1482,7 @@ public async Task MoveInstallerFieldsToRoot()
             ClassicAssert.IsTrue(updatedInstallerManifest.InstallerType == InstallerType.Zip, "InstallerType at the root level should be ZIP");
             ClassicAssert.IsTrue(updatedInstallerManifest.NestedInstallerType == NestedInstallerType.Exe, "NestedInstallerType at the root level should be EXE");
             ClassicAssert.IsTrue(updatedInstallerManifest.Scope == Scope.Machine, "Scope at the root level should be machine");
-            ClassicAssert.IsTrue(updatedInstallerManifest.MinimumOSVersion == "10.0.22000.0", "MinimumOSVersion at the root level should be 10.0.22000.0");
+            ClassicAssert.IsTrue(updatedInstallerManifest.MinimumOSVersion == "10.0.26100.0", "MinimumOSVersion at the root level should be 10.0.26100.0");
             ClassicAssert.IsTrue(updatedInstallerManifest.PackageFamilyName == "TestPackageFamilyName", "PackageFamilyName at the root level should be TestPackageFamilyName");
             ClassicAssert.IsTrue(updatedInstallerManifest.UpgradeBehavior == UpgradeBehavior.Install, "UpgradeBehavior at the root level should be install");
             ClassicAssert.IsTrue(updatedInstallerManifest.ElevationRequirement == ElevationRequirement.ElevationRequired, "ElevationRequirement at the root level should be elevationRequired");
@@ -1649,7 +1649,7 @@ public async Task UpdateOverwritesNullInstallerFields()
             ClassicAssert.IsTrue(updatedInstallerManifest.InstallerType == InstallerType.Zip, "InstallerType at the root level should be ZIP");
             ClassicAssert.IsTrue(updatedInstallerManifest.NestedInstallerType == NestedInstallerType.Exe, "NestedInstallerType at the root level should be EXE");
             ClassicAssert.IsTrue(updatedInstallerManifest.Scope == Scope.Machine, "Scope at the root level should be machine");
-            ClassicAssert.IsTrue(updatedInstallerManifest.MinimumOSVersion == "10.0.22000.0", "MinimumOSVersion at the root level should be 10.0.22000.0");
+            ClassicAssert.IsTrue(updatedInstallerManifest.MinimumOSVersion == "10.0.26100.0", "MinimumOSVersion at the root level should be 10.0.26100.0");
             ClassicAssert.IsTrue(updatedInstallerManifest.PackageFamilyName == "TestPackageFamilyName1", "PackageFamilyName at the root level should be TestPackageFamilyName");
             ClassicAssert.IsTrue(updatedInstallerManifest.UpgradeBehavior == UpgradeBehavior.Install, "UpgradeBehavior at the root level should be install");
             ClassicAssert.IsTrue(updatedInstallerManifest.ElevationRequirement == ElevationRequirement.ElevationRequired, "ElevationRequirement at the root level should be elevationRequired");
@@ -1741,7 +1741,7 @@ public async Task UpdateRetainsNonNullInstallerFields()
 
             // Fields for first installer should be copied over from root
             ClassicAssert.IsTrue(firstInstaller.Scope == Scope.Machine, "Scope for the first installer should be copied over from root");
-            ClassicAssert.IsTrue(firstInstaller.MinimumOSVersion == "10.0.22000.0", "MinimumOSVersion for the first installer should be copied over from root");
+            ClassicAssert.IsTrue(firstInstaller.MinimumOSVersion == "10.0.26100.0", "MinimumOSVersion for the first installer should be copied over from root");
             ClassicAssert.IsTrue(firstInstaller.PackageFamilyName == "TestPackageFamilyName1", "PackageFamilyName for the first installer should be copied over from root");
             ClassicAssert.IsTrue(firstInstaller.UpgradeBehavior == UpgradeBehavior.Install, "UpgradeBehavior for the first installer should be copied over from root");
             ClassicAssert.IsTrue(firstInstaller.ElevationRequirement == ElevationRequirement.ElevationRequired, "ElevationRequirement for the first installer should be copied over from root");

src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Platforms>x64;x86</Platforms>