Skip to content

Commit

Permalink
Merge branch 'hotfix/Package_License_Fix'
Browse files Browse the repository at this point in the history
  • Loading branch information
jstemerdink committed Mar 27, 2023
2 parents 43977f9 + f60df89 commit 1e22bf7
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<PackageReleaseNotes>Update for Episerver CMS 12</PackageReleaseNotes>
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<Authors>Jeroen Stemerdink</Authors>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<IsPackable>true</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand All @@ -44,7 +43,7 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup>
<None Include="..\LICENSE">
<None Include="..\license.txt">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<PackageReleaseNotes>Update for Episerver CMS 12</PackageReleaseNotes>
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<Authors>Jeroen Stemerdink</Authors>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<IsPackable>true</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand All @@ -51,7 +50,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<None Include="..\LICENSE">
<None Include="..\license.txt">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
Expand Down
3 changes: 1 addition & 2 deletions EPi.Libraries.Favicons/EPi.Libraries.Favicons.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<None Remove="README.md" />
</ItemGroup>
<ItemGroup>
<None Include="..\LICENSE">
<None Include="..\license.txt">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
Expand Down Expand Up @@ -72,7 +72,6 @@
<IsPublishable>False</IsPublishable>
<Authors>Jeroen Stemerdink</Authors>
<Company>Jeroen Stemerdink</Company>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<IsPackable>true</IsPackable>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 1.0.{build}
image: Visual Studio 2022
configuration: Release
environment:
github_token: 'secure: zuJGSRrCtrCyD+zy7ZNSoSW7XRq8fYp8ouAyCNHCL5I78Rg+rRU9OsOynyHCJqaS'
github_token: 'secure: fHV/gr0ZsTCsP6jPh2iNcWWybr2a6cRqdhTS5/hpKqFoWb2ixXAO+Ob9Y78B6kiI'
myget_token: 'secure: 9Z+KYPk2hI7hg9kYLv/N13fvoqcYCP96isNUkRrKu0v87cw85H62oe/DCwpqvBXF'

init:
Expand Down Expand Up @@ -53,7 +53,7 @@ deploy:
#appveyor_repo_tag: true # deploy on tag push only
- provider: GitHub
auth_token:
secure: TaDEavUfTj6EgwcO7y5njQVS5Z9bBU/fVFuSApo5XEO6FSBT5UzJQmyJjbhIFDZb
secure: fHV/gr0ZsTCsP6jPh2iNcWWybr2a6cRqdhTS5/hpKqFoWb2ixXAO+Ob9Y78B6kiI
artifact: /.*\.zip/
on:
branch: master # release from master branch only
Expand Down
File renamed without changes.

0 comments on commit 1e22bf7

Please sign in to comment.