Merge branch 'master' into release/Habu

SteveGilham · Nov 13, 2021 · 3236ac5 · 3236ac5
2 parents a6b1cbe + b2b3af4
commit 3236ac5
Show file tree

Hide file tree

Showing 189 changed files with 14,218 additions and 2,037 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -27,7 +27,7 @@
       ]
     },
     "dotnet-fsharplint": {
-      "version": "0.20.1",
+      "version": "0.20.2",
       "commands": [
         "dotnet-fsharplint"
       ]

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
         fetch-depth: 2
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.402'
+        dotnet-version: '6.0.100'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
@@ -36,14 +36,18 @@ jobs:
       if: failure()
       with:
           name: reports.windows
-          path: _Reports
+          path: |
+            _Reports
+            _Packaging/*.xml
+            ./**/AltCover*.log
+            ./**/dotnettest.*.txt
   linux:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.402'
+        dotnet-version: '6.0.100'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
@@ -56,5 +60,6 @@ jobs:
           name: reports.linux
           path: |
             _Reports
+            _Packaging/*.xml
             ./**/AltCover*.log
             ./**/dotnettest.*.txt
diff --git a/.gitignore b/.gitignore
@@ -80,3 +80,5 @@ coverage.xml
 **/Backup/
 LastCoverageResults.log
 CoverageReport-*
+Samples/Sample29/Debug/
+Samples/Sample29/SimpleMix/Debug/
diff --git a/AltCover.Api.Tests/AltCover.Api.Tests.fsproj b/AltCover.Api.Tests/AltCover.Api.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AssemblyName>AltCover.Api.Tests</AssemblyName>
     <GenerateProgramFile>false</GenerateProgramFile>
@@ -26,7 +26,16 @@
     <EmbeddedResource Include="..\AltCover.Tests\HandRolledMonoCoverage.html" Link="HandRolledMonoCoverage.html" />
     <EmbeddedResource Include="..\AltCover.Tests\HandRolledMonoCoverage.xml" Link="HandRolledMonoCoverage.xml" />
     <EmbeddedResource Include="..\AltCover.Tests\HandRolledMonoCoverage.lcov" Link="HandRolledMonoCoverage.lcov" />
+    <EmbeddedResource Include="..\AltCover.Tests\HandRolledToNCover.json" Link="HandRolledToNCover.json" />
     <EmbeddedResource Include="..\AltCover.Tests\HandRolledToNCover.xml" Link="HandRolledToNCover.xml" />
+    <EmbeddedResource Include="..\AltCover.Tests\JsonWithPartials.json" Link="JsonWithPartials.json" />
+    <EmbeddedResource Include="..\AltCover.Tests\JsonFromNCoverWithPartials.json" Link="JsonFromNCoverWithPartials.json" />
+    <EmbeddedResource Include="..\AltCover.Tests\JsonWithPartialsToXml.xml" Link="JsonWithPartialsToXml.xml" />
+    <EmbeddedResource Include="..\AltCover.Tests\NCoverWithPartials.cob.xml" Link="NCoverWithPartials.cob.xml" />
+    <EmbeddedResource Include="..\AltCover.Tests\NCoverWithPartials.xml" Link="NCoverWithPartials.xml" />
+    <EmbeddedResource Include="..\AltCover.Tests\OpenCoverFromNCoverWithPartials.xml" Link="OpenCoverFromNCoverWithPartials.xml" />
+    <EmbeddedResource Include="..\AltCover.Tests\OpenCoverWithPartials.lcov" Link="OpenCoverWithPartials.lcov" />
+    <EmbeddedResource Include="..\AltCover.Tests\OpenCoverWithPartials.xml" Link="OpenCoverWithPartials.xml" />
     <EmbeddedResource Include="..\AltCover.Toolkit\xsd\OpenCoverStrict.xsd" Link="OpenCoverStrict.xsd">
       <Generator>MSDataSetGenerator</Generator>
     </EmbeddedResource>
@@ -36,6 +45,8 @@
     <EmbeddedResource Include="..\AltCover.Tests\Sample1WithNCover.cob.xml" Link="Sample1WithNCover.cob.xml" />
     <EmbeddedResource Include="..\AltCover.Tests\Sample1WithOpenCover.xml" Link="Sample1WithOpenCover.xml" />
     <EmbeddedResource Include="..\AltCover.Tests\Sample4.Prepare.xml" Link="Sample4.Prepare.xml" />
+    <EmbeddedResource Include="..\AltCover.Tests\Sample4.coverlet.json" Link="Sample4.coverlet.json" />
+    <EmbeddedResource Include="..\AltCover.Tests\Sample4.fromcoverletjson.xml" Link="Sample4.fromcoverletjson.xml" />
     <Compile Include="..\_Generated\SolutionRoot.fs" Link="SolutionRoot.fs" />
     <Compile Include="..\_Generated\AssemblyVersion.fs" Link="AssemblyVersion.fs" />
     <Compile Include="..\AltCover.Tests\TestCommon.fs" Link="TestCommon.fs" />
@@ -59,9 +70,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.12.9" Condition="'$(TargetFramework)' != 'net472'" />
+    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.12.12" Condition="'$(TargetFramework)' != 'net472'" />
     <PackageReference Include="Mono.Cecil" Version="0.11.4" />
   </ItemGroup>
 
@@ -80,7 +91,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="6.0.0">
+    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
+    <PackageReference Update="FSharp.Core" Version="6.0.1">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
     <PackageReference Update="System.ValueTuple" Version="4.5.0" />