Update to .NET 8 (#169)

ME-MarvinE · Dec 4, 2023 · 86b19d9 · 86b19d9
2 parents 3a6ddec + feae2fb
commit 86b19d9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/XCalendar.Maui/XCalendar.Maui.csproj b/XCalendar.Maui/XCalendar.Maui.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.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);net6.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
@@ -16,7 +16,7 @@
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 		<Authors>MarvinE</Authors>
-		<Version>4.5.2</Version>
+		<Version>4.5.3</Version>
 		<Description>A plugin for .NET MAUI providing a calendar API and calendar controls.</Description>
 		<PackageIcon>XCalendar.Maui Nuget Icon.png</PackageIcon>
 		<RepositoryUrl>https://github.com/ME-MarvinE/XCalendar</RepositoryUrl>
@@ -68,6 +68,12 @@
 	  </MauiXaml>
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <None Update="XCalendar.Maui Nuget Icon.png">
 	    <Pack>True</Pack>

diff --git a/XCalendarFormsSample/XCalendarFormsSample.Android/Resources/Resource.designer.cs b/XCalendarFormsSample/XCalendarFormsSample.Android/Resources/Resource.designer.cs
diff --git a/XCalendarFormsSample/XCalendarFormsSample/ViewModels/ExamplesViewModel.cs b/XCalendarFormsSample/XCalendarFormsSample/ViewModels/ExamplesViewModel.cs
@@ -25,7 +25,7 @@ public class ExamplesViewModel : BaseViewModel
                 {
                     new Tag() { Title = "Event" },
                     new Tag() { Title = "Events" },
-                    new Tag() { Title = "Appointmnts" },
+                    new Tag() { Title = "Appointments" },
                     new Tag() { Title = "Special" },
                     new Tag() { Title = "Indicator" }
                 }
@@ -58,7 +58,7 @@ public class ExamplesViewModel : BaseViewModel
             {
                 Page = new CustomisingADayExamplePage(),
                 Title = "Customising A Day",
-                Description = "How to customise the appearance of a day in {nameof(CalendarView)}.",
+                Description = $"How to customise the appearance of a day in {nameof(CalendarView)}.",
                 Tags = new List<Tag>()
                 {
                     new Tag() { Title = "DayTemplate" },

diff --git a/XCalendarMauiSample/ViewModels/ExamplesViewModel.cs b/XCalendarMauiSample/ViewModels/ExamplesViewModel.cs
@@ -21,7 +21,7 @@ public class ExamplesViewModel : BaseViewModel
                 {
                     new Tag() { Title = "Event" },
                     new Tag() { Title = "Events" },
-                    new Tag() { Title = "Appointmnts" },
+                    new Tag() { Title = "Appointments" },
                     new Tag() { Title = "Special" },
                     new Tag() { Title = "Indicator" }
                 }
@@ -30,19 +30,19 @@ public class ExamplesViewModel : BaseViewModel
             {
                 Page = new CustomDatePickerDialogExamplePage(),
                 Title = "Custom DatePicker Dialog",
-                Description = "A custom DatePicker made using a {nameof(CalendarView)}."
+                Description = $"A custom DatePicker made using a {nameof(CalendarView)}."
             },
             new Example()
             {
                 Page = new SelectionExamplePage(),
                 Title = "Date Selection",
-                Description = "Showcase of {nameof(CalendarView)}'s selection capabilities."
+                Description = $"Showcase of {nameof(CalendarView)}'s selection capabilities."
             },
             new Example()
             {
                 Page = new UsingDayViewExamplePage(),
-                Title = "Using {nameof(DayView)}",
-                Description = "How to use the {nameof(DayView)} control.",
+                Title = $"Using {nameof(DayView)}",
+                Description = $"How to use the {nameof(DayView)} control.",
                 Tags = new List<Tag>()
                 {
                     new Tag() { Title = "DayTemplate" },
@@ -54,7 +54,7 @@ public class ExamplesViewModel : BaseViewModel
             {
                 Page = new CustomisingADayExamplePage(),
                 Title = "Customising A Day",
-                Description = "How to customise the appearance of a day in {nameof(CalendarView)}.",
+                Description = $"How to customise the appearance of a day in {nameof(CalendarView)}.",
                 Tags = new List<Tag>()
                 {
                     new Tag() { Title = "DayTemplate" },

diff --git a/XCalendarMauiSample/XCalendarMauiSample.csproj b/XCalendarMauiSample/XCalendarMauiSample.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.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);net7.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
@@ -66,8 +66,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="CommunityToolkit.Maui" Version="3.1.0" />
+	  <PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
 	  <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
+	  <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
+	  <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
+	  <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>