Package cleanup

- Migrate to new license and icon tags.
machunmei · Mar 24, 2020 · 9e1d044 · 9e1d044
1 parent ae5f68f
commit 9e1d044
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 59 deletions.
diff --git a/Sustainsys.Saml2.AspNetCore2/Sustainsys.Saml2.AspNetCore2.csproj b/Sustainsys.Saml2.AspNetCore2/Sustainsys.Saml2.AspNetCore2.csproj
@@ -4,9 +4,9 @@
     <TargetFrameworks>netstandard2.0;net47;net461</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <PackageReleaseNotes>$releaseNotes$</PackageReleaseNotes>
-    <PackageLicenseUrl>https://github.com/Sustainsys/Saml2/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/Sustainsys/Saml2</PackageProjectUrl>
-    <PackageIconUrl>https://raw.github.com/Sustainsys/Saml2/master/nuget/Sustainsys.png</PackageIconUrl>
+    <PackageIcon>sustainsys.png</PackageIcon>
     <Copyright>Copyright © Sustainsys and contributors 2017-2018</Copyright>
     <PackageTags>SAML2 authentication AspNet SAML SSO</PackageTags>
     <PackageDescription>ASP.NET Core authentication handler for the SAML2 protocol, compatible with Asp.Net Core 2.X</PackageDescription>
@@ -30,9 +30,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Sustainsys.Saml2\Sustainsys.Saml2.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <None Include="..\nuget\sustainsys.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
 </Project>
diff --git a/Sustainsys.Saml2.AspNetCore2/app.config b/Sustainsys.Saml2.AspNetCore2/app.config
diff --git a/Sustainsys.Saml2.AspNetCore2/packages.config b/Sustainsys.Saml2.AspNetCore2/packages.config
diff --git a/Sustainsys.Saml2/Sustainsys.Saml2.csproj b/Sustainsys.Saml2/Sustainsys.Saml2.csproj
@@ -3,9 +3,9 @@
     <TargetFrameworks>netstandard2.0;net47;net461</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <PackageReleaseNotes>$releaseNotes$</PackageReleaseNotes>
-    <PackageLicenseUrl>https://github.com/Sustainsys/Saml2/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/Sustainsys/Saml2</PackageProjectUrl>
-    <PackageIconUrl>https://raw.github.com/Sustainsys/Saml2/master/nuget/Sustainsys.png</PackageIconUrl>
+    <PackageIcon>sustainsys.png</PackageIcon>
     <PackageTags>SAML2 authentication AspNet SAML SSO</PackageTags>
     <PackageDescription>SAML2 protocol support. Do not use directly, use the high level package for your platform.</PackageDescription>
     <TargetFrameworkProfile />
@@ -27,6 +27,7 @@
 
   <ItemGroup>
     <Compile Include="..\VersionInfo.cs" Link="VersionInfo.cs" />
+    <None Include="..\nuget\sustainsys.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
@@ -49,5 +50,5 @@
     <PackageReference Include="System.Security.Cryptography.Xml" Version="4.5.0" />
   </ItemGroup>
 
-</Project>
+  </Project>
 
diff --git a/nuget/Sustainsys.Saml2.HttpModule.nuspec b/nuget/Sustainsys.Saml2.HttpModule.nuspec
@@ -6,9 +6,9 @@
     <title>$title$</title>
     <authors>$author$</authors>
     <owners>$author$</owners>
-    <licenseUrl>https://github.com/Sustainsys/Saml2/blob/master/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
+    <icon>sustainsys.png</icon>
     <projectUrl>https://github.com/Sustainsys/Saml2</projectUrl>
-    <iconUrl>https://raw.github.com/Sustainsys/Saml2/master/nuget/Sustainsys.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>A SAML2 Service Provider for ASP.NET. The package adds an Http module for SAML2 Authentication.</summary>
     <description>
@@ -23,4 +23,7 @@
       </group>
     </dependencies>
   </metadata>
+  <files>
+    <file src="..\nuget\sustainsys.png" target="\" />
+  </files>
 </package>
diff --git a/nuget/Sustainsys.Saml2.Mvc.nuspec b/nuget/Sustainsys.Saml2.Mvc.nuspec
@@ -6,9 +6,9 @@
     <title>$title$</title>
     <authors>$author$</authors>
     <owners>$author$</owners>
-    <licenseUrl>https://github.com/Sustainsys/Saml2/blob/master/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
+    <icon>sustainsys.png</icon>
     <projectUrl>https://github.com/Sustainsys/Saml2</projectUrl>
-    <iconUrl>https://raw.github.com/Sustainsys/Saml2/master/nuget/Sustainsys.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>A SAML2 Service Provider for ASP.NET MVC. The package adds an MVC controller that handles SAML SignIn and SignOut.</summary>
     <description>
@@ -24,4 +24,7 @@
       </group>
     </dependencies>
   </metadata>
+  <files>
+    <file src="..\nuget\sustainsys.png" target="\" />
+  </files>
 </package>
diff --git a/nuget/Sustainsys.Saml2.Owin.nuspec b/nuget/Sustainsys.Saml2.Owin.nuspec
@@ -6,7 +6,8 @@
     <title>$title$</title>
     <authors>$author$</authors>
     <owners>$author$</owners>
-    <licenseUrl>https://github.com/Sustainsys/Saml2/blob/master/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
+    <icon>sustainsys.png</icon>
     <projectUrl>https://github.com/Sustainsys/Saml2</projectUrl>
     <iconUrl>https://raw.github.com/Sustainsys/Saml2/master/nuget/Sustainsys.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -22,4 +23,7 @@
       </group>
     </dependencies>
   </metadata>
+  <files>
+    <file src="..\nuget\sustainsys.png" target="\" />
+  </files>
 </package>