Skip to content

Update to target net6, net8 and net9 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jon2G wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to target net6, net8 and net9 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
524ed0e
Update to target net6, net8 and net9
Jon2G Jan 25, 2025
5d03e9f
Add missing package for latest xamarin version
Jon2G Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 67 additions & 52 deletions Maui.Skeleton/Maui.Skeleton.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,82 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PropertyGroup>

<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UseMaui>true</UseMaui>
<!--<TargetFramework>net6.0</TargetFramework>-->

<AssemblyName>Maui.Skeleton</AssemblyName>
<RootNamespace>Maui.Skeleton</RootNamespace>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<AssemblyVersion>2.0.0</AssemblyVersion>
<AssemblyFileVersion>2.0.0</AssemblyFileVersion>
<Version>2.0.0</Version>
<PackOnBuild>false</PackOnBuild>
<NeutralLanguage>en</NeutralLanguage>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<LangVersion>latest</LangVersion>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>

</PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UseMaui>true</UseMaui>

<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<AssemblyName>Maui.Skeleton</AssemblyName>
<RootNamespace>Maui.Skeleton</RootNamespace>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<AssemblyVersion>2.0.0</AssemblyVersion>
<AssemblyFileVersion>2.0.0</AssemblyFileVersion>
<Version>2.0.0</Version>
<PackOnBuild>false</PackOnBuild>
<NeutralLanguage>en</NeutralLanguage>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<LangVersion>latest</LangVersion>
<CheckEolWorkloads>False</CheckEolWorkloads>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>pdbonly</DebugType>
<DebugType>pdbonly</DebugType>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
<DebugType />
<DebugType />
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\AnimationTypes.cs">
<Link>Animations\AnimationTypes.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\BaseAnimation.cs">
<Link>Animations\BaseAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\BeatAnimation.cs">
<Link>Animations\BeatAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\FadeAnimation.cs">
<Link>Animations\FadeAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\HorizontalShakeAnimation.cs">
<Link>Animations\HorizontalShakeAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\IAnimation.cs">
<Link>Animations\IAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\VerticalShakeAnimation.cs">
<Link>Animations\VerticalShakeAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Extensions\DefaultAnimationExtension.cs">
<Link>Extensions\DefaultAnimationExtension.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Extensions\ViewExtensions.cs">
<Link>Extensions\ViewExtensions.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Skeleton.cs">
<Link>Skeleton.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.Contains('6.0'))">
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\AnimationTypes.cs">
<Link>Animations\AnimationTypes.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\BaseAnimation.cs">
<Link>Animations\BaseAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\BeatAnimation.cs">
<Link>Animations\BeatAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\FadeAnimation.cs">
<Link>Animations\FadeAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\HorizontalShakeAnimation.cs">
<Link>Animations\HorizontalShakeAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\IAnimation.cs">
<Link>Animations\IAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Animations\VerticalShakeAnimation.cs">
<Link>Animations\VerticalShakeAnimation.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Extensions\DefaultAnimationExtension.cs">
<Link>Extensions\DefaultAnimationExtension.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Extensions\ViewExtensions.cs">
<Link>Extensions\ViewExtensions.cs</Link>
</Compile>
<Compile Include="..\Xamarin.Forms.Skeleton\Skeleton.cs">
<Link>Skeleton.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<PackageReference Include="AsyncAwaitBestPractices" Version="9.0.0" />
</ItemGroup>



</Project>
152 changes: 99 additions & 53 deletions SkeletonExample/SkeletonExample.Android/SkeletonExample.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<CheckEolWorkloads>False</CheckEolWorkloads>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -52,20 +53,23 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.800" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
<PackageReference Include="Xamarin.AndroidX.MediaRouter">
<Version>1.3.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2662" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
<PackageReference Include="Xamarin.FFImageLoading.Forms">
<Version>2.4.11.982</Version>
</PackageReference>
<PackageReference Include="Plugin.MaterialDesignControls">
<Version>1.0.0</Version>
<Version>3.1.8</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -113,88 +117,130 @@
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\xamarin.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\load.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\back_gradient.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\img_1.jpg">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\health_fill.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\health.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_beat.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_fade.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_horizontal_shake.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_more.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_skeleton.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_vertical_shake.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\icon2.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\img_2.jpg">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\img_3.jpg">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\img_4.jpg">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\img_5.jpg">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\img_6.jpg">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\power.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\splash_screen.xml">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\power_2.png">
<SubType></SubType>
<Generator></Generator>
<SubType>
</SubType>
<Generator>
</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions SkeletonExample/SkeletonExample.iOS/SkeletonExample.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<AssemblyName>SkeletonExample.iOS</AssemblyName>
<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<CheckEolWorkloads>False</CheckEolWorkloads>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -120,13 +121,13 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.800" />
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2662" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
<PackageReference Include="Xamarin.FFImageLoading.Forms">
<Version>2.4.11.982</Version>
</PackageReference>
<PackageReference Include="Plugin.MaterialDesignControls">
<Version>1.0.0</Version>
<Version>3.1.8</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Loading