Skip to content

Commit 9f41fd4

Browse files
MartinZikmundMartinZikmund
committed
feat!: Bump UWP version to 18362
BREAKING CHANGE: Bumps the target UWP version from 17763 to 18362
1 parent 9243b2b commit 9f41fd4

File tree

36 files changed

+57
-64
lines changed

36 files changed

+57
-64
lines changed

‎build/Uno.UI.Build.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349

350350
<!-- Adjust build targets file for Windows targets -->
351351
<XmlPoke XmlInputPath=".\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.16299\uno.winui.targets']/@target" Value="buildTransitive\uap10.0.16299\$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
352-
<XmlPoke XmlInputPath=".\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.17763\uno.winui.targets']/@target" Value="buildTransitive\uap10.0.17763\$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
352+
<XmlPoke XmlInputPath=".\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.18362\uno.winui.targets']/@target" Value="buildTransitive\uap10.0.18362\$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
353353
<XmlPoke XmlInputPath=".\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\net5.0-windows\uno.winui.targets']/@target" Value="buildTransitive\net5.0-windows\$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
354354

355355
<!-- Skia GTK targets/props-->
@@ -413,13 +413,13 @@
413413
<PropertyGroup>
414414
<NuSpecProperties>NoWarn=NU5100,NU5105,NU5131;branch=$(GITVERSION_BranchName);commitid=$(GITVERSION_VersionSourceSha)</NuSpecProperties>
415415

416-
<NuSpecProperties Condition="'$(UNO_UWP_BUILD)'=='true'">$(NuSpecProperties);winuisourcepath=uap10.0.17763;winuitargetpath=UAP</NuSpecProperties>
416+
<NuSpecProperties Condition="'$(UNO_UWP_BUILD)'=='true'">$(NuSpecProperties);winuisourcepath=uap10.0.18362;winuitargetpath=UAP</NuSpecProperties>
417417
<NuSpecProperties Condition="'$(UNO_UWP_BUILD)'!='true'">$(NuSpecProperties);winuisourcepath=net5.0-windows10.0.18362.0;winuitargetpath=net5.0-windows10.0.18362.0</NuSpecProperties>
418418
</PropertyGroup>
419419

420420
<!-- Pre-validation of contents to be packed -->
421421
<Error Text="The Uno.UI.Toolkit PRI file is not present in src\Uno.UI.Toolkit\bin\Release"
422-
Condition="'$(UNO_UWP_BUILD)'=='true' and !exists('..\src\Uno.UI.Toolkit\bin\Release\uap10.0.17763\Uno.UI.Toolkit.pri')" />
422+
Condition="'$(UNO_UWP_BUILD)'=='true' and !exists('..\src\Uno.UI.Toolkit\bin\Release\uap10.0.18362\Uno.UI.Toolkit.pri')" />
423423
<Error Text="The Uno.UI.Toolkit PRI file is not present in src\Uno.UI.Toolkit\bin\Release"
424424
Condition="'$(UNO_UWP_BUILD)'!='true' and !exists('..\src\Uno.UI.Toolkit\bin\Release\net5.0-windows10.0.18362.0\Uno.UI.Toolkit.pri')" />
425425

‎build/Uno.WinUI.MSAL.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
3333
<dependency id="Microsoft.Identity.Client" version="4.15.0" />
3434
</group>
35-
<group targetFramework="UAP10.0.17763">
35+
<group targetFramework="UAP10.0.18362">
3636
<dependency id="Microsoft.Identity.Client" version="4.15.0" />
3737
</group>
3838
<group targetFramework="net6.0-android30.0">
@@ -66,7 +66,7 @@
6666
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\MonoAndroid11.0\Uno.UI.MSAL.*" target="lib\MonoAndroid11.0" />
6767
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\MonoAndroid12.0\Uno.UI.MSAL.*" target="lib\MonoAndroid12.0" />
6868

69-
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\uap10.0.17763\Uno.UI.MSAL.*" target="lib\uap10.0.17763" />
69+
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\uap10.0.18362\Uno.UI.MSAL.*" target="lib\uap10.0.18362" />
7070

7171
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.net6\Release\net6.0-android\Uno.UI.MSAL.*" target="lib\net6.0-android" />
7272
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.net6\Release\net6.0-ios\Uno.UI.MSAL.*" target="lib\net6.0-ios" />

‎build/Uno.WinUI.RemoteControl.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185

186186
<!-- Force UAP/netx-win to ignore netstandard 2.0 -->
187187
<file src="_._" target="build\uap10.0.16299" />
188-
<file src="_._" target="build\uap10.0.17763" />
188+
<file src="_._" target="build\uap10.0.18362" />
189189
<file src="_._" target="build\net5.0-windows" />
190190
</files>
191191
</package>

‎build/Uno.WinUI.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
</group>
240240

241241
<!-- Windows -->
242-
<group targetFramework="uap10.0.17763">
242+
<group targetFramework="uap10.0.18362">
243243
<reference file="Uno.UI.Toolkit.dll" />
244244
</group>
245245

@@ -614,8 +614,8 @@
614614
<file src="uno.winui.win.targets" target="buildTransitive\uap10.0.16299\uno.winui.targets" />
615615
<file src="uno.winui.runtime-replace.targets" target="buildTransitive\uap10.0.16299" />
616616

617-
<file src="uno.winui.win.targets" target="buildTransitive\uap10.0.17763\uno.winui.targets" />
618-
<file src="uno.winui.runtime-replace.targets" target="buildTransitive\uap10.0.17763" />
617+
<file src="uno.winui.win.targets" target="buildTransitive\uap10.0.18362\uno.winui.targets" />
618+
<file src="uno.winui.runtime-replace.targets" target="buildTransitive\uap10.0.18362" />
619619

620620
<file src="uno.winui.win.targets" target="buildTransitive\net5.0-windows\uno.winui.targets" />
621621
<file src="uno.winui.runtime-replace.targets" target="buildTransitive\net5.0-windows" />

‎build/ci/.azure-devops-package-generic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- template: templates/dotnet-install.yml
5757

58-
- powershell: .\build\Install-WindowsSdkISO.ps1 17763
58+
- powershell: .\build\Install-WindowsSdkISO.ps1 18362
5959
displayName: Insider SDK
6060

6161
# Required for the Wasm uitests project

‎build/ci/.azure-devops-uap.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- template: templates/gitversion.yml
2929

30-
- powershell: .\build\Install-WindowsSdkISO.ps1 17763
30+
- powershell: .\build\Install-WindowsSdkISO.ps1 18362
3131
displayName: Insider SDK
3232

3333
- task: MSBuild@1

‎doc/ReleaseNotes/LegacyReleaseNotes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
* [#1559] [#1167] Wasm: make the IsEnabled property inheritable.
216216
* Full support of pointer events cf. [routed events documentation](../articles/features/routed-events.md)
217217
* Add support of manipulation events cf. [routed events documentation](../articles/features/routed-events.md)
218-
* Update CheckBox style to 10.0.17763
218+
* Update CheckBox style to 10.0.18362
219219
* Adds the support for `AutomationProperties.AutomationId`
220220
* [#1328](https://github.com/unoplatform/uno/issues/1328) Basic ProgressRing implementation for WASM
221221
* Add support for `Windows.UI.Xaml.Controls.Primitives.LayoutInformation.GetAvailableSize`
@@ -574,7 +574,7 @@
574574
* [Wasm] Fix `ListView` recycling when the `XamlParent` is not available for `AutoSuggestBox`
575575
* 147405 Fix NRE on some MediaTransportControl controls
576576
* #139 Update Uno.SourceGenerationTasks to improve build performance
577-
* Update `Uno.UI.Toolkit` base UWP sdk to 17763
577+
* Update `Uno.UI.Toolkit` base UWP sdk to 18362
578578
* [Wasm] Fixes items measured after being removed from their parent appear in the visual tree, on top of every other items.
579579
* [Wasm] Fixes lements may not be removed form the global active DOM elements tracking map
580580
* [Wasm] Disable the root element scrolling (bounce) on touch devices
@@ -590,7 +590,7 @@
590590

591591
### Features
592592
* [Wasm] Improve general performance and memory pressure by removing Javascript interop evaluations.
593-
* Add support for Windows 10 SDK 17763 (1809)
593+
* Add support for Windows 10 SDK 18362 (1809)
594594
* Improve the Uno.UI solution memory consumption for Android targets
595595
* Add support for GridLength conversion from double
596596
* Raise exceptions on missing styles in debug configuration

‎doc/articles/uno-community-toolkit.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,15 @@ To fix this, instead of adding the Uno version of the toolkit like the code belo
163163
Add a conditional reference:
164164

165165
```xml
166-
<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0.17763'">
166+
<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0.18362'">
167167
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="7.0.0" />
168168
</ItemGroup>
169-
<ItemGroup Condition="'$(TargetFramework)' != 'uap10.0.17763'">
169+
<ItemGroup Condition="'$(TargetFramework)' != 'uap10.0.18362'">
170170
<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls" Version="7.0.0" />
171171
</ItemGroup>
172172
```
173173

174-
You may need to replace `uap10.0.17763` with the version defined in the `TargetFrameworks` node at the top of the csproj file.
174+
You may need to replace `uap10.0.18362` with the version defined in the `TargetFrameworks` node at the top of the csproj file.
175175

176176
## See a working example with data
177177

‎doc/articles/uno-development/building-uno-ui.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ This article explains how to build Uno.UI locally, for instance if you wish to c
1010
- `MAUI Preview` (In VS 2022 17.1 Preview 1 or later, for .NET 6 Android/iOS support)
1111
- `ASP.NET and Web Development`
1212
- `.NET Core cross-platform development`
13-
- `UWP Development`, install all recent UWP SDKs, starting from 10.0.17763 (or above or equal to `TargetPlatformVersion` line [in this file](https://github.com/unoplatform/uno/blob/master/src/Uno.CrossTargetting.props))
14-
- Starting from VS 2022, the Windows SDK 10.0.17763 is not available from the installer. Use the [Microsoft Archive](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/) instead.
13+
- `UWP Development`, install all recent UWP SDKs, starting from 10.0.18362 (or above or equal to `TargetPlatformVersion` line [in this file](https://github.com/unoplatform/uno/blob/master/src/Uno.CrossTargetting.props))
14+
- Starting from VS 2022, the Windows SDK 10.0.18362 is not available from the installer. Use the [Microsoft Archive](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/) instead.
1515
- Install (**Tools** / **Android** / **Android SDK manager**) all Android SDKs starting from 7.1 (or the Android versions `TargetFrameworks` [list used here](https://github.com/unoplatform/uno/blob/master/src/Uno.UI.BindingHelper.Android/Uno.UI.BindingHelper.Android.csproj))
1616
- Run [Uno.Check](https://github.com/unoplatform/uno.check) on your dev machine to setup .NET 6 Android/iOS workloads
1717

@@ -87,7 +87,7 @@ Here are some tips when building the Uno solution and failures happen:
8787
- Try to close VS 2022, delete the `src/.vs` folder, then try rebuilding the solution
8888
- If the `.vs` deletion did not help, run `git clean -fdx` (after having closed visual studio) before building again
8989
- Make sure to have a valid `UnoTargetFrameworkOverride` which matches your solution filter
90-
- Make sure to have the Windows SDK `17763` installed
90+
- Make sure to have the Windows SDK `18362` installed
9191

9292
## Other build-related topics
9393

‎src/.vsconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"Microsoft.VisualStudio.Component.VC.CoreIde",
5858
"Microsoft.VisualStudio.Component.ClassDesigner",
5959
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
60-
"Microsoft.VisualStudio.Component.Windows10SDK.17763",
60+
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
6161
"Microsoft.VisualStudio.Component.Graphics.Tools",
6262
"Microsoft.VisualStudio.Component.VC.ATL",
6363
"Microsoft.Component.NetFX.Native",

‎src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>xamarinmac20;MonoAndroid12.0;xamarinios10;net461;netstandard2.0;uap10.0.17763</TargetFrameworks>
5-
<TargetFrameworksCI>xamarinmac20;MonoAndroid11.0;MonoAndroid12.0;xamarinios10;net461;netstandard2.0;uap10.0.17763</TargetFrameworksCI>
4+
<TargetFrameworks>xamarinmac20;MonoAndroid12.0;xamarinios10;net461;netstandard2.0;uap10.0.18362</TargetFrameworks>
5+
<TargetFrameworksCI>xamarinmac20;MonoAndroid11.0;MonoAndroid12.0;xamarinios10;net461;netstandard2.0;uap10.0.18362</TargetFrameworksCI>
66
<NoWarn>$(NoWarn);NU1701;NU5100;NU5118;NU5128</NoWarn>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
<Deterministic>true</Deterministic>
@@ -44,7 +44,7 @@
4444
<PackageReference Include="Microsoft.Identity.Client" Version="4.15.0" />
4545
</ItemGroup>
4646

47-
<ItemGroup Condition="'$(TargetFramework)' != 'uap10.0.17763'">
47+
<ItemGroup Condition="'$(TargetFramework)' != 'uap10.0.18362'">
4848
<ProjectReference Include="..\..\Uno.UI\Uno.UI.csproj" />
4949
</ItemGroup>
5050

‎src/SamplesApp/SamplesApp.UWP.Design/SamplesApp.UWP.Design.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<AssemblyName>SamplesApp.UWP.Design</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

‎src/SamplesApp/SamplesApp.UWP/SamplesApp.UWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
1414
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
15+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

‎src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-net6/.vsconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
"Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
7171
"Microsoft.VisualStudio.Workload.ManagedDesktop",
7272
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
73-
"Microsoft.VisualStudio.Component.Windows10SDK.17763",
7473
"Microsoft.Component.NetFX.Native",
7574
"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
7675
"Microsoft.VisualStudio.Component.Graphics",

‎src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-prism/.vsconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
"Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
8282
"Microsoft.VisualStudio.Workload.ManagedDesktop",
8383
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
84-
"Microsoft.VisualStudio.Component.Windows10SDK.17763",
8584
"Microsoft.Component.NetFX.Native",
8685
"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
8786
"Microsoft.VisualStudio.Component.Graphics",

‎src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui-net6/.vsconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
"Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
7171
"Microsoft.VisualStudio.Workload.ManagedDesktop",
7272
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
73-
"Microsoft.VisualStudio.Component.Windows10SDK.17763",
7473
"Microsoft.Component.NetFX.Native",
7574
"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
7675
"Microsoft.VisualStudio.Component.Graphics",

‎src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows/Package.appxmanifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</Properties>
1919

2020
<Dependencies>
21-
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
22-
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
21+
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
22+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
2323
</Dependencies>
2424

2525
<Resources>

‎src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
44
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
5-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
5+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
66
<RootNamespace>UnoWinUIQuickStart</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<Platforms>x86;x64;arm64</Platforms>

‎src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/.vsconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
"Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
8282
"Microsoft.VisualStudio.Workload.ManagedDesktop",
8383
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
84-
"Microsoft.VisualStudio.Component.Windows10SDK.17763",
8584
"Microsoft.Component.NetFX.Native",
8685
"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
8786
"Microsoft.VisualStudio.Component.Graphics",

‎src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
44
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
5-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
5+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
66
<RootNamespace>UnoWinUIQuickStart</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<Platforms>x86;x64;arm64</Platforms>

‎src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/Package.appxmanifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</Properties>
1919

2020
<Dependencies>
21-
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
22-
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
21+
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
22+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
2323
</Dependencies>
2424

2525
<Resources>

‎src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PropertyGroup>
4040
<ProjectGuid>$guid6$</ProjectGuid>
4141
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
42-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
42+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
4343
<AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
4444
<DefaultLanguage>en-US</DefaultLanguage>
4545
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>

‎src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/.vsconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
"Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
8282
"Microsoft.VisualStudio.Workload.ManagedDesktop",
8383
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
84-
"Microsoft.VisualStudio.Component.Windows10SDK.17763",
8584
"Microsoft.Component.NetFX.Native",
8685
"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
8786
"Microsoft.VisualStudio.Component.Graphics",

‎src/SolutionTemplate/UnoSolutionTemplate.Wizard/.vsconfig.vs16

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
"Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
8282
"Microsoft.VisualStudio.Workload.ManagedDesktop",
8383
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
84-
"Microsoft.VisualStudio.Component.Windows10SDK.17763",
8584
"Microsoft.Component.NetFX.Native",
8685
"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
8786
"Microsoft.VisualStudio.Component.Graphics",

‎src/SolutionTemplate/UnoSolutionTemplate.Wizard/.vsconfig.vs17

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
"Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
7171
"Microsoft.VisualStudio.Workload.ManagedDesktop",
7272
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
73-
"Microsoft.VisualStudio.Component.Windows10SDK.17763",
7473
"Microsoft.Component.NetFX.Native",
7574
"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
7675
"Microsoft.VisualStudio.Component.Graphics",

‎src/Uno.CrossTargetting.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@
102102
<AndroidResgenFile>obj\$(TargetFramework)\Resources\Resource.Designer.cs</AndroidResgenFile>
103103
</PropertyGroup>
104104

105-
<PropertyGroup Condition=" '$(TargetFramework)' != 'uap10.0.17763' and '$(TargetFramework)'!='net5.0-windows10.0.18362.0' ">
105+
<PropertyGroup Condition=" '$(TargetFramework)' != 'uap10.0.18362' and '$(TargetFramework)'!='net5.0-windows10.0.18362.0' ">
106106
<DefineConstants>$(DefineConstants);HAS_UNO</DefineConstants>
107107
</PropertyGroup>
108108

109-
<PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.17763' ">
110-
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
111-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
109+
<PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.18362' ">
110+
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
111+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
112112
<DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
113113

114114
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->

‎src/Uno.UI.RuntimeTests/Helpers/StyleHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static IDisposable UseAppLevelResources(ResourceDictionary resources)
6969
/// </summary>
7070
public static IDisposable UseFluentStyles()
7171
{
72-
#if NETFX_CORE // Disabled on UWP for now because 17763 doesn't support WinUI 2.x; Fluent resources are used by default in SamplesApp.UWP
72+
#if NETFX_CORE // Disabled on UWP for now because 18362 doesn't support WinUI 2.x; Fluent resources are used by default in SamplesApp.UWP
7373
return null;
7474
#else
7575
var resources = Application.Current.Resources;

0 commit comments

Comments
 (0)