Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Add PackageLicenseExpression for /src #236

Merged
merged 9 commits into from
Nov 23, 2023
Merged

fix: Add PackageLicenseExpression for /src #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
74e4e53
Add PackageLicenseExpression for /src
bartelink Nov 22, 2023
bf6bcd2
Remove License Files
bartelink Nov 23, 2023
f3745e5
Add Authors, Copyright
bartelink Nov 23, 2023
c1fefe8
PackageProjectUrl
bartelink Nov 23, 2023
980cba2
Remove superseded paket.template files
bartelink Nov 23, 2023
0921d4d
Update description
bartelink Nov 23, 2023
a7c5dcc
Fix PackageTags chaining
bartelink Nov 23, 2023
8f09765
Remove redundant flags
bartelink Nov 23, 2023
7c37f50
Comma separate tags
bartelink Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup>
<Description>FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling.</Description>
<PackageLicenseFile>License</PackageLicenseFile>
<Description>FsToolkit.ErrorHandling is an extensive utility library based around the F# Result type, enabling consistent and powerful error handling.</Description>
<Authors>demystifyfp, TheAngryByrd</Authors>
<Copyright>Copyright © 2018-23</Copyright>
<PackageProjectUrl>https://demystifyfp.gitbook.io/fstoolkit-errorhandling</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile> <!--https://docs.microsoft.com/en-gb/nuget/reference/msbuild-targets#packagereadmefile -->
</PropertyGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)../README.md" Pack="true" PackagePath="/"/>
<None Include="$(MSBuildThisFileDirectory)..\License" Pack="true" PackagePath=""/>
</ItemGroup>

<PropertyGroup>

<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
<IsTestProject>false</IsTestProject>
<PackageTags>f#;fsharp;railway oriented programming;ROP;result type;error handling</PackageTags>
<PackageReadmeFile>README.md</PackageReadmeFile> <!--https://docs.microsoft.com/en-gb/nuget/reference/msbuild-targets#packagereadmefile -->
<PackageTags>f#, fsharp, railway oriented programming, ROP, result type, error handling</PackageTags>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices suggests comma separation

<!-- Sourcelink -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These settings can be consolidated via DotNet.ReproducibleBuilds which @baronfel introduced me to, e.g. https://github.com/jet/equinox/blob/master/Directory.Build.props#L19C39-L19C57

But that's a step too far for this PR/batch of changes in this space

<EmbedUntrackedSources>true</EmbedUntrackedSources>
Expand Down
23 changes: 0 additions & 23 deletions src/FsToolkit.ErrorHandling.JobResult/paket.template
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions src/FsToolkit.ErrorHandling.TaskResult/paket.template
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<LangVersion>preview</LangVersion>
<DebugType>portable</DebugType>

<PackageTags>($PackageTags);fable-library;fable-dotnet;fable-javascript;fable-python</PackageTags>
<PackageTags>$(PackageTags), fable-library, fable-dotnet, fable-javascript, fable-python</PackageTags>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was mangled, see https://nuget.info/packages/FsToolkit.ErrorHandling/4.11.0

</PropertyGroup>
<ItemGroup>
<Compile Include="Shims.fs" />
Expand Down