Skip to content

Commit d683a3d

Browse files
nickrandolphnickrandolph
authored
Merge pull request #604 from unoplatform/dev/nr/net8rtm
feat: Updating to net8
2 parents 9e4d75c + 4f0bb0d commit d683a3d

File tree

403 files changed

+2094
-2496
lines changed

Some content is hidden

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

403 files changed

+2094
-2496
lines changed

‎UI/AdvancedXBind/AdvancedXBind.Mobile/AdvancedXBind.Mobile.csproj

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst;</TargetFrameworks>
3+
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst;</TargetFrameworks>
44
<SingleProject>true</SingleProject>
55
<OutputType>Exe</OutputType>
6-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-ios'">iossimulator-x64</RuntimeIdentifier>
7-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
8-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
6+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net8.0-ios'">iossimulator-x64</RuntimeIdentifier>
7+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
8+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net8.0-macos'">osx-x64</RuntimeIdentifier>
99
<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
10-
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
10+
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
1111
<!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->
1212
<!-- Disabled because of https://github.com/dotnet/runtime/issues/68808 -->
13-
<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net7.0-maccatalyst' and '$(TargetFramework)' != 'net7.0-macos'">True</UseInterpreter>-->
13+
<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net8.0-maccatalyst' and '$(TargetFramework)' != 'net8.0-macos'">True</UseInterpreter>-->
1414
<IsUnoHead>true</IsUnoHead>
15-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">14.2</SupportedOSPlatformVersion>
16-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
17-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">21.0</SupportedOSPlatformVersion>
18-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
15+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-ios'">14.2</SupportedOSPlatformVersion>
16+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
17+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-android'">21.0</SupportedOSPlatformVersion>
18+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net8.0-macos'">10.14</SupportedOSPlatformVersion>
1919
</PropertyGroup>
2020
<ItemGroup>
21-
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
22-
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
23-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
21+
<PackageReference Include="Uno.WinUI" Version="5.0.48" />
22+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.48" Condition="'$(Configuration)'=='Debug'" />
23+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
2424
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
2525
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
2626
</ItemGroup>
2727
<Choose>
28-
<When Condition="'$(TargetFramework)'=='net7.0-android'">
28+
<When Condition="'$(TargetFramework)'=='net8.0-android'">
2929
<ItemGroup>
3030
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.10.0.1" />
3131
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -34,8 +34,8 @@
3434
<AndroidEnvironment Include="Android/environment.conf" />
3535
</ItemGroup>
3636
</When>
37-
<When Condition="'$(TargetFramework)'=='net7.0-ios'">
38-
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
37+
<When Condition="'$(TargetFramework)'=='net8.0-ios'">
38+
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-ios'">
3939
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
4040
<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
4141
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
@@ -45,7 +45,7 @@
4545
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
4646
</ItemGroup>
4747
</When>
48-
<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
48+
<When Condition="'$(TargetFramework)'=='net8.0-maccatalyst'">
4949
<PropertyGroup>
5050
<!-- Configure the GC -->
5151
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
@@ -60,7 +60,7 @@
6060
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
6161
</ItemGroup>
6262
</When>
63-
<When Condition="'$(TargetFramework)'=='net7.0-macos'">
63+
<When Condition="'$(TargetFramework)'=='net8.0-macos'">
6464
<PropertyGroup>
6565
</PropertyGroup>
6666
</When>

‎UI/AdvancedXBind/AdvancedXBind.Skia.Gtk/AdvancedXBind.Skia.Gtk.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
44
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ApplicationManifest>app.manifest</ApplicationManifest>
77
</PropertyGroup>
88
<ItemGroup Condition="exists('..\AdvancedXBind.Windows')">
@@ -16,9 +16,9 @@
1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
1818
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
19-
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="5.0.19" />
20-
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
21-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
19+
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="5.0.48" />
20+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.48" Condition="'$(Configuration)'=='Debug'" />
21+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
2222
</ItemGroup>
2323
<Import Project="..\AdvancedXBind.Shared\AdvancedXBind.Shared.projitems" Label="Shared" />
2424
</Project>

‎UI/AdvancedXBind/AdvancedXBind.Wasm/AdvancedXBind.Wasm.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<NoWarn>NU1701</NoWarn>
66
</PropertyGroup>
77
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -43,9 +43,9 @@
4343
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
4444
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.5" />
4545
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
46-
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.0.19" />
47-
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
48-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
46+
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.0.48" />
47+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.48" Condition="'$(Configuration)'=='Debug'" />
48+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
4949
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.24" />
5050
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.24" />
5151
</ItemGroup>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
5+
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
66
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
77
<RootNamespace>AdvancedXBind</RootNamespace>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
99
<Platforms>x86;x64;arm64</Platforms>
1010
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
11+
<UseRidGraph>true</UseRidGraph>
1112
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
1213
<UseWinUI>true</UseWinUI>
1314
<EnableMsixTooling>true</EnableMsixTooling>
@@ -25,7 +26,7 @@
2526

2627
<ItemGroup>
2728
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
28-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
29+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
2930
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
3031
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
3132

‎UI/AndroidCustomCamera/AndroidCustomCamera/AndroidCustomCamera.Mobile/AndroidCustomCamera.Mobile.csproj

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0-android</TargetFrameworks>
3+
<TargetFrameworks>net8.0-android</TargetFrameworks>
44

55

66

@@ -11,31 +11,31 @@
1111
<SingleProject>true</SingleProject>
1212
<OutputType>Exe</OutputType>
1313
<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
14-
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
14+
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
1515
<!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->
1616
<!-- Disabled because of https://github.com/dotnet/runtime/issues/68808 -->
17-
<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net7.0-maccatalyst' and '$(TargetFramework)' != 'net7.0-macos'">True</UseInterpreter>-->
17+
<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net8.0-maccatalyst' and '$(TargetFramework)' != 'net8.0-macos'">True</UseInterpreter>-->
1818
<IsUnoHead>true</IsUnoHead>
19-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">14.2</SupportedOSPlatformVersion>
20-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
21-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">21.0</SupportedOSPlatformVersion>
22-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
19+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-ios'">14.2</SupportedOSPlatformVersion>
20+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
21+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net8.0-android'">21.0</SupportedOSPlatformVersion>
22+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net8.0-macos'">10.14</SupportedOSPlatformVersion>
2323
</PropertyGroup>
2424
<PropertyGroup Condition="'$(RuntimeIdentifier)'==''">
2525
<!-- Default values for command line builds -->
26-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-ios'">iossimulator-x64</RuntimeIdentifier>
27-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
28-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
26+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net8.0-ios'">iossimulator-x64</RuntimeIdentifier>
27+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
28+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net8.0-macos'">osx-x64</RuntimeIdentifier>
2929
</PropertyGroup>
3030
<ItemGroup>
31-
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
32-
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
33-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
31+
<PackageReference Include="Uno.WinUI" Version="5.0.48" />
32+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.48" Condition="'$(Configuration)'=='Debug'" />
33+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
3434
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
35-
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.19" />
35+
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.48" />
3636
</ItemGroup>
3737
<Choose>
38-
<When Condition="'$(TargetFramework)'=='net7.0-android'">
38+
<When Condition="'$(TargetFramework)'=='net8.0-android'">
3939
<ItemGroup>
4040
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.10.0.1" />
4141
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -44,8 +44,8 @@
4444
<AndroidEnvironment Include="Android/environment.conf" />
4545
</ItemGroup>
4646
</When>
47-
<When Condition="'$(TargetFramework)'=='net7.0-ios'">
48-
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
47+
<When Condition="'$(TargetFramework)'=='net8.0-ios'">
48+
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-ios'">
4949
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
5050
<!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
5151
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
@@ -56,7 +56,7 @@
5656
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
5757
</ItemGroup>
5858
</When>
59-
<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
59+
<When Condition="'$(TargetFramework)'=='net8.0-maccatalyst'">
6060
<PropertyGroup>
6161
<!-- Configure the GC -->
6262
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
@@ -71,7 +71,7 @@
7171
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
7272
</ItemGroup>
7373
</When>
74-
<When Condition="'$(TargetFramework)'=='net7.0-macos'">
74+
<When Condition="'$(TargetFramework)'=='net8.0-macos'">
7575
<PropertyGroup>
7676
</PropertyGroup>
7777
</When>

‎UI/Authentication.OidcDemo/Authentication.OidcDemo/Authentication.OidcDemo.Droid/Authentication.OidcDemo.Droid.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
<Reference Include="System.Xml" />
6565
</ItemGroup>
6666
<ItemGroup>
67-
<PackageReference Include="Uno.UI" Version="5.0.19" />
68-
<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
69-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
67+
<PackageReference Include="Uno.UI" Version="5.0.48" />
68+
<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.48" Condition="'$(Configuration)'=='Debug'" />
69+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
7070
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
7171
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
7272
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />

0 commit comments

Comments
 (0)