From dae66fe2c0525e050540bf7e696dea11f3a85086 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Wed, 12 May 2021 18:36:32 -0700
Subject: [PATCH] Update package licenses and icons

---
 Ooui.AspNetCore/Ooui.AspNetCore.csproj | 7 +++++--
 Ooui.Forms/Ooui.Forms.csproj           | 7 +++++--
 Ooui.Wasm/Ooui.Wasm.nuspec             | 5 +++--
 Ooui/Ooui.csproj                       | 7 +++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Ooui.AspNetCore/Ooui.AspNetCore.csproj b/Ooui.AspNetCore/Ooui.AspNetCore.csproj
index b6bfb0b..9c8ac1f 100644
--- a/Ooui.AspNetCore/Ooui.AspNetCore.csproj
+++ b/Ooui.AspNetCore/Ooui.AspNetCore.csproj
@@ -5,9 +5,9 @@
     <Authors>praeclarum</Authors>
     <Description>ASP.NET Core MVC extensions to make working with Ooui easy.</Description>
     <PackageTags>Ooui;UI;CrossPlatform;ASP.NET</PackageTags>
-    <PackageIconUrl>https://github.com/praeclarum/Ooui/raw/master/Documentation/Icon.png</PackageIconUrl>
+    <PackageIcon>Icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/praeclarum/Ooui</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/praeclarum/Ooui/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/praeclarum/Ooui.git</RepositoryUrl>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
@@ -19,4 +19,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Ooui\Ooui.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Documentation\Icon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
 </Project>
diff --git a/Ooui.Forms/Ooui.Forms.csproj b/Ooui.Forms/Ooui.Forms.csproj
index 68f3f4f..31f88be 100644
--- a/Ooui.Forms/Ooui.Forms.csproj
+++ b/Ooui.Forms/Ooui.Forms.csproj
@@ -5,9 +5,9 @@
     <Authors>praeclarum</Authors>
     <Description>Xamarin.Forms backend for the web using Ooui technologies.</Description>
     <PackageTags>Ooui;UI;CrossPlatform;Xamarin.Forms</PackageTags>
-    <PackageIconUrl>https://github.com/praeclarum/Ooui/raw/master/Documentation/Icon.png</PackageIconUrl>
+    <PackageIcon>Icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/praeclarum/Ooui</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/praeclarum/Ooui/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/praeclarum/Ooui.git</RepositoryUrl>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -27,4 +27,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Ooui\Ooui.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Documentation\Icon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
 </Project>
diff --git a/Ooui.Wasm/Ooui.Wasm.nuspec b/Ooui.Wasm/Ooui.Wasm.nuspec
index 6ed00fd..c2cbfb2 100644
--- a/Ooui.Wasm/Ooui.Wasm.nuspec
+++ b/Ooui.Wasm/Ooui.Wasm.nuspec
@@ -6,9 +6,9 @@
     <title>Ooui.Wasm</title>
     <authors>praeclarum</authors>
     <owners>praeclarum</owners>
-    <licenseUrl>https://github.com/praeclarum/Ooui/blob/master/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
     <projectUrl>https://github.com/praeclarum/Ooui</projectUrl>
-    <iconUrl>https://github.com/praeclarum/Ooui/raw/master/Documentation/Icon.png</iconUrl>
+    <icon>Icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>WebAssembly support for Ooui apps</description>
     <tags>Ooui UI CrossPlatform WebAssembly Wasm</tags>
@@ -21,5 +21,6 @@
   <files>
     <file src="Ooui.Wasm.targets" target="build/netstandard2.0/Ooui.Wasm.targets" />
     <file src="../Ooui.Wasm.Build.Tasks/bin/Release/netstandard2.0/Ooui.Wasm.Build.Tasks.dll" target="build/netstandard2.0/Ooui.Wasm.Build.Tasks.dll" />
+    <file src="../Documentation/Icon.png" target="/" />
   </files>
 </package>
diff --git a/Ooui/Ooui.csproj b/Ooui/Ooui.csproj
index 36171bb..8b44e27 100644
--- a/Ooui/Ooui.csproj
+++ b/Ooui/Ooui.csproj
@@ -4,9 +4,9 @@
     <Authors>praeclarum</Authors>
     <Description>Small cross-platform UI library for .NET that uses web technologies.</Description>
     <PackageTags>Ooui;UI;CrossPlatform</PackageTags>
-    <PackageIconUrl>https://github.com/praeclarum/Ooui/raw/master/Documentation/Icon.png</PackageIconUrl>
+    <PackageIcon>Icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/praeclarum/Ooui</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/praeclarum/Ooui/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/praeclarum/Ooui.git</RepositoryUrl>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -18,5 +18,8 @@
   <ItemGroup>
     <EmbeddedResource Include="Client.js" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Documentation\Icon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
   
 </Project>