Merge pull request #73 from AndreasReitberger/72-upgrade-to-net9

Upgraded to `Net9`
AndreasReitberger · Nov 21, 2024 · 55ce845 · 55ce845
2 parents 6bc6eb3 + c369363
commit 55ce845
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Install .NET MAUI
       shell: pwsh
       run: |
@@ -61,7 +61,7 @@ jobs:
 #      - name: Setup .NET
 #        uses: actions/setup-dotnet@v3
 #        with:
-#          dotnet-version: '8.0.x'
+#          dotnet-version: '9.0.x'
 #      - name: Push NuGet
 #        run: |
 #          dotnet nuget push *.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }}
diff --git a/common.props b/common.props
@@ -2,7 +2,7 @@
 <Project>
 	<Import Project="framework.maui.props" />
     <PropertyGroup>		
-        <Version>1.1.0</Version>
+        <Version>1.1.0-preview1</Version>
 		<PackageIcon>ar_128.png</PackageIcon>
         <NeutralLanguage>en</NeutralLanguage>
 		<PackageProjectUrl>https://github.com/AndreasReitberger/MauiSettings</PackageProjectUrl>
@@ -31,9 +31,9 @@
    </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
-	  <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
-	  <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
+	  <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.10" />
+	  <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.10" />
+	  <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
       <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
 </Project>
diff --git a/framework.maui.props b/framework.maui.props
@@ -1,13 +1,13 @@
 
 <Project>
     <PropertyGroup>
-		<TargetFrameworks>net8.0-android</TargetFrameworks>
+		<TargetFrameworks>net9.0-android</TargetFrameworks>
 		<!-- Needed for GitHub action, iOS and MacOS is not workig on Linux -->
-		<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
 		<WindowsSdkPackageVersion>10.0.19041.41</WindowsSdkPackageVersion>
 
 		<!-- General -->
@@ -20,8 +20,8 @@
 		<!-- Needed with latest SDK 8 version? -->
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>

diff --git a/src/MauiSettings/MauiSettings.csproj b/src/MauiSettings/MauiSettings.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="..\..\common.props" />
 	<PropertyGroup>
-		<TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
-		<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net8.0-macos</TargetFrameworks>
+		<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
+		<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-macos</TargetFrameworks>
 		<OutputType>Library</OutputType>
 
 		<RootNamespace>AndreasReitberger.Maui</RootNamespace>