Merge remote-tracking branch 'upstream/main'

microcharts-dotnet · Sep 21, 2023 · eaebf16 · eaebf16
2 parents 85d8da5 + bb3fb3a
commit eaebf16
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 38 deletions.
diff --git a/.github/workflows/CI-MacOS.yml b/.github/workflows/CI-MacOS.yml
@@ -25,7 +25,7 @@ jobs:
           7.0.x
 
     - name: "Restore NuGet packages (Mac)"
-      run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts-mac.slnf /v:diag /bl:mac-build.binlog
+      run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts-mac.slnf /bl:mac-restore-build.binlog
 
     - name: "Publish bin logs as artifacts"
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/CI-Windows.yml b/.github/workflows/CI-Windows.yml
@@ -27,10 +27,13 @@ jobs:
           6.0.x
           7.0.x
 
+    - name: "Install .NET MAUI workload"
+      run: dotnet workload install maui
+
     - name: "Restore NuGet packages (Windows)"
-      run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts.sln /v:diag /bl:win-build.binlog
+      run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts.sln /bl:win-restore-build.binlog
 
-    - name: "Publish bin logs as artifacts"
+    - name: "Publish restore bin logs as artifacts"
       uses: actions/upload-artifact@v3
       with:
         name: msbuild-binlogs

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -30,12 +30,20 @@ jobs:
             6.0.x
             7.0.x
 
+      - name: "Install .NET cross-plat and MAUI workloads"
+        run: |
+          dotnet workload install android
+          dotnet workload install ios
+          dotnet workload install maccatalyst
+          dotnet workload install maui
+          dotnet workload list
+
       - name: "Restore NuGet packages (Windows)"
-        run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts.sln /v:diag /bl:win-build.binlog
+        run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts.sln /bl:win-restore-build.binlog
         if: matrix.os == 'windows-latest'
 
       - name: "Restore NuGet packages (Mac)"
-        run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts-mac.slnf /v:diag /bl:mac-build.binlog
+        run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts-mac.slnf /bl:mac-restore-build.binlog
         if: matrix.os == 'macos-latest'
 
       - name: "Publish bin logs as artifacts"

diff --git a/Sources/Directory.Build.props b/Sources/Directory.Build.props
@@ -6,8 +6,8 @@
 
     <PropertyGroup>
         <!-- Change these two values to control the version -->
-        <VersionMain>1.0.0</VersionMain>
-        <VersionPrelease>-preview2</VersionPrelease>
+        <VersionMain>1.0.1</VersionMain>
+        <VersionPrelease></VersionPrelease>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/Sources/Microcharts.Maui/Microcharts.Maui.csproj b/Sources/Microcharts.Maui/Microcharts.Maui.csproj
@@ -2,10 +2,10 @@
 
     <PropertyGroup>
         <!-- iOS, Android, MacCatalyst -->
-        <TargetFrameworks>net6.0-ios;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
-        <TargetFrameworks Condition="$(IsWindows)">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
+        <TargetFrameworks>net7.0-ios;net7.0-android;net7.0-maccatalyst</TargetFrameworks>
+        <TargetFrameworks Condition="$(IsWindows)">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
         <TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
-        <PackagingPlatform Condition="$(TargetFramework.Contains('-windows'))">net6.0-windows</PackagingPlatform>
+        <PackagingPlatform Condition="$(TargetFramework.Contains('-windows'))">net7.0-windows</PackagingPlatform>
         <UseMaui>true</UseMaui>
 
         <Description>Simple, cross-platform chart library for .NET MAUI.</Description>

diff --git a/Sources/Microcharts.Metapackage/Microcharts.Metapackage.nuspec b/Sources/Microcharts.Metapackage/Microcharts.Metapackage.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Microcharts</id>
-    <version>1.0.0-preview2</version>
+    <version>1.0.1</version>
     <title>Microcharts</title>
     <authors>Microcharts Team</authors>
     <owners>Microcharts Team</owners>
@@ -14,27 +14,27 @@
     <tags>xamarin ios android chart skia</tags>
     <dependencies>
         <group targetFramework="netstandard2.0">
-            <dependency id="Microcharts" version="1.0.0-preview2" />
+            <dependency id="Microcharts" version="1.0.1" />
             <dependency id="SkiaSharp" version="2.80.2" />
             <dependency id="System.ValueTuple" version="4.5.0" />
         </group>
         <group targetFramework="monoandroid1.0">
-            <dependency id="Microcharts.Droid" version="1.0.0-preview2" />
+            <dependency id="Microcharts.Droid" version="1.0.1" />
             <dependency id="SkiaSharp" version="2.80.2" />
             <dependency id="SkiaSharp.Views"  version="2.80.2" />
         </group>
         <group targetFramework="xamarinios1.0">
-            <dependency id="Microcharts.iOS" version="1.0.0-preview2" />
+            <dependency id="Microcharts.iOS" version="1.0.1" />
             <dependency id="SkiaSharp" version="2.80.2" />
             <dependency id="SkiaSharp.Views"  version="2.80.2" />
         </group>
         <group targetFramework="uap10.0">
-            <dependency id="Microcharts.Uwp" version="1.0.0-preview2" />
+            <dependency id="Microcharts.Uwp" version="1.0.1" />
             <dependency id="SkiaSharp" version="2.80.2" />
             <dependency id="SkiaSharp.Views"  version="2.80.2" />
         </group>
         <group targetFramework="xamarinmac2.0">
-            <dependency id="Microcharts.macOS" version="1.0.0-preview2" />
+            <dependency id="Microcharts.macOS" version="1.0.1" />
             <dependency id="SkiaSharp" version="2.80.2" />
             <dependency id="SkiaSharp.Views"  version="2.80.2" />
         </group>

diff --git a/Sources/Microcharts.Samples.Maui/Microcharts.Samples.Maui.csproj b/Sources/Microcharts.Samples.Maui/Microcharts.Samples.Maui.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+        <TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.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);net7.0-tizen</TargetFrameworks> -->
         <OutputType>Exe</OutputType>
         <RootNamespace>Microcharts.Samples.Maui</RootNamespace>
         <UseMaui>true</UseMaui>

diff --git a/...rocharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Microcharts.Samples.Uno.Mobile.csproj b/...rocharts.Samples.Uno/Microcharts.Samples.Uno.Mobile/Microcharts.Samples.Uno.Mobile.csproj
@@ -1,25 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-		<TargetFrameworks>net6.0-android31</TargetFrameworks>
-		<TargetFrameworks>$(TargetFrameworks);net6.0-ios</TargetFrameworks>
-
-
-		<!-- Disabled because of https://github.com/xamarin/xamarin-macios/issues/16401--><!--
-		
-		--><SingleProject>true</SingleProject><OutputType>Exe</OutputType><!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 --><!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> --><!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) --><!-- Disabled because of https://github.com/dotnet/runtime/issues/68808 --><!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net6.0-maccatalyst' and '$(TargetFramework)' != 'net6.0-macos'">True</UseInterpreter>--><IsUnoHead>true</IsUnoHead><SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion><SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion><SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion><SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net6.0-macos'">10.14</SupportedOSPlatformVersion></PropertyGroup>
+      <TargetFrameworks>net7.0-android</TargetFrameworks>
+      <TargetFrameworks>$(TargetFrameworks);net7.0-ios</TargetFrameworks>
+      <!-- Disabled because of https://github.com/xamarin/xamarin-macios/issues/16401-->
+      <SingleProject>true</SingleProject>
+      <OutputType>Exe</OutputType>
+      <!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
+      <!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
+      <!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->
+      <!-- Disabled because of https://github.com/dotnet/runtime/issues/68808 -->
+      <!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net7.0-maccatalyst' and '$(TargetFramework)' != 'net7.0-macos'">True</UseInterpreter>-->
+      <IsUnoHead>true</IsUnoHead>
+      <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">14.2</SupportedOSPlatformVersion>
+      <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
+      <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">21.0</SupportedOSPlatformVersion>
+      <SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(RuntimeIdentifier)'==''">
     <!-- Default values for command line builds -->
-    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-ios'">iossimulator-x64</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-macos'">osx-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-ios'">iossimulator-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-ios|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
     <MtouchLink>None</MtouchLink>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-ios|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-ios|AnyCPU'">
     <MtouchLink>None</MtouchLink>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
@@ -34,7 +43,7 @@
     <ProjectReference Include="..\..\Microcharts.Uno.WinUI\Microcharts.Uno.WinUI.csproj" />
   </ItemGroup>
   <Choose>
-    <When Condition="'$(TargetFramework)'=='net6.0-android'">
+    <When Condition="'$(TargetFramework)'=='net7.0-android'">
       <ItemGroup>
         <PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
         <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -43,8 +52,8 @@
         <AndroidEnvironment Include="Android/environment.conf" />
       </ItemGroup>
     </When>
-    <When Condition="'$(TargetFramework)'=='net6.0-ios'">
-      <PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
+    <When Condition="'$(TargetFramework)'=='net7.0-ios'">
+      <PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
         <MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
         <!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
         <MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
@@ -55,7 +64,7 @@
         <PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
       </ItemGroup>
     </When>
-    <When Condition="'$(TargetFramework)'=='net6.0-maccatalyst'">
+    <When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
       <PropertyGroup>
         <!-- Configure the GC -->
         <MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
@@ -70,7 +79,7 @@
         <PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
       </ItemGroup>
     </When>
-    <When Condition="'$(TargetFramework)'=='net6.0-macos'">
+    <When Condition="'$(TargetFramework)'=='net7.0-macos'">
       <PropertyGroup>
       </PropertyGroup>
     </When>

diff --git a/buildpackages.cmd b/buildpackages.cmd
@@ -1,5 +1,5 @@
 @echo off
-msbuild /t:restore /p:Configuration=Release Sources\Microcharts.sln
+dotnet msbuild /t:restore /p:Configuration=Release Sources\Microcharts.sln
 msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts\Microcharts.csproj
 msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.Droid\Microcharts.Droid.csproj
 msbuild /t:build,pack /p:Configuration=Release Sources\Microcharts.Forms\Microcharts.Forms.csproj

diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>