Skip to content

Commit 9435cd2

Browse files
nickrandolphnickrandolph
authored
Merge pull request #625 from unoplatform/dev/nr/winuiupdate
feat: Updating WinAppSdk and removing UseRidGraph
2 parents 8187a21 + 996f987 commit 9435cd2

File tree

205 files changed

+723
-723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+723
-723
lines changed

‎UI/AdvancedXBind/AdvancedXBind.Windows/AdvancedXBind.Windows.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<RootNamespace>AdvancedXBind</RootNamespace>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
99
<Platforms>x86;x64;arm64</Platforms>
10-
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
11-
<UseRidGraph>true</UseRidGraph>
12-
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
10+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
11+
12+
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
1313
<UseWinUI>true</UseWinUI>
1414
<EnableMsixTooling>true</EnableMsixTooling>
1515
<DefaultLanguage>en</DefaultLanguage>
@@ -26,7 +26,7 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
29+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
3030
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
3131
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
3232
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />

‎UI/AdvancedXBind/AdvancedXBind.Windows/Properties/PublishProfiles/win10-arm64.pubxml renamed to ‎UI/AdvancedXBind/AdvancedXBind.Windows/Properties/PublishProfiles/win-arm64.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
88
<Platform>arm64</Platform>
9-
<RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
9+
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
1010
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
1212
<PublishSingleFile>False</PublishSingleFile>

‎UI/Benchmark/AppBenchmark/AppBenchmark.Windows/Properties/PublishProfiles/win10-x64.pubxml renamed to ‎UI/AdvancedXBind/AdvancedXBind.Windows/Properties/PublishProfiles/win-x64.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
88
<Platform>x64</Platform>
9-
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
9+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1010
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
1212
<PublishSingleFile>False</PublishSingleFile>

‎UI/MigrateCustomRenderers/MigrateRenderersSample/MigrateRenderersSample.Windows/Properties/PublishProfiles/win10-x86.pubxml renamed to ‎UI/AdvancedXBind/AdvancedXBind.Windows/Properties/PublishProfiles/win-x86.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
88
<Platform>x86</Platform>
9-
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
9+
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
1010
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
1212
<PublishSingleFile>False</PublishSingleFile>

‎UI/Authentication.OidcDemo/Authentication.OidcDemo/Authentication.OidcDemo.Windows/Authentication.OidcDemo.Windows.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<RootNamespace>Authentication.OidcDemo</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<Platforms>x86;x64;arm64</Platforms>
9-
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
10-
<UseRidGraph>true</UseRidGraph>
11-
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
9+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
10+
11+
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
1212
<UseWinUI>true</UseWinUI>
1313
<EnableMsixTooling>true</EnableMsixTooling>
1414
</PropertyGroup>
@@ -28,7 +28,7 @@
2828
<PackageReference Include="Uno.WinUI" Version="5.0.64" />
2929
<PackageReference Include="WinUIEx" Version="2.2.0" />
3030
<PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
31-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
31+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
3232
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
3333
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
3434
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />

‎UI/AutoSuggestSample/AutoSuggestSample/AutoSuggestSample.Windows/AutoSuggestSample.Windows.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<RootNamespace>AutoSuggestSample</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<Platforms>x86;x64;arm64</Platforms>
9-
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
10-
<UseRidGraph>true</UseRidGraph>
11-
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
9+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
10+
11+
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
1212
<UseWinUI>true</UseWinUI>
1313
<EnableMsixTooling>true</EnableMsixTooling>
1414
</PropertyGroup>
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
27+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
2828
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
2929
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
3030
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />

‎UI/Benchmark/AppBenchmark/AppBenchmark.Windows/AppBenchmark.Windows.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<RootNamespace>AppBenchmark</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<Platforms>x86;x64;arm64</Platforms>
9-
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
10-
<UseRidGraph>true</UseRidGraph>
11-
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
9+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
10+
11+
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
1212
<UseWinUI>true</UseWinUI>
1313
<EnableMsixTooling>true</EnableMsixTooling>
1414
<DefaultLanguage>en</DefaultLanguage>
@@ -27,7 +27,7 @@
2727
<ItemGroup>
2828
<PackageReference Include="Uno.BenchmarkDotNet" Version="0.11.7-develop" />
2929
<PackageReference Include="Uno.BenchmarkDotNet.Annotations" Version="0.11.7-develop" />
30-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
30+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
3131
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
3232
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
3333
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />

‎UI/MigrateCustomRenderers/MigrateRenderersSample/MigrateRenderersSample.Windows/Properties/PublishProfiles/win10-arm64.pubxml renamed to ‎UI/Benchmark/AppBenchmark/AppBenchmark.Windows/Properties/PublishProfiles/win-arm64.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
88
<Platform>arm64</Platform>
9-
<RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
9+
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
1010
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
1212
<PublishSingleFile>False</PublishSingleFile>

‎UI/AdvancedXBind/AdvancedXBind.Windows/Properties/PublishProfiles/win10-x64.pubxml renamed to ‎UI/Benchmark/AppBenchmark/AppBenchmark.Windows/Properties/PublishProfiles/win-x64.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
88
<Platform>x64</Platform>
9-
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
9+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1010
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
1212
<PublishSingleFile>False</PublishSingleFile>

‎UI/PetAdoptUI/PetAdoptUI/PetAdoptUI.Windows/Properties/PublishProfiles/win10-x86.pubxml renamed to ‎UI/Benchmark/AppBenchmark/AppBenchmark.Windows/Properties/PublishProfiles/win-x86.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
88
<Platform>x86</Platform>
9-
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
9+
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
1010
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
1212
<PublishSingleFile>False</PublishSingleFile>

0 commit comments

Comments
 (0)