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.

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

up deps #435

Merged
merged 9 commits into from
Jul 13, 2023
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
8 changes: 3 additions & 5 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ jobs:
- name: Ensure no Windows line endings
run: ./validate.sh
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.201
uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore
- name: Build
Expand All @@ -39,9 +37,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup NodeJs
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '14'
node-version-file: ".nvmrc"
- name: Install npm packages
run: npm install
working-directory: ./tests/Hedgehog.Tests
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ jobs:
- name: Ensure no Windows line endings
run: ./validate.sh
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.201
uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore
- name: Build
Expand All @@ -35,9 +33,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup NodeJs
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '14'
node-version-file: ".nvmrc"
- name: Install npm packages
run: npm install
working-directory: ./tests/Hedgehog.Tests
Expand Down
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
engine-strict=true
use-node-version=18.16.1
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18.16.1
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"rollForward": "feature",
"version": "6.0.411"
}
}
5 changes: 4 additions & 1 deletion src/Hedgehog/Hedgehog.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ Failures are automatically simplified, giving developers coherent, intelligible
To get started quickly, see the examples in
https://github.com/hedgehogqa/fsharp-hedgehog/blob/master/doc/index.md
</PackageDescription>
<PackageLicenseUrl>https://raw.githubusercontent.com/hedgehogqa/fsharp-hedgehog/master/LICENSE</PackageLicenseUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://hedgehogqa.github.io/fsharp-hedgehog/</PackageProjectUrl>
<PackageIcon>hedgehog-logo.png</PackageIcon>
<PackageIconUrl>https://github.com/hedgehogqa/fsharp-hedgehog/raw/master/img/hedgehog-logo.png</PackageIconUrl>
<PackageTags>fsharp;f#;c#;csharp;dotnet;testing</PackageTags>
<RepositoryUrl>https://github.com/hedgehogqa/fsharp-hedgehog</RepositoryUrl>
Expand Down Expand Up @@ -65,5 +66,7 @@ https://github.com/hedgehogqa/fsharp-hedgehog/blob/master/doc/index.md
<!-- https://fable.io/docs/your-fable-project/author-a-fable-library.html -->
<ItemGroup>
<Content Include="*.fsproj; **\*.fs" Exclude="**\bin\**\*; **\obj\**\*" PackagePath="fable" />
<None Include="..\..\img\hedgehog-logo.png" Pack="true" PackagePath="\"/>
<None Include="..\..\LICENSE" Pack="true" PackagePath="\"/>
</ItemGroup>
</Project>
8 changes: 6 additions & 2 deletions tests/Hedgehog.Benchmarks/Hedgehog.Benchmarks.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
<PackageReference Include="FsCheck" Version="2.16.3" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.6" />
<PackageReference Include="FsCheck" Version="2.16.6" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Hedgehog\Hedgehog.fsproj" />
<ProjectReference Include="..\Hedgehog.Tests\Hedgehog.Tests.fsproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="7.0.300" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions tests/Hedgehog.DieHarder/Hedgehog.DieHarder.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@
<ProjectReference Include="..\..\src\Hedgehog\Hedgehog.fsproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="7.0.300" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions tests/Hedgehog.Linq.Tests/Hedgehog.Linq.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
10 changes: 5 additions & 5 deletions tests/Hedgehog.Tests/Hedgehog.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<Compile Include="Program.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Expecto" Version="9.*" />
<PackageReference Include="Fable.Core" Version="3.1.5" />
<PackageReference Include="Fable.Mocha" Version="2.9.1" />
<PackageReference Include="Expecto" Version="10.*" />
<PackageReference Include="Fable.Core" Version="4.0.0" />
<PackageReference Include="Fable.Mocha" Version="2.16.0" />
<PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Update="FSharp.Core" Version="6.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Update="FSharp.Core" Version="7.0.300" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion tests/Hedgehog.Tests/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ let main (args: string[]) =
#if FABLE_COMPILER
Fable.Mocha.Mocha.runTests allTests
#else
Expecto.Tests.runTestsInAssembly Expecto.Tests.defaultConfig args
Expecto.Tests.runTestsInAssemblyWithCLIArgs [] args
#endif
Loading
Loading