Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .github/workflows/nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ jobs:
- name: Restore dependencies
run: dotnet restore

- name: Pack NuGet package
- name: Pack NuGet packages
run: dotnet pack --no-restore -c Release

- name: Publish to NuGet.org
run: dotnet nuget push ./src/App/nupkg/hashdir* --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{secrets.NUGET_API_KEY}}

run: |
dotnet nuget push ./src/App/nupkg/hashdir.*.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{secrets.NUGET_API_KEY}}
dotnet nuget push ./src/HashUtil/nupkg/ultimateanu.HashDir.HashUtil.*.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{secrets.NUGET_LIBS_API_KEY}}
4 changes: 4 additions & 0 deletions .yamlfmt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
formatter:
retain_line_breaks_single: true
pad_line_comments: 2
indentless_arrays: true
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ format: ##(@main) Format all F# code
build-release: ##(@main) Do a release build
dotnet fsi src/make_release.fsx build

clean: ##(@main) Clean everything
dotnet clean

podman-build-dev: ## (@dev-ide) Build image
podman build -t dotnet-dev -f Containerfile

Expand Down
10 changes: 5 additions & 5 deletions src/App.Tests/App.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
34 changes: 14 additions & 20 deletions src/App/App.fsproj
Original file line number Diff line number Diff line change
@@ -1,47 +1,41 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<AssemblyName>hashdir</AssemblyName>
<Version>1.4.0</Version>
<Company></Company>
<PublishReadyToRunShowWarnings>true</PublishReadyToRunShowWarnings>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>

<!-- Metadata -->
<Version>1.4.1</Version>
<Authors>Anu Bandi</Authors>
<PackageProjectUrl>https://ultimateanu.github.io/hashdir</PackageProjectUrl>
<RepositoryUrl>https://github.com/ultimateanu/hashdir</RepositoryUrl>
<Description>A command line utility to hash directories and files.</Description>
<PublishReadyToRunShowWarnings>true</PublishReadyToRunShowWarnings>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<Description>A command line utility to hash directories and files</Description>

<!-- Create NuGet tool -->
<Title>hashdir</Title>
<PackAsTool>true</PackAsTool>
<ToolCommandName>hashdir</ToolCommandName>
<PackageOutputPath>./nupkg</PackageOutputPath>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>

<PackAsTool>true</PackAsTool>
<ToolCommandName>hashdir</ToolCommandName>
</PropertyGroup>

<ItemGroup>
<Compile Include="Progress.fs" />
<Compile Include="Program.fs" />

<None Include="..\..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>
<None Include="..\..\LICENSE" Pack="true" PackagePath="\" />

<ItemGroup>
<ProjectReference Include="..\HashUtil\HashUtil.fsproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\LICENSE">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<Target Name="CleanPackages" BeforeTargets="Clean">
<RemoveDir Directories="$(PackageOutputPath)" />
</Target>

</Project>
25 changes: 22 additions & 3 deletions src/Checksums/Checksums.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Library</OutputType>
<PackageId>ultimateanu.HashDir.Checksums</PackageId>

<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>

<!-- Metadata -->
<Version>1.0.0</Version>

<!-- Create NuGet package -->
<Title>HashDir.Checksums</Title>
<PackageOutputPath>./nupkg</PackageOutputPath>
</PropertyGroup>

<ItemGroup>
<Compile Include="ripemd160.cs" />
</ItemGroup>

<Target Name="CleanPackages" BeforeTargets="Clean">
<RemoveDir Directories="$(PackageOutputPath)" />
</Target>

</Project>
10 changes: 5 additions & 5 deletions src/HashUtil.Tests/HashUtil.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
28 changes: 23 additions & 5 deletions src/HashUtil/HashUtil.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<OutputType>Library</OutputType>
<PackageId>ultimateanu.HashDir.HashUtil</PackageId>



<!-- Metadata -->
<Version>1.4.1</Version>
<Authors>Anu Bandi</Authors>
<PackageProjectUrl>https://ultimateanu.github.io/hashdir</PackageProjectUrl>
<RepositoryUrl>https://github.com/ultimateanu/hashdir</RepositoryUrl>
<Description>Library for hashing directories and files</Description>

<!-- Create NuGet package -->
<Title>HashDir.HashUtil</Title>
<PackageOutputPath>./nupkg</PackageOutputPath>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)'=='Release'">
Expand All @@ -18,15 +34,17 @@
<Compile Include="Library.fs" />
<Compile Include="Hashing.fs" />
<Compile Include="Verification.fs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Checksums\Checksums.csproj" />
</ItemGroup>
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\..\LICENSE" Pack="true" PackagePath="\" />

<ItemGroup>
<PackageReference Include="ultimateanu.HashDir.Checksums" Version="1.0.0" />
<PackageReference Include="Blake3" Version="2.0.0" />
<PackageReference Include="Glob" Version="1.2.0-alpha0037" />
</ItemGroup>

<Target Name="CleanPackages" BeforeTargets="Clean">
<RemoveDir Directories="$(PackageOutputPath)" />
</Target>

</Project>
2 changes: 1 addition & 1 deletion src/make_release.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ open System.Security.Cryptography
open HashUtil.Util

// Configuration ----------------------------------------------------
let versionStr = "1.4.0"
let versionStr = "1.4.1"
// ------------------------------------------------------------------

let releaseDir = "release"
Expand Down
Loading