Merge branch 'main' into nethod-parameter-generator

hedgehogqa · Jun 30, 2023 · 20f15df · 20f15df
2 parents ca4baad + bcc9fe3
commit 20f15df
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,9 +13,6 @@ jobs:
     - uses: actions/checkout@v2
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '6.0.x'
-        dotnet-quality: 'ga'
     - name: Build
       run: dotnet build -c Release "src/Hedgehog.Xunit"
     - name: Test
@@ -26,7 +23,7 @@ jobs:
         path-to-lcov: tests/Hedgehog.Xunit.Tests/TestResults/coverage.info
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Publish NuGet
-      uses: brandedoutcast/publish-nuget@v2.5.5
+      uses: alirezanet/publish-nuget@v3.1.0
       with:
         PROJECT_FILE_PATH: "src/Hedgehog.Xunit/Hedgehog.Xunit.fsproj"
         PACKAGE_NAME: "Hedgehog.Xunit"

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -13,9 +13,6 @@ jobs:
     - uses: actions/checkout@v2
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '6.0.x'
-        dotnet-quality: 'ga'
     - name: Build
       run: dotnet build -c Release "src/Hedgehog.Xunit"
     - name: Test

diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "rollForward": "feature",
+    "version": "6.0.411"
+  }
+}
diff --git a/src/Hedgehog.Xunit/Hedgehog.Xunit.fsproj b/src/Hedgehog.Xunit/Hedgehog.Xunit.fsproj
@@ -39,7 +39,7 @@ Docs at https://github.com/dharmaturtle/fsharp-hedgehog-xunit
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.3.4" />
+    <PackageReference Update="FSharp.Core" Version="7.0.300" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Hedgehog.Xunit.Tests/Hedgehog.Xunit.Tests.fsproj b/tests/Hedgehog.Xunit.Tests/Hedgehog.Xunit.Tests.fsproj
@@ -9,15 +9,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -28,7 +28,7 @@
   </ItemGroup>    
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="6.0.0" />
+    <PackageReference Update="FSharp.Core" Version="7.0.300" />
   </ItemGroup>
 
 </Project>