Skip to content

Commit 08fbc33

Browse files
rmarinhorolfbjarne
rmarinho
and
rolfbjarne
authored
[net9.0] Move net9 to preview3 (#21011)
* [ci] Move to net9 preview3 * Update the macios dependencies to new package names. Update the macios dependencies to new package names now that multi-targeting has been implemented for .NET 9 preview 3. * Update Versions.props * Update handlers.yml * Bump min versions for Catalyst and macOS * Revert "Update handlers.yml" This reverts commit f89432f. * [templates] Bump versions for Catalyst to 15.0 * [iOS] Fix NRE when ContainerView.Window could be null * Update MauiApp.1.Mac.csproj --------- Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
1 parent d5c8910 commit 08fbc33

File tree

8 files changed

+105
-100
lines changed

8 files changed

+105
-100
lines changed

‎Directory.Build.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
<NoWarn>$(NoWarn);CA1416</NoWarn>
2727
</PropertyGroup>
2828
<PropertyGroup Condition="'$(_MauiTargetPlatformIsMacCatalyst)' == 'True'">
29-
<SupportedOSPlatformVersion>13.1</SupportedOSPlatformVersion>
30-
<TargetPlatformMinVersion>13.1</TargetPlatformMinVersion>
29+
<SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
30+
<TargetPlatformMinVersion>15.0</TargetPlatformMinVersion>
3131
<!-- Workaround: https://github.com/dotnet/roslyn-analyzers/issues/6158 -->
3232
<NoWarn>$(NoWarn);CA1416</NoWarn>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(_MauiTargetPlatformIsmacOS)' == 'True'">
35-
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
36-
<TargetPlatformMinVersion>10.14</TargetPlatformMinVersion>
35+
<SupportedOSPlatformVersion>12.0</SupportedOSPlatformVersion>
36+
<TargetPlatformMinVersion>12.0</TargetPlatformMinVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(_MauiTargetPlatformIsAndroid)' == 'True'">
3939
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>

‎eng/Version.Details.xml‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,131 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.2.24129.7">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.3.24155.3">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>d0f8457eb7eef211194c616561a7b2f28850374e</Sha>
5+
<Sha>75494d3ada6624c411116d4c6e52daaf49154ee7</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.2.24128.5">
7+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.3.24154.11">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
9+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.99.0-preview.2.187">
11+
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.99.0-preview.3.196">
1212
<Uri>https://github.com/xamarin/xamarin-android</Uri>
13-
<Sha>b453224385d98c44579ec458dfdda43213b0692f</Sha>
13+
<Sha>aea89e161fb49fe921d9c601abb44360c653787d</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="17.2.9241-net9-p2">
15+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_17.2" Version="17.2.9331-net9-p3">
1616
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
17-
<Sha>088bb48cbaf2ce7c3cfd8d1009422234da85628c</Sha>
17+
<Sha>efc39def7b3cbd4f059b06eee7741a1188d0b0e8</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.macOS.Sdk" Version="14.2.9241-net9-p2">
19+
<Dependency Name="Microsoft.macOS.Sdk.net9.0_14.2" Version="14.2.9331-net9-p3">
2020
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
21-
<Sha>088bb48cbaf2ce7c3cfd8d1009422234da85628c</Sha>
21+
<Sha>efc39def7b3cbd4f059b06eee7741a1188d0b0e8</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.iOS.Sdk" Version="17.2.9241-net9-p2">
23+
<Dependency Name="Microsoft.iOS.Sdk.net9.0_17.2" Version="17.2.9331-net9-p3">
2424
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
25-
<Sha>088bb48cbaf2ce7c3cfd8d1009422234da85628c</Sha>
25+
<Sha>efc39def7b3cbd4f059b06eee7741a1188d0b0e8</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.tvOS.Sdk" Version="17.2.9241-net9-p2">
27+
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_17.2" Version="17.2.9331-net9-p3">
2828
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
29-
<Sha>088bb48cbaf2ce7c3cfd8d1009422234da85628c</Sha>
29+
<Sha>efc39def7b3cbd4f059b06eee7741a1188d0b0e8</Sha>
3030
</Dependency>
3131
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
3232
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
3333
</Dependency>
34-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.2.24123.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
34+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.3.24128.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
3535
<Uri>https://github.com/dotnet/emsdk</Uri>
36-
<Sha>f87c7165942d0bb19fc6ee33a55b49d574ec142a</Sha>
36+
<Sha>e926eb7d9614243be6b936cbbe9988fd8cc6d8a6</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.2.24128.4">
38+
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.3.24154.12">
3939
<Uri>https://github.com/dotnet/aspnetcore</Uri>
40-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
40+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0-preview.2.24128.4">
42+
<Dependency Name="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0-preview.3.24154.12">
4343
<Uri>https://github.com/dotnet/aspnetcore</Uri>
44-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
44+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0-preview.2.24128.4">
46+
<Dependency Name="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0-preview.3.24154.12">
4747
<Uri>https://github.com/dotnet/aspnetcore</Uri>
48-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
48+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0-preview.2.24128.4">
50+
<Dependency Name="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0-preview.3.24154.12">
5151
<Uri>https://github.com/dotnet/aspnetcore</Uri>
52-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
52+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
5353
</Dependency>
54-
<Dependency Name="Microsoft.AspNetCore.Components" Version="9.0.0-preview.2.24128.4">
54+
<Dependency Name="Microsoft.AspNetCore.Components" Version="9.0.0-preview.3.24154.12">
5555
<Uri>https://github.com/dotnet/aspnetcore</Uri>
56-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
56+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="9.0.0-preview.2.24128.4">
58+
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="9.0.0-preview.3.24154.12">
5959
<Uri>https://github.com/dotnet/aspnetcore</Uri>
60-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
60+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.AspNetCore.Components.Forms" Version="9.0.0-preview.2.24128.4">
62+
<Dependency Name="Microsoft.AspNetCore.Components.Forms" Version="9.0.0-preview.3.24154.12">
6363
<Uri>https://github.com/dotnet/aspnetcore</Uri>
64-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
64+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="9.0.0-preview.2.24128.4">
66+
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="9.0.0-preview.3.24154.12">
6767
<Uri>https://github.com/dotnet/aspnetcore</Uri>
68-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
68+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.2.24128.4">
70+
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.3.24154.12">
7171
<Uri>https://github.com/dotnet/aspnetcore</Uri>
72-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
72+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.AspNetCore.Metadata" Version="9.0.0-preview.2.24128.4">
74+
<Dependency Name="Microsoft.AspNetCore.Metadata" Version="9.0.0-preview.3.24154.12">
7575
<Uri>https://github.com/dotnet/aspnetcore</Uri>
76-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
76+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.2.24128.4">
78+
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.3.24154.12">
7979
<Uri>https://github.com/dotnet/aspnetcore</Uri>
80-
<Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
80+
<Sha>32b772a470e3c7dc147d3d124c32199bb3e7b6bc</Sha>
8181
</Dependency>
8282
<Dependency Name="Microsoft.TemplateEngine.Tasks" Version="7.0.100-preview.2.22102.8">
8383
<Uri>https://github.com/dotnet/templating</Uri>
8484
<Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-preview.2.24128.5">
86+
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-preview.3.24154.11">
8787
<Uri>https://github.com/dotnet/runtime</Uri>
88-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
88+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.2.24128.5">
90+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.3.24154.11">
9191
<Uri>https://github.com/dotnet/runtime</Uri>
92-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
92+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.2.24128.5">
94+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.3.24154.11">
9595
<Uri>https://github.com/dotnet/runtime</Uri>
96-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
96+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.2.24128.5">
98+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.3.24154.11">
9999
<Uri>https://github.com/dotnet/runtime</Uri>
100-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
100+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.2.24128.5">
102+
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.3.24154.11">
103103
<Uri>https://github.com/dotnet/runtime</Uri>
104-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
104+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="9.0.0-preview.2.24128.5">
106+
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="9.0.0-preview.3.24154.11">
107107
<Uri>https://github.com/dotnet/runtime</Uri>
108-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
108+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.2.24128.5">
110+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.3.24154.11">
111111
<Uri>https://github.com/dotnet/runtime</Uri>
112-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
112+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.2.24128.5">
114+
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.3.24154.11">
115115
<Uri>https://github.com/dotnet/runtime</Uri>
116-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
116+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.2.24128.5">
118+
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.3.24154.11">
119119
<Uri>https://github.com/dotnet/runtime</Uri>
120-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
120+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.2.24128.5">
122+
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.3.24154.11">
123123
<Uri>https://github.com/dotnet/runtime</Uri>
124-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
124+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.0-preview.2.24128.5">
126+
<Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.0-preview.3.24154.11">
127127
<Uri>https://github.com/dotnet/runtime</Uri>
128-
<Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
128+
<Sha>b020042548428b0d059d2e5ba5aa686e27775ca1</Sha>
129129
</Dependency>
130130
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24112.1">
131131
<Uri>https://github.com/dotnet/xharness</Uri>

0 commit comments

Comments
 (0)