From 7277ed4172fa137f936227879b5b3337af617919 Mon Sep 17 00:00:00 2001
From: Murdo R Ergeaux <visual.melon@gmail.com>
Date: Mon, 11 Sep 2023 21:14:52 +0100
Subject: [PATCH] Fix package issues

---
 Icons/OxyPlot_128.png                           | Bin 0 -> 3486 bytes
 README.md                                       |   3 +++
 Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj |   8 +++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 Icons/OxyPlot_128.png

diff --git a/Icons/OxyPlot_128.png b/Icons/OxyPlot_128.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0fa4f351f12c93d4a1cd4f3da9a54142491155a
GIT binary patch
literal 3486
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
F{{T`yHm?8x

literal 0
HcmV?d00001

diff --git a/README.md b/README.md
index 4267f8d..627ed08 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,9 @@ To use the library, add the following to your `App.xaml`:
       
         <!-- Add the line below to get OxyPlot UI theme applied. -->
         <StyleInclude Source="resm:OxyPlot.Avalonia.Themes.Default.xaml?assembly=OxyPlot.Avalonia"/>
+      
+        <!-- Add the line below to get OxyPlot UI theme applied in Avalonia 11. -->
+        <StyleInclude Source="avares://AvaloniaEdit/Themes/Simple/AvaloniaEdit.xaml"/>
     </Application.Styles>
 </Application>
 ```
diff --git a/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj b/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj
index 8012c99..8540300 100644
--- a/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj
+++ b/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj
@@ -7,7 +7,8 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>OxyPlot contributors</Copyright>
     <PackageProjectUrl>http://oxyplot.org/</PackageProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/oxyplot/oxyplot/develop/Icons/OxyPlot_128.png</PackageIconUrl>
+    <PackageIcon>OxyPlot_128.png</PackageIcon>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageTags>plotting plot charting chart</PackageTags>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/oxyplot/oxyplot.git</RepositoryUrl>
@@ -15,6 +16,11 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
+  <ItemGroup Condition="$(GeneratePackageOnBuild)">
+    <None Include="$(MSBuildThisFileDirectory)../../Icons/OxyPlot_128.png" Pack="true" PackagePath="\" Visible="false" />
+    <None Include="$(MSBuildThisFileDirectory)../../README.md" Pack="true" PackagePath="\" Visible="false" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>