Merge branch 'develop/maintenance' into release/Habu

# Conflicts: # appveyor.yml
SteveGilham · Oct 17, 2022 · a7e5ac3 · a7e5ac3
2 parents 0518177 + 9f3939b
commit a7e5ac3
Show file tree

Hide file tree

Showing 147 changed files with 3,222 additions and 3,028 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.1.9",
+      "version": "5.1.10",
       "commands": [
         "reportgenerator"
       ]

diff --git a/.editorconfig b/.editorconfig
@@ -1,6 +1,7 @@
 [*.fs]
 indent_size=2
 max_line_length=90
+insert_final_newline=false
 fsharp_semicolon_at_end_of_line=false
 fsharp_space_before_parameter=true
 fsharp_space_before_lowercase_invocation=true

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,9 +17,9 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 2
-    - uses: actions/setup-dotnet@v2
+    - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.400'
+        dotnet-version: '6.0.402'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
@@ -45,9 +45,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-dotnet@v2
+    - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.400'
+        dotnet-version: '6.0.402'
     - name: Tools
       run: dotnet tool restore
     - name: Setup

diff --git a/AltCover.Api.Tests/AltCover.Api.Tests.fsproj b/AltCover.Api.Tests/AltCover.Api.Tests.fsproj
@@ -65,7 +65,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="YoloDev.Expecto.TestSdk" Version="1.0.0" Condition="'$(TargetFramework)' != 'net472'" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" Condition="'$(TargetFramework)' == 'net472'">
@@ -82,7 +82,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="6.0.5">
+    <PackageReference Update="FSharp.Core" Version="6.0.6">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
     <PackageReference Update="System.ValueTuple" Version="4.5.0" />