Merge pull request #3 from felipebaltazar/feature/net7

Support for .net7
felipebaltazar · Sep 18, 2023 · cff3e6a · cff3e6a
2 parents be37d06 + ce6ca21
commit cff3e6a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "09:00"
+  open-pull-requests-limit: 10
diff --git a/.github/workflows/PackageCI.yml b/.github/workflows/PackageCI.yml
@@ -12,7 +12,7 @@ jobs:
   build:
 
     name: Build and publish package
-    runs-on: windows-2022
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v2
@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.x.x
+        dotnet-version: 7.x.x
 
     - name: Nerdbank.GitVersioning
       uses: dotnet/[email protected]

diff --git a/.github/workflows/PrCheck.yml b/.github/workflows/PrCheck.yml
@@ -9,11 +9,15 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.x.x
+        dotnet-version: 7.x.x
 
     - uses: actions/setup-java@v2
       with:
@@ -41,6 +45,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
@@ -50,7 +56,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.x.x
+        dotnet-version: 7.x.x
 
     - uses: actions/setup-java@v2
       with:

diff --git a/Maui.NeoControls.Demo/MainPage.xaml b/Maui.NeoControls.Demo/MainPage.xaml
@@ -43,7 +43,7 @@
                 <StackLayout Orientation="Vertical"
                              VerticalOptions="FillAndExpand"
                              HorizontalOptions="FillAndExpand"
-                             Padding="30">
+                             Padding="20">
 
                     <Image VerticalOptions="Start"
                            HorizontalOptions="Start"
@@ -71,7 +71,7 @@
                 <StackLayout Orientation="Vertical"
                          VerticalOptions="FillAndExpand"
                          HorizontalOptions="FillAndExpand"
-                         Padding="30">
+                         Padding="20">
 
                     <Image VerticalOptions="Start"
                            HorizontalOptions="Start"
@@ -98,7 +98,7 @@
                 <StackLayout Orientation="Vertical"
                          VerticalOptions="FillAndExpand"
                          HorizontalOptions="FillAndExpand"
-                         Padding="30">
+                         Padding="20">
 
                     <Image VerticalOptions="Start"
                            HeightRequest="40"
@@ -126,7 +126,7 @@
                              VerticalOptions="FillAndExpand"
                              HorizontalOptions="FillAndExpand"
                              Spacing="0"
-                             Padding="30">
+                             Padding="20">
 
                     <Image 
                         VerticalOptions="Center"

diff --git a/Maui.NeoControls.Demo/Maui.NeoControls.Demo.csproj b/Maui.NeoControls.Demo/Maui.NeoControls.Demo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>Maui.NeoControls.Demo</RootNamespace>
 		<UseMaui>true</UseMaui>

diff --git a/Maui.NeoControls/Maui.NeoControls.csproj b/Maui.NeoControls/Maui.NeoControls.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
+    <TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
     <SingleProject>true</SingleProject>
     <Nullable>enable</Nullable>
     <RootNamespace>Maui.Views.NeoControls</RootNamespace>
@@ -18,8 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp.Views.Maui.Controls.Compatibility" Version="2.88.0" />
+    <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.5" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
   </ItemGroup>
 
   <ItemGroup>