Merge branch 'develop/maintenance' into release/Habu

# Conflicts: # appveyor.yml
SteveGilham · Nov 19, 2022 · 2629722 · 2629722
2 parents a7e5ac3 + 5e8ff9e
commit 2629722
Show file tree

Hide file tree

Showing 193 changed files with 11,387 additions and 10,090 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,17 +3,11 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.1.10",
+      "version": "5.1.11",
       "commands": [
         "reportgenerator"
       ]
     },
-    "fake-cli": {
-      "version": "5.23.0",
-      "commands": [
-        "fake"
-      ]
-    },
     "xmldocmd": {
       "version": "2.8.0",
       "commands": [
@@ -27,10 +21,16 @@
       ]
     },
     "dotnet-fsharplint": {
-      "version": "0.21.2",
+      "version": "0.21.3",
       "commands": [
         "dotnet-fsharplint"
       ]
+    },
+    "coveralls.net": {
+      "version": "4.0.1",
+      "commands": [
+        "csmacnz.Coveralls"
+      ]
     }
   }
 }
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,15 +19,15 @@ jobs:
         fetch-depth: 2
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.402'
+        dotnet-version: '7.0.100'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
-      run: dotnet fake run ./Build/setup.fsx
+      run: dotnet run --project .\Fake\Setup\Setup.fsproj
     - name: Build
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-      run: dotnet fake run ./Build/build.fsx
+      run: dotnet run --project .\Fake\Build\Build.fsproj
     - uses: actions/upload-artifact@v3
       with:
           name: nupkgs
@@ -47,13 +47,13 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.402'
+        dotnet-version: '7.0.100'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
-      run: dotnet fake run ./Build/setup.fsx
+      run: dotnet run --project ./Fake/Setup/Setup.fsproj
     - name: Build
-      run: dotnet fake run ./Build/build.fsx  
+      run: dotnet run --project ./Fake/Build/Build.fsproj 
     - uses: actions/upload-artifact@v3
       if: failure()
       with:

diff --git a/.gitignore b/.gitignore
@@ -86,3 +86,5 @@ ThirdParty/*.nupkg
 ThirdParty/gtk-sharp2/atk/
 InternalTrace.*.log
 nunit-agent_*.log
+Fake/Binaries/
+Fake/Intermediate/
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>net6.0;net472</TargetFrameworks>
+    <TargetFrameworks>net7.0;net472</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AssemblyName>AltCover.Api.Tests</AssemblyName>
     <GenerateProgramFile>false</GenerateProgramFile>
@@ -54,23 +54,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Expecto" Version="9.0.4" Condition="'$(TargetFramework)' != 'net472'" />
-    <PackageReference Include="Expecto.TestResults" Version="8.13.2" Condition="'$(TargetFramework)' != 'net472'" />
-    <PackageReference Include="System.ValueTuple" />
-    <PackageReference Include="Unquote" Version="6.1.0" Condition="'$(TargetFramework)' != 'net472'" />
+    <PackageReference Include="Expecto" Condition="'$(TargetFramework)' != 'net472'" />
+    <PackageReference Include="Expecto.TestResults" Condition="'$(TargetFramework)' != 'net472'" />
+    <PackageReference Include="Unquote" Condition="'$(TargetFramework)' != 'net472'" />
     <Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
       <HintPath>..\ThirdParty\Unquote.dll</HintPath>
     </Reference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <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'">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="YoloDev.Expecto.TestSdk" Condition="'$(TargetFramework)' != 'net472'" />
+    <PackageReference Include="FSharp.Core">
+      <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>
 
@@ -81,10 +79,4 @@
     <ProjectReference Include="..\Samples\Sample18\Sample18.fsproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="6.0.6">
-      <ExcludeAssets>contentfiles</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Update="System.ValueTuple" Version="4.5.0" />
-  </ItemGroup>
 </Project>
diff --git a/AltCover.Api.Tests/FSApiTests.fs b/AltCover.Api.Tests/FSApiTests.fs
@@ -1266,6 +1266,10 @@ module FSApiTests =
                                              - (optionCases + 1))
       @>
 
+    test <@ DotNet.ImportModuleProperties = [ ("AltCoverImportModule", "true") ] @>
+
+    test <@ DotNet.GetVersionProperties = [ ("AltCoverGetVersion", "true") ] @>
+
   [<Test>]
   let ArgumentsBuilt () =
     let force = DotNet.CLIOptions.Force true

diff --git a/AltCover.Async/AltCover.Async.fsproj b/AltCover.Async/AltCover.Async.fsproj
@@ -24,15 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Compiler.Tools" Version="10.2.3" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net46" Version="1.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Remove="System.ValueTuple" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.1.18" />
+    <PackageReference Include="FSharp.Compiler.Tools" />
+    <PackageReference Include="FSharp.Core" VersionOverride="4.1.18" />
   </ItemGroup>
 </Project>
diff --git a/AltCover.Async/Library.fs b/AltCover.Async/Library.fs
@@ -54,7 +54,7 @@ module Instance =
                             Justification = "Bytecode delta only")>]
 [<assembly: SuppressMessage("Gendarme.Rules.Performance",
                             "AvoidRepetitiveCallsToPropertiesRule",
-                            Scope = "member",  // MethodDefinition
+                            Scope = "member", // MethodDefinition
                             Target = "AltCover.Recorder.Instance/I/CallTrack::instance()",
                             Justification = "Bytecode delta only")>]
 ()
diff --git a/AltCover.Avalonia/AltCover.Avalonia.fsproj b/AltCover.Avalonia/AltCover.Avalonia.fsproj
@@ -41,24 +41,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.18" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="System.Reactive.Core" Version="5.0.0" />
+    <PackageReference Include="Mono.Options" />
+    <PackageReference Include="System.Reactive.Core" />
+    <PackageReference Include="FSharp.Core">
+      <ExcludeAssets>contentfiles</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\AltCover.FontSupport\AltCover.FontSupport.csproj" />
     <ProjectReference Include="..\AltCover.UICommon\AltCover.UICommon.fsproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="6.0.6">
-      <ExcludeAssets>contentfiles</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>
diff --git a/AltCover.Avalonia/MainWindow.fs b/AltCover.Avalonia/MainWindow.fs
@@ -523,7 +523,7 @@ type MainWindow() as this =
       this.FindControl<Menu>("Menu").IsVisible <- false
       this.FindControl<DockPanel>("Grid").IsVisible <- false)
 
-    let openFile = new Event<String option>()
+    let openFile = Event<String option>()
 
     this.FindControl<MenuItem>("Open").Click
     |> Event.add (fun _ ->
@@ -623,7 +623,13 @@ type MainWindow() as this =
           Row = null }
 
       let addNode =
-        fun leaf (context: CoverageTreeContext<List<TreeViewItem>, TreeViewItem>) icon pc name (tip: string option) ->
+        fun
+          leaf
+          (context: CoverageTreeContext<List<TreeViewItem>, TreeViewItem>)
+          icon
+          pc
+          name
+          (tip: string option) ->
           let newrow = makeNewRow pc leaf name icon
 
           (context.Row.Items :?> List<TreeViewItem>)
@@ -695,7 +701,11 @@ type MainWindow() as this =
       + AssemblyVersionInformation.AssemblyFileVersion
 
     this.FindControl<TextBlock>("Description").Text <-
-      Resource.GetResourceString "aboutVisualizer.Comments"
+      String.Format(
+        Globalization.CultureInfo.CurrentCulture,
+        Resource.GetResourceString("aboutVisualizer.Comments"),
+        "AvaloniaUI"
+      )
 
     let copyright =
       AssemblyVersionInformation.AssemblyCopyright

diff --git a/AltCover.Avalonia/Program.fs b/AltCover.Avalonia/Program.fs
@@ -27,7 +27,7 @@ module VisualizerMain =
         ("r|recentFiles", (fun _ -> Persistence.saveCoverageFiles [])) ]
       |> List.fold
            (fun (o: OptionSet) (p, a) ->
-             o.Add(p, Resource.GetResourceString p, new System.Action<string>(a)))
+             o.Add(p, Resource.GetResourceString p, System.Action<string>(a)))
            (OptionSet())
 
     options.Parse(arguments) |> ignore

diff --git a/AltCover.Cake/AltCover.Cake.csproj b/AltCover.Cake/AltCover.Cake.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>AltCover.Cake</RootNamespace>
     <AssemblyName>AltCover.Cake</AssemblyName>
@@ -27,16 +27,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="1.1.0" />
-    <PackageReference Include="Cake.Common" Version="1.1.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+    <PackageReference Include="Cake.Core" />
+    <PackageReference Include="Cake.Common" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\AltCover.DotNet\AltCover.DotNet.fsproj" />
+    <ProjectReference Include="..\AltCover.Engine\AltCover.Engine.fsproj" />
   </ItemGroup>
 
 </Project>