Skip to content

Commit 125e54c

Browse files
authored
Upgrade win-sdk to 24h2 (microsoft#2393)
* upgrade win-sdk to 24h2 * upgrade upstream deps
1 parent e5958aa commit 125e54c

14 files changed

Lines changed: 15 additions & 15 deletions

File tree

build/pipelines/templates/build-single-architecture.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
downloadDirectory: $(Build.SourcesDirectory)
5050
vstsFeed: WindowsInboxApps
5151
vstsFeedPackage: calculator-internals
52-
vstsPackageVersion: 0.0.119
52+
vstsPackageVersion: 0.0.120
5353

5454
- task: NuGetToolInstaller@1
5555
displayName: Use NuGet 6.x

build/pipelines/templates/package-msixbundle.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
downloadDirectory: $(Build.SourcesDirectory)
9292
vstsFeed: WindowsInboxApps
9393
vstsFeedPackage: calculator-internals
94-
vstsPackageVersion: 0.0.119
94+
vstsPackageVersion: 0.0.120
9595

9696
- task: PowerShell@2
9797
displayName: Generate MsixBundle mapping
@@ -102,7 +102,7 @@ jobs:
102102
- powershell: |
103103
$buildVersion = [version]$Env:BUILDVERSION
104104
$bundleVersion = "2021.$($buildVersion.Minor).$($buildVersion.Build).$($buildVersion.Revision)"
105-
& "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakeAppx.exe" bundle /v /bv $bundleVersion /f $Env:MAPPINGFILEPATH /p $Env:OUTPUTPATH
105+
& "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\MakeAppx.exe" bundle /v /bv $bundleVersion /f $Env:MAPPINGFILEPATH /p $Env:OUTPUTPATH
106106
displayName: Make MsixBundle
107107
env:
108108
BUILDVERSION: $(Build.BuildNumber)

build/pipelines/templates/release-vpack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
downloadDirectory: $(Build.SourcesDirectory)
4545
vstsFeed: WindowsInboxApps
4646
vstsFeedPackage: calculator-internals
47-
vstsPackageVersion: 0.0.119
47+
vstsPackageVersion: 0.0.120
4848

4949
- pwsh: |
5050
$configPath = "$(Build.SourcesDirectory)\Tools\Build\Signing\ESRP-auth.json"

src/CalcManager/CalcManager.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<AppContainerApplication>true</AppContainerApplication>
4646
<ApplicationType>Windows Store</ApplicationType>
4747
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
48-
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.22621.0</WindowsTargetPlatformVersion>
48+
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.26100.0</WindowsTargetPlatformVersion>
4949
<WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
5050
</PropertyGroup>
5151
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

src/CalcViewModel/CalcViewModel.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
4343
<AppContainerApplication>true</AppContainerApplication>
4444
<ApplicationType>Windows Store</ApplicationType>
45-
<WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
45+
<WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
4646
<WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
4747
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
4848
</PropertyGroup>

src/CalcViewModelCopyForUT/CalcViewModelCopyForUT.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
4343
<AppContainerApplication>true</AppContainerApplication>
4444
<ApplicationType>Windows Store</ApplicationType>
45-
<WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
45+
<WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
4646
<WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
4747
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
4848
</PropertyGroup>

src/Calculator.ManagedViewModels/Calculator.ManagedViewModels.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>Calculator.ManagedViewModels</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.26100.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>

src/Calculator/Calculator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppContainerApplication>true</AppContainerApplication>
1414
<DefaultLanguage>en-US</DefaultLanguage>
1515
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
16-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
16+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.26100.0</TargetPlatformVersion>
1717
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
1818
<!-- We want to manually control the MinVersion/MaxVersionTested in the manifest so turn of the replacement. -->
1919
<AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>

src/Calculator/Package.Release.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Logo>Assets\CalculatorStoreLogo.png</Logo>
1616
</Properties>
1717
<Dependencies>
18-
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
18+
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
1919
</Dependencies>
2020
<Resources>
2121
<Resource Language="x-generate" />

src/Calculator/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Logo>Assets\CalculatorStoreLogo.png</Logo>
1616
</Properties>
1717
<Dependencies>
18-
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
18+
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
1919
</Dependencies>
2020
<Resources>
2121
<Resource Language="x-generate" />

0 commit comments

Comments
 (0)