Skip to content

Commit

Permalink
Merge pull request #617 from NetSparkleUpdater/feature/package-licens…
Browse files Browse the repository at this point in the history
…e-expression

Switch to license expression in csproj, nuspec files
  • Loading branch information
Deadpikle authored Sep 11, 2024
2 parents efab052 + ba00084 commit caef45a
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<version>3.0.0-preview20240716002</version>
<authors>Deadpikle, Dirk Eisenberg</authors>
<owners>Deadpikle</owners>
<license type="file">LICENSE.md</license>
<readme>README.md</readme>
<licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
<license type="expression">MIT</license>
<icon>software-update-available.png</icon>
<projectUrl>https://github.com/NetSparkleUpdater/NetSparkle</projectUrl>
<iconUrl>https://netsparkleupdater.github.io/NetSparkle/files/artwork/software-update-available.png</iconUrl>
Expand All @@ -26,7 +25,6 @@
</metadata>
<files>
<file src="..\..\README.md" target="" />
<file src="..\..\LICENSE.md" target="" />
<file src="..\..\src\NetSparkle\ArtWork\software-update-available.png" target="" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
<PackAsTool>true</PackAsTool>
<ToolCommandName>netsparkle-generate-appcast</ToolCommandName>
<Nullable>enable</Nullable>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
</PropertyGroup>
<PropertyGroup>
<IncludeSymbols>true</IncludeSymbols>
Expand All @@ -55,7 +53,8 @@
<PackageId>NetSparkleUpdater.Tools.AppCastGenerator</PackageId>
<Version>2.7.0</Version>
<Authors>Deadpikle</Authors>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/NetSparkleUpdater/NetSparkle</PackageProjectUrl>
<PackageIcon>software-update-available.png</PackageIcon>
<RepositoryUrl>https://github.com/NetSparkleUpdater/NetSparkle.git</RepositoryUrl>
Expand All @@ -78,7 +77,6 @@
<ProjectReference Include="..\NetSparkle\NetSparkle.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="\" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\..\UPGRADING.md" Pack="true" PackagePath="\" />
<None Include="..\NetSparkle\ArtWork\software-update-available.png">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Company>Deadpikle</Company>
<PackAsTool>true</PackAsTool>
<ToolCommandName>netsparkle-dsa</ToolCommandName>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>software-update-available.png</PackageIcon>
<PackageProjectUrl>https://github.com/NetSparkleUpdater/NetSparkle</PackageProjectUrl>
Expand Down Expand Up @@ -59,7 +59,6 @@
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="\" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\NetSparkle\ArtWork\software-update-available.png">
<Pack>True</Pack>
Expand Down
3 changes: 1 addition & 2 deletions src/NetSparkle.UI.Avalonia/NetSparkle.UI.Avalonia.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Product>NetSparkleUpdater.UI.Avalonia</Product>
<Description>NetSparkleUpdater/NetSparkle app updater framework with built-in Avalonia UI. NetSparkleUpdater/NetSparkle is a C# .NET software update framework that allows you to easily download installer files and update your C# .NET Framework or .NET Core software. Built-in UIs are available for WinForms, WPF, and Avalonia. You provide, somewhere on the internet, an XML appcast with software version information along with release notes in Markdown or HTML format. The NetSparkle framework then checks for an update in the background, displays the release notes to the user, and lets users download or skip the software update. The framework can also perform silent downloads so that you can present all of the UI yourself or set up your own silent software update system, as allowed by your software architecture. It was inspired by the Sparkle (https://sparkle-project.org/) project for Cocoa developers and the WinSparkle (https://winsparkle.org/) project (a Win32 port).</Description>
<Copyright>Copyright © 2024</Copyright>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageProjectUrl>https://github.com/NetSparkleUpdater/NetSparkle</PackageProjectUrl>
<PackageIcon>software-update-available.png</PackageIcon>
Expand Down Expand Up @@ -65,7 +65,6 @@
</PropertyGroup>

<ItemGroup>
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="\" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\NetSparkle\ArtWork\software-update-available.png">
<Pack>True</Pack>
Expand Down
3 changes: 1 addition & 2 deletions src/NetSparkle.UI.WPF/NetSparkle.UI.WPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageIconUrl />
<Description>NetSparkleUpdater/NetSparkle app updater framework with built-in WPF .NET Core and .NET Framework UI. NetSparkleUpdater/NetSparkle is a C# .NET software update framework that allows you to easily download installer files and update your C# .NET Framework or .NET Core software. Built-in UIs are available for WinForms, WPF, and Avalonia. You provide, somewhere on the internet, an XML appcast with software version information along with release notes in Markdown or HTML format. The NetSparkle framework then checks for an update in the background, displays the release notes to the user, and lets users download or skip the software update. The framework can also perform silent downloads so that you can present all of the UI yourself or set up your own silent software update system, as allowed by your software architecture. It was inspired by the Sparkle (https://sparkle-project.org/) project for Cocoa developers and the WinSparkle (https://winsparkle.org/) project (a Win32 port).</Description>
<PackageReleaseNotes>Please visit https://github.com/NetSparkleUpdater/NetSparkle for updates and to ask for help if you need it!</PackageReleaseNotes>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<RootNamespace>NetSparkleUpdater.UI.WPF</RootNamespace>
Expand Down Expand Up @@ -61,7 +61,6 @@
<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="\" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\NetSparkle\ArtWork\software-update-available.png" Pack="true" PackagePath="\" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/NetSparkle.UI.WinForms/NetSparkle.UI.WinForms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Authors>Deadpikle</Authors>
<Company>Deadpikle</Company>
<Description>NetSparkleUpdater/NetSparkle app updater framework with built-in WinForms UI. NetSparkleUpdater/NetSparkle is a C# .NET software update framework that allows you to easily download installer files and update your C# .NET Framework or .NET Core software. Built-in UIs are available for WinForms, WPF, and Avalonia. You provide, somewhere on the internet, an app cast with software version information along with release notes in Markdown or HTML format. The NetSparkle framework then checks for an update in the background, displays the release notes to the user, and lets users download or skip the software update. The framework can also perform silent downloads so that you can present all of the UI yourself or set up your own silent software update system, as allowed by your software architecture. It was inspired by the Sparkle (https://sparkle-project.org/) project for Cocoa developers and the WinSparkle (https://winsparkle.org/) project (a Win32 port).</Description>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageProjectUrl>https://github.com/NetSparkleUpdater/NetSparkle</PackageProjectUrl>
<PackageIcon>software-update-available.png</PackageIcon>
Expand Down Expand Up @@ -107,7 +107,6 @@
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="\" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\NetSparkle\ArtWork\software-update-available.png" Pack="true" PackagePath="\" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/NetSparkle/NetSparkle.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Product>NetSparkleUpdater.SparkleUpdater</Product>
<PackageIcon>software-update-available.png</PackageIcon>
<PackageIconUrl />
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<RootNamespace>NetSparkleUpdater</RootNamespace>
Expand Down Expand Up @@ -108,7 +108,6 @@
<None Remove="nuget\**" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="\" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\..\UPGRADING.md" Pack="true" PackagePath="\" />
<None Include="ArtWork\software-update-available.png" Pack="true" PackagePath="\"/>
Expand Down

0 comments on commit caef45a

Please sign in to comment.