Skip to content

Commit

Permalink
.NET 9 (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
IeuanWalker authored Nov 19, 2024
1 parent 1b39cd9 commit 45bba53
Show file tree
Hide file tree
Showing 16 changed files with 127 additions and 161 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
schedule:
- cron: '0 0 1 */3 *' # Every 3 months
env:
NET_VERSION: 8.0.204
NET_VERSION: 9.*.*
PROJECT_PATH: 'Scr/Breadcrumb.csproj'
NUGET_PATH: './**/IeuanWalker.Maui.Breadcrumb.1.0.0.nupkg'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [published]

env:
NET_VERSION: 8.0.204
NET_VERSION: 9.*.*
PROJECT_PATH: 'Scr/Breadcrumb.csproj'
NUGET_PATH: './**/IeuanWalker.Maui.Breadcrumb.${{ github.event.release.tag_name }}.nupkg'

Expand Down
9 changes: 5 additions & 4 deletions Demo/App.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios;</TargetFrameworks>
<TargetFrameworks>net9.0-android;net9.0-ios;</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>App</RootNamespace>
<UseMaui>true</UseMaui>
Expand All @@ -17,6 +17,8 @@
<ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>

<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
Expand All @@ -32,9 +34,8 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.10" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Scr\Breadcrumb.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions Demo/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public partial class App : Application
public App()
{
InitializeComponent();

MainPage = new NavigationPage(new TestPage1());
}

protected override Window CreateWindow(IActivationState? activationState) => new(new NavigationPage(new TestPage1()));
}
4 changes: 2 additions & 2 deletions Demo/Pages/BasePage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ void ThemeToggle_Clicked(object? sender, EventArgs e)
{
ToolbarItem? item = (ToolbarItem?)sender;

if (item is null || Application.Current is null)
if(item is null || Application.Current is null)
{
return;
}

switch (item.Text)
switch(item.Text)
{
case nameof(Theme.Light):
Application.Current.Resources = new DarkTheme();
Expand Down
4 changes: 2 additions & 2 deletions Demo/Platforms/Android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>
</manifest>
1 change: 0 additions & 1 deletion Demo/Platforms/Android/MainActivity.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Android.App;
using Android.Content.PM;
using Microsoft.Maui;

namespace App;

Expand Down
1 change: 0 additions & 1 deletion Demo/Platforms/iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Foundation;
using Microsoft.Maui;

namespace App;

Expand Down
4 changes: 2 additions & 2 deletions Demo/Resources/AppIcon/appicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions Demo/Resources/AppIcon/appiconfg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 45bba53

Please sign in to comment.