Skip to content

Commit

Permalink
Merge pull request #1 from snovak7/main
Browse files Browse the repository at this point in the history
Improved Project Setup
  • Loading branch information
snovak7 authored Apr 13, 2023
2 parents e1f76d8 + 0eee62a commit f049798
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ jobs:
- name: Pack .NET Solution
run: dotnet pack --no-build --output pack/
- name: Publish .NET Solution to GitHub Packages
continue-on-error: true
run: dotnet nuget push pack/* --api-key ${{ secrets.GITHUB_TOKEN }} --source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
- name: Publish .NET Solution to NuGet.org
continue-on-error: true
run: dotnet nuget push pack/* --api-key ${{ secrets.NUGET_ORG_KEY }} --source nuget


3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -352,3 +352,6 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

# JetBrains
.idea
9 changes: 0 additions & 9 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,4 @@
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/escendit/Escendit.Tools.Branding</RepositoryUrl>
</PropertyGroup>
<PropertyGroup>

</PropertyGroup>
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
9 changes: 9 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ To contribute code, fork the repository and submit a pull request.
Please ensure that your code follows the project's coding standards and is thoroughly tested.

## License
This package is released under the MIT License. See the LICENSE.txt file for details.
This package is released under the MIT License. See the LICENSE.txt file for details.
4 changes: 3 additions & 1 deletion src/Escendit.Tools.Branding/Escendit.Tools.Branding.csproj
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="Escendit.Tools.Branding.props" />
<PropertyGroup>
Expand All @@ -8,7 +9,8 @@
<IncludeBuildOutput>false</IncludeBuildOutput>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);NU5128</NoWarn>
<PackageDescription>Pre-populates NuGet Package with common default values.</PackageDescription>
<Description>Provides default branding properties and assets for organization's NuGet projects.</Description>
<PackageTags>branding;defaults;icons;nuget;development</PackageTags>
</PropertyGroup>
<ItemGroup>
<!-- TFM -->
Expand Down
4 changes: 2 additions & 2 deletions src/Escendit.Tools.Branding/Escendit.Tools.Branding.targets
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project>
<ItemGroup>
<None Pack="true" PackagePath="" Include="$(MSBuildThisFileDirectory)\..\LICENSE.txt" Visible="false">
<None Pack="true" PackagePath="" Include="$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)\..\LICENSE.txt'))" Visible="false">
<Link>LICENSE.txt</Link>
</None>
<None Pack="true" PackagePath="" Include="$(MSBuildThisFileDirectory)\..\packageIcon.png" Visible="false">
<None Pack="true" PackagePath="" Include="$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)\..\packageIcon.png'))" Visible="false">
<Link>packageIcon.png</Link>
</None>
</ItemGroup>
Expand Down

0 comments on commit f049798

Please sign in to comment.