Merge pull request #1341 from beto-rodriguez/fixes-1329

Fixes 1329
beto-rodriguez · Nov 5, 2023 · f90a85e · f90a85e
2 parents 586a245 + 40885a9
commit f90a85e
Show file tree

Hide file tree

Showing 12 changed files with 370 additions and 207 deletions.
diff --git a/build/pack.ps1 b/build/pack.ps1
@@ -9,15 +9,15 @@ param([string]$configuration = "Debug", [string]$nupkgOutputPath = "./nupkg")
     [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharp.Xamarin.Forms/LiveChartsCore.SkiaSharpView.Xamarin.Forms.csproj")
     [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj")
     [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsCore.SkiaSharpView.Eto.csproj")
-    [Project]::new("./src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj", $true)
     [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj", $true)
     [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/LiveChartsCore.SkiaSharpView.Uno.csproj", $true)
-    [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj", $true)
+    [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj", $true),
     [Project]::new(
-        "./src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.csproj", 
-        $true,
-        "nuget",
-        "./src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.nuspec"
+        "./src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj", $true,
+        "nuget", "./src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.nuspec")
+    [Project]::new(
+        "./src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.csproj", $true,
+        "nuget", "./src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.nuspec"
     )
 )
 

diff --git a/samples/WinUISample/WinUISample/WinUISample.csproj b/samples/WinUISample/WinUISample/WinUISample.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 

diff --git a/src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj b/src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj
@@ -1,8 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks>
+      net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst;
+      net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst
+    </TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">
+      $(TargetFrameworks);net6.0-windows10.0.19041;net7.0-windows10.0.19041
+    </TargetFrameworks>
     <Nullable>enable</Nullable>
 
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
@@ -22,20 +27,16 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <RepositoryUrl>https://github.com/beto-rodriguez/LiveCharts2</RepositoryUrl>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows10.0.19041.0'">
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
-    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22621.28" />
-    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22621.28" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\LiveChartsCore\LiveChartsCore.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="images\icon.png" Pack="true" PackagePath="\" />
+  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.196" />
   </ItemGroup>
 
 </Project>
diff --git a/src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.nuspec b/src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.nuspec
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <id>LiveChartsCore.Behaviours</id>
+    <version>2.0.0-rc1.2</version>
+    <title>LiveChartsCore.Behaviours</title>
+    <authors>BetoRodriguez</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/beto-rodriguez/LiveCharts2</projectUrl>
+    <description>
+      Simple, flexible, interactive and powerful data visualization, this package adds native
+      intereaction with touchscreens, touchpads and mouse.
+    </description>
+    <releaseNotes>https://github.com/beto-rodriguez/LiveCharts2/releases</releaseNotes>
+    <copyright>BetoRodriguez</copyright>
+    <tags>livechart chart charting plot plotting data</tags>
+    <repository type="git" url="https://github.com/beto-rodriguez/LiveCharts2.git"></repository>
+
+    <dependencies>
+      <group targetFramework="net6.0">
+        <dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
+      </group>
+      <group targetFramework="net7.0">
+        <dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
+      </group>
+
+      <group targetFramework="net6.0-android31.0">
+        <dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
+      </group>
+      <group targetFramework="net7.0-android31.0">
+        <dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
+      </group>
+
+      <group targetFramework="net6.0-ios16.1">
+        <dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
+      </group>
+      <group targetFramework="net7.0-ios16.1">
+        <dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
+      </group>
+
+      <group targetFramework="net6.0-maccatalyst16.1">
+        <dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
+      </group>
+      <group targetFramework="net7.0-maccatalyst16.1">
+        <dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
+      </group>
+
+      <group targetFramework="net6.0-windows10.0.19041">
+        <dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
+      </group>
+      <group targetFramework="net7.0-windows10.0.19041">
+        <dependency id="LiveChartsCore" version="2.0.0-rc1.2" />
+      </group>
+    </dependencies>
+  </metadata>
+
+  <files>
+
+    <file src="bin\Release\net6.0\LiveChartsCore.Behaviours.dll" target="lib\net6.0"/>
+    <file src="bin\Release\net6.0\LiveChartsCore.Behaviours.xml" target="lib\net6.0"/>
+    <file src="bin\Release\net7.0\LiveChartsCore.Behaviours.dll" target="lib\net7.0"/>
+    <file src="bin\Release\net7.0\LiveChartsCore.Behaviours.xml" target="lib\net7.0"/>
+
+    <file src="bin\Release\net6.0-android\LiveChartsCore.Behaviours.dll" target="lib\net6.0-android31.0"/>
+    <file src="bin\Release\net6.0-android\LiveChartsCore.Behaviours.xml" target="lib\net6.0-android31.0"/>
+    <file src="bin\Release\net7.0-android\LiveChartsCore.Behaviours.dll" target="lib\net7.0-android31.0"/>
+    <file src="bin\Release\net7.0-android\LiveChartsCore.Behaviours.xml" target="lib\net7.0-android31.0"/>
+
+    <file src="bin\Release\net6.0-ios\LiveChartsCore.Behaviours.dll" target="lib\net6.0-ios16.1"/>
+    <file src="bin\Release\net6.0-ios\LiveChartsCore.Behaviours.xml" target="lib\net6.0-ios16.1"/>
+    <file src="bin\Release\net7.0-ios\LiveChartsCore.Behaviours.dll" target="lib\net7.0-ios16.1"/>
+    <file src="bin\Release\net7.0-ios\LiveChartsCore.Behaviours.xml" target="lib\net7.0-ios16.1"/>
+
+    <file src="bin\Release\net6.0-maccatalyst\LiveChartsCore.Behaviours.dll" target="lib\net6.0-maccatalyst16.1"/>
+    <file src="bin\Release\net6.0-maccatalyst\LiveChartsCore.Behaviours.xml" target="lib\net6.0-maccatalyst16.1"/>
+    <file src="bin\Release\net7.0-maccatalyst\LiveChartsCore.Behaviours.dll" target="lib\net7.0-maccatalyst16.1"/>
+    <file src="bin\Release\net7.0-maccatalyst\LiveChartsCore.Behaviours.xml" target="lib\net7.0-maccatalyst16.1"/>
+
+    <file
+      src="bin\Release\net6.0-windows10.0.19041\LiveChartsCore.Behaviours.dll"
+      target="lib\net6.0-windows10.0.19041"/>
+    <file
+      src="bin\Release\net6.0-windows10.0.19041\LiveChartsCore.Behaviours.pdb"
+      target="lib\net6.0-windows10.0.19041"/>
+    <file
+      src="bin\Release\net6.0-windows10.0.19041\LiveChartsCore.Behaviours.xml"
+      target="lib\net6.0-windows10.0.19041"/>
+    <file
+      src="bin\Release\net6.0-windows10.0.19041\LiveChartsCore.Behaviours.pri"
+      target="lib\net6.0-windows10.0.19041"/>
+
+    <file
+     src="bin\Release\net7.0-windows10.0.19041\LiveChartsCore.Behaviours.dll"
+     target="lib\net7.0-windows10.0.19041"/>
+    <file
+      src="bin\Release\net7.0-windows10.0.19041\LiveChartsCore.Behaviours.pdb"
+      target="lib\net7.0-windows10.0.19041"/>
+    <file
+      src="bin\Release\net7.0-windows10.0.19041\LiveChartsCore.Behaviours.xml"
+      target="lib\net7.0-windows10.0.19041"/>
+    <file
+      src="bin\Release\net7.0-windows10.0.19041\LiveChartsCore.Behaviours.pri"
+      target="lib\net7.0-windows10.0.19041"/>
+
+  </files>
+</package>
diff --git a/src/LiveChartsCore.Behaviours/images/icon.png b/src/LiveChartsCore.Behaviours/images/icon.png
diff --git a/...harp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj b/...harp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj
@@ -1,6 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks
+      Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">
+      $(TargetFrameworks);net7.0-windows10.0.19041
+    </TargetFrameworks>
     <TargetFrameworks>$(TargetFrameworks);net7.0;net7.0-ios;net7.0-maccatalyst;net7.0-android</TargetFrameworks>
     <!-- Ensures the .xr.xml files are generated in a proper layout folder -->
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
@@ -22,29 +25,25 @@
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Condition="!$(TargetFramework.Contains('-windows'))" Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
-    <PackageReference Condition="$(TargetFramework.Contains('-windows'))" Include="SkiaSharp.Views.WinUI" Version="2.88.6" />
     <PackageReference Include="Uno.WinUI" Version="5.0.19" />
+    <ProjectReference Include="..\LiveChartsCore.SkiaSharp\LiveChartsCore.SkiaSharpView.csproj" />
+    <ProjectReference Include="..\..\LiveChartsCore.Behaviours\LiveChartsCore.Behaviours.csproj" />
+
+    <!-- if uno then add reference to uno dependencies -->
+    <PackageReference
+      Condition="!$(TargetFramework.Contains('-windows'))"
+      Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
+
+    <!-- in windows then use the winui package -->
+    <PackageReference
+      Condition="$(TargetFramework.Contains('-windows'))"
+      Include="SkiaSharp.Views.WinUI" Version="2.88.6" />
   </ItemGroup>
   <Choose>
     <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
       <ItemGroup>
-        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
-        <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
-      </ItemGroup>
-      <ItemGroup>
-        <!--
-				If you encounter this error message:
-
-					error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll.
-					Please update to a newer .NET SDK in order to reference this assembly.
-
-				This means that the two packages below must be aligned with the "build" version number of
-				the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
-				must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
-				-->
-        <!-- <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22621.28" />
-				<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22621.28" /> -->
+        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0" />
+        <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.196" />
       </ItemGroup>
     </When>
     <Otherwise>
@@ -61,10 +60,6 @@
   <ItemGroup>
     <UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\LiveChartsCore.Behaviours\LiveChartsCore.Behaviours.csproj" />
-    <ProjectReference Include="..\LiveChartsCore.SkiaSharp\LiveChartsCore.SkiaSharpView.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="images\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>