Skip to content

Commit 5538db6

Browse files
pjcollinspjcollins
committed
Continue net9.0 updates
1 parent 592c918 commit 5538db6

File tree

12 files changed

+53
-67
lines changed

12 files changed

+53
-67
lines changed

‎facebook/sample/Sample.csproj

-6
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,9 @@
2626
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
2727
<ApplicationVersion>1</ApplicationVersion>
2828

29-
<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
30-
<WindowsPackageType>None</WindowsPackageType>
31-
3229
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
3330
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
3431
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
35-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
36-
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
37-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
3832
</PropertyGroup>
3933

4034
<ItemGroup>

‎firebase/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ This folder contains a slim binding for the Firebase SDK which demonstrates simp
33

44
### Build and Run
55
```shell
6-
dotnet build sample -t:Run -f net8.0-ios
6+
dotnet build sample -t:Run -f net9.0-ios
77
```
88

99
### Configure

‎firebase/macios/Firebase.MaciOS.Binding/Firebase.MaciOS.Binding.csproj

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
3+
<TargetFrameworks>net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>true</ImplicitUsings>
66
<IsBindingProject>true</IsBindingProject>
7-
<NoBindingEmbedding>true</NoBindingEmbedding>
8-
</PropertyGroup>
97

10-
<ItemGroup>
11-
<PackageReference Include="CommunityToolkit.Maui.NativeLibraryInterop.BuildTasks" Version="$(NLIPackageVersion)" PrivateAssets="all" />
12-
</ItemGroup>
8+
<!--
9+
Enable trim analyzers for class libraries.
10+
To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming
11+
-->
12+
<IsTrimmable>true</IsTrimmable>
13+
</PropertyGroup>
1314

1415
<ItemGroup>
1516
<ObjcBindingApiDefinition Include="ApiDefinitions.cs" />
16-
<NLIXcodeProjectReference Include="../native/MauiFirebase.xcodeproj">
17+
<XcodeProject Include="../native/MauiFirebase.xcodeproj">
1718
<SchemeName>MauiFirebase</SchemeName>
18-
<SharpieNamespace>Firebase</SharpieNamespace>
19-
<SharpieBind>true</SharpieBind>
2019
<!-- Metadata applicable to @(NativeReference) will be used if set, otherwise the following defaults will be used:
2120
<Kind>Framework</Kind>
2221
<SmartLink>true</SmartLink>
2322
-->
24-
</NLIXcodeProjectReference>
23+
</XcodeProject>
2524
</ItemGroup>
2625

2726
</Project>

‎firebase/sample/App.xaml.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ public partial class App : Application
55
public App()
66
{
77
InitializeComponent();
8+
}
89

9-
MainPage = new AppTabbedPage();
10+
protected override Window CreateWindow(IActivationState? activationState)
11+
{
12+
return new Window(new AppTabbedPage());
1013
}
1114
}

‎firebase/sample/Sample.csproj

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
4+
<TargetFrameworks>net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5+
56
<!-- Note for MacCatalyst:
67
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
78
When specifying both architectures, use the plural <RuntimeIdentifiers> instead of the singular <RuntimeIdentifier>.
@@ -25,10 +26,8 @@
2526
<!-- Versions -->
2627
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
2728
<ApplicationVersion>1</ApplicationVersion>
28-
<MtouchLink>None</MtouchLink>
29-
30-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">13.0</SupportedOSPlatformVersion>
31-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
29+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
30+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
3231
</PropertyGroup>
3332

3433
<ItemGroup>
@@ -51,17 +50,17 @@
5150

5251
<ItemGroup>
5352
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
54-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
55-
<BundleResource Include="Platforms\iOS\GoogleService-Info.plist">
56-
<Link>GoogleService-Info.plist</Link>
57-
</BundleResource>
53+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.2.24473.5" />
5854
</ItemGroup>
5955

6056
<ItemGroup>
6157
<ProjectReference Include="..\macios\Firebase.MaciOS.Binding\Firebase.MaciOS.Binding.csproj" />
6258
</ItemGroup>
6359

6460
<ItemGroup>
61+
<BundleResource Include="Platforms\iOS\GoogleService-Info.plist">
62+
<Link>GoogleService-Info.plist</Link>
63+
</BundleResource>
6564
<!-- Exclude when running a generic build in CI where provisioning profiles aren't configured -->
6665
<CustomEntitlements Include="aps-environment" Type="string" Value="development" Condition="'$(Configuration)' == 'Debug' and '$(CI)' != 'true'" />
6766
<CustomEntitlements Include="aps-environment" Type="string" Value="production" Condition="'$(Configuration)' == 'Release' and '$(CI)' != 'true'" />

‎googlecast/macios/GoogleCast.MaciOS.Binding/GoogleCast.MaciOS.Binding.csproj

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-ios</TargetFramework>
3+
<TargetFramework>net9.0-ios</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>true</ImplicitUsings>
66
<IsBindingProject>true</IsBindingProject>
77

8-
<BuildXcodeProjectsDependsOnTargets>$(BuildXcodeProjectsDependsOnTargets);NativeDependencies</BuildXcodeProjectsDependsOnTargets>
8+
<!--
9+
Enable trim analyzers for class libraries.
10+
To learn more, see: https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming
11+
-->
12+
<IsTrimmable>true</IsTrimmable>
13+
<MaciOSPrepareForBuildDependsOn>$(MaciOSPrepareForBuildDependsOn);DownloadNativeDependencies</MaciOSPrepareForBuildDependsOn>
914
</PropertyGroup>
1015

11-
<ItemGroup>
12-
<PackageReference Include="CommunityToolkit.Maui.NativeLibraryInterop.BuildTasks" Version="$(NLIPackageVersion)" PrivateAssets="all" />
13-
</ItemGroup>
14-
1516
<ItemGroup>
1617
<ObjcBindingApiDefinition Include="ApiDefinitions.cs" />
17-
<NLIXcodeProjectReference Include="../native/MauiGoogleCast.xcodeproj">
18+
<XcodeProject Include="../native/MauiGoogleCast.xcodeproj">
1819
<SchemeName>MauiGoogleCast</SchemeName>
19-
<SharpieNamespace>GoogleCast</SharpieNamespace>
20-
<SharpieBind>false</SharpieBind>
2120
<!-- Metadata applicable to @(NativeReference) will be used if set, otherwise the following defaults will be used:
2221
<Kind>Framework</Kind>
2322
<SmartLink>true</SmartLink>
2423
-->
25-
</NLIXcodeProjectReference>
24+
</XcodeProject>
2625
</ItemGroup>
2726

28-
<Target Name="NativeDependencies">
27+
<Target Name="DownloadNativeDependencies">
2928
<PropertyGroup>
3029
<!-- TODO: Update this URL once a new official cast SDK is released.
3130
The 4.8.x versions of the Google Cast SDK contains a bug that breaks the cast button on physical iOS devices:

‎googlecast/sample/App.xaml.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ public partial class App : Application
55
public App()
66
{
77
InitializeComponent();
8+
}
89

9-
MainPage = new AppShell();
10+
protected override Window CreateWindow(IActivationState? activationState)
11+
{
12+
return new Window(new AppShell());
1013
}
1114
}

‎googlecast/sample/GoogleCast.Sample.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0-ios</TargetFramework>
4+
<TargetFramework>net9.0-ios</TargetFramework>
55

66
<!-- Note for MacCatalyst:
77
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
@@ -27,8 +27,8 @@
2727
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
2828
<ApplicationVersion>1</ApplicationVersion>
2929

30-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
31-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
30+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
31+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
3232
</PropertyGroup>
3333

3434
<ItemGroup>
@@ -51,7 +51,7 @@
5151

5252
<ItemGroup>
5353
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
54-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
54+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.2.24473.5" />
5555
</ItemGroup>
5656

5757
<ItemGroup>

‎template/android/NewBinding.Android.Binding/NewBinding.Android.Binding.csproj

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-android</TargetFramework>
3+
<TargetFramework>net9.0-android</TargetFramework>
44
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
@@ -15,19 +15,15 @@
1515
-->
1616
</PropertyGroup>
1717

18-
<!-- Reference to Android project -->
18+
<!-- Reference to Android Gradle project -->
1919
<ItemGroup>
20-
<NLIGradleProjectReference Include="../native" >
20+
<AndroidGradleProject Include="../native/build.gradle.kts" >
2121
<ModuleName>newbinding</ModuleName>
2222
<!-- Metadata applicable to @(AndroidLibrary) will be used if set, otherwise the following defaults will be used:
2323
<Bind>true</Bind>
2424
<Pack>true</Pack>
2525
-->
26-
</NLIGradleProjectReference>
26+
</AndroidGradleProject>
2727
</ItemGroup>
2828

29-
<!-- Reference to NuGet for building bindings -->
30-
<ItemGroup>
31-
<PackageReference Include="CommunityToolkit.Maui.NativeLibraryInterop.BuildTasks" Version="0.0.1-pre1" PrivateAssets="all" />
32-
</ItemGroup>
3329
</Project>

‎template/macios/NewBinding.MaciOS.Binding/NewBinding.MaciOS.Binding.csproj

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
3+
<TargetFrameworks>net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>true</ImplicitUsings>
66
<IsBindingProject>true</IsBindingProject>
@@ -19,19 +19,13 @@
1919

2020
<!-- Reference to Xcode project -->
2121
<ItemGroup>
22-
<NLIXcodeProjectReference Include="../native/NewBinding/NewBinding.xcodeproj">
22+
<XcodeProject Include="../native/NewBinding/NewBinding.xcodeproj">
2323
<SchemeName>NewBinding</SchemeName>
24-
<SharpieNamespace>NewBindingMaciOS</SharpieNamespace>
25-
<SharpieBind>true</SharpieBind>
2624
<!-- Metadata applicable to @(NativeReference) will be used if set, otherwise the following defaults will be used:
2725
<Kind>Framework</Kind>
2826
<SmartLink>true</SmartLink>
2927
-->
30-
</NLIXcodeProjectReference>
28+
</XcodeProject>
3129
</ItemGroup>
3230

33-
<!-- Reference to NuGet for building bindings -->
34-
<ItemGroup>
35-
<PackageReference Include="CommunityToolkit.Maui.NativeLibraryInterop.BuildTasks" Version="0.0.1-pre1" PrivateAssets="all" />
36-
</ItemGroup>
3731
</Project>

‎template/sample/App.xaml.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ public partial class App : Application
55
public App()
66
{
77
InitializeComponent();
8+
}
89

9-
MainPage = new AppShell();
10+
protected override Window CreateWindow(IActivationState? activationState)
11+
{
12+
return new Window(new AppShell());
1013
}
1114
}

‎template/sample/MauiSample.csproj

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
4+
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
55

66
<!-- Note for MacCatalyst:
77
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
@@ -30,9 +30,6 @@
3030
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
3131
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
3232
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
33-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
34-
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
35-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
3633
</PropertyGroup>
3734

3835
<ItemGroup>
@@ -55,8 +52,7 @@
5552

5653
<ItemGroup>
5754
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
58-
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
59-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
55+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.2.24473.5" />
6056
</ItemGroup>
6157

6258
<!-- Reference to MaciOS Binding project -->

0 commit comments

Comments
 (0)