Merge branch 'develop/maintenance' into release/Habu

SteveGilham · Sep 13, 2022 · 0518177 · 0518177
2 parents 6f84ef8 + 4ecc726
commit 0518177
Show file tree

Hide file tree

Showing 201 changed files with 1,197 additions and 930 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "fake-cli": {
-      "version": "5.22.0",
+      "version": "5.23.0",
       "commands": [
         "fake"
       ]

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
         fetch-depth: 2
     - uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: '6.0.301'
+        dotnet-version: '6.0.400'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
@@ -47,7 +47,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: '6.0.301'
+        dotnet-version: '6.0.400'
     - 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,14 +65,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="YoloDev.Expecto.TestSdk" Version="1.0.0" Condition="'$(TargetFramework)' != 'net472'" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.2" 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>
@@ -86,7 +82,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageReference Update="FSharp.Core" Version="6.0.5">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>

diff --git a/AltCover.Async/AltCover.Async.fsproj b/AltCover.Async/AltCover.Async.fsproj
@@ -25,16 +25,14 @@
 
   <ItemGroup>
     <PackageReference Include="FSharp.Compiler.Tools" Version="10.2.3" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net46" Version="1.0.2">
+    <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" />   
+    <PackageReference Remove="System.ValueTuple" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageReference Update="FSharp.Core" Version="4.1.18" />
   </ItemGroup>
-
 </Project>
diff --git a/AltCover.Avalonia/AltCover.Avalonia.fsproj b/AltCover.Avalonia/AltCover.Avalonia.fsproj
@@ -41,8 +41,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.15" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
+    <PackageReference Include="Avalonia" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -57,7 +57,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageReference Update="FSharp.Core" Version="6.0.5">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>

diff --git a/AltCover.Cake/AltCover.Cake.csproj b/AltCover.Cake/AltCover.Cake.csproj
@@ -39,7 +39,4 @@
     <ProjectReference Include="..\AltCover.DotNet\AltCover.DotNet.fsproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
-  </ItemGroup>
 </Project>
diff --git a/AltCover.DataCollector/AltCover.DataCollector.csproj b/AltCover.DataCollector/AltCover.DataCollector.csproj
@@ -61,7 +61,4 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
-  </ItemGroup>
 </Project>
diff --git a/AltCover.DotNet/AltCover.DotNet.fsproj b/AltCover.DotNet/AltCover.DotNet.fsproj
@@ -34,7 +34,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageReference Update="FSharp.Core" Version="6.0.5">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>

diff --git a/AltCover.Engine/AltCover.Engine.fsproj b/AltCover.Engine/AltCover.Engine.fsproj
@@ -102,7 +102,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageReference Update="FSharp.Core" Version="6.0.5">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>

diff --git a/AltCover.Engine/AltCover.fsi b/AltCover.Engine/AltCover.fsi
@@ -362,11 +362,11 @@ namespace AltCoverFake.DotNet.Testing
         ///</summary>
         member Error : (System.String -> unit)
         ///<summary>
-        /// Sink for command line/usage messages
+        /// Sink for detailed messages
         ///</summary>
         member Verbose : (System.String -> unit)
         ///<summary>
-        /// Sink for detailed messages
+        /// Sink for command line/usage messages
         ///</summary>
         member Echo : (System.String -> unit)
         ///<summary>

diff --git a/AltCover.Engine/CecilEx.fs b/AltCover.Engine/CecilEx.fs
@@ -13,6 +13,7 @@ open System.Reflection
 
 open Mono.Cecil
 open Mono.Cecil.Cil
+open Mono.Cecil.Metadata
 
 module AssemblyConstants =
   let internal nugetCache =
@@ -190,12 +191,38 @@ module internal CecilExtension =
        System.Reflection.BindingFlags.Instance
        ||| System.Reflection.BindingFlags.NonPublic)
 
+  let etypeField =
+    typeof<TypeReference>.GetField
+      ("etype",
+       System.Reflection.BindingFlags.Instance
+       ||| System.Reflection.BindingFlags.NonPublic)
+
   let internal offsetTable =
     System.Collections.Generic.SortedDictionary<int, Instruction>()
 
   let unresolved (point: InstructionOffset) =
     isResolvedProp.GetValue(point) :?> bool |> not
 
+  let checkScopeConstants (m: MethodDefinition) =
+    scopesSeen
+    |> Seq.iter(fun scope -> let sus = scope.Constants
+                                       |> Seq.filter (fun c -> (isNull c.Value) &&
+                                                               match etypeField.GetValue(c.ConstantType) :?> byte with
+                                                               | 0x14uy // ElementType.Array
+                                                               | 0x1duy // ElementType.SzArray
+                                                               | 0x12uy // ElementType.Class
+                                                               | 0x1cuy // ElementType.Object
+                                                               | 0x00uy // ElementType.None
+                                                               | 0x13uy // ElementType.Var
+                                                               | 0x1euy // ElementType.MVar
+                                                               | 0x0euy // ElementType.String
+                                                                   -> false
+                                                               | _ -> not c.ConstantType.IsPrimitive)
+                                      |> Seq.toList
+                             sus |> Seq.iter (fun c -> scope.Constants.Remove c |> ignore
+                                                       sprintf "Null Constant %s elided in method %s" c.Name m.FullName
+                                                       |> Output.verbose))
+
   let prepareLocalScopes (m: MethodDefinition) =
     offsetTable.Clear()
     scopesSeen.Clear()
@@ -238,6 +265,9 @@ module internal CecilExtension =
             scope.End <- resolvePoint scope.End
 
     m.DebugInformation.Scope |> resolveScope
+
+    checkScopeConstants m
+
     pruneLocalScopes m
 
   // Adjust the IL for exception handling

diff --git a/AltCover.Engine/Tasks.fs b/AltCover.Engine/Tasks.fs
@@ -462,6 +462,9 @@ type ContingentCopy() =
   [<Required>]
   member val InstrumentDirectory = String.Empty with get, set
 
+  member internal self.Write message =
+    ``base``.Log.LogMessage(MessageImportance.High, message)
+
   override self.Execute() =
     //base.Log.LogMessage(MessageImportance.High, sprintf "Project dir %A" self.ProjectDir)
     //base.Log.LogMessage(MessageImportance.High, sprintf "Relative dir %A" self.RelativeDir)
@@ -503,7 +506,9 @@ type ContingentCopy() =
         if toDir |> Directory.Exists |> not then
           toDir |> Directory.CreateDirectory |> ignore
 
-        File.Copy(from, toFile, true)
+        let copy x = File.Copy(x, toFile, true)
+        from
+        |> CommandLine.I.doRetry copy self.Write 10 1000 0
 
     true
 

diff --git a/AltCover.Engine/TypeSafe.fsi b/AltCover.Engine/TypeSafe.fsi
@@ -23,10 +23,10 @@ namespace AltCoverFake.DotNet.Testing
 //
 // ### Individual files and directories
 // ```
-    [<NoComparison>]
     ///<summary>
     /// Corresponds to a file or executable tool
     ///</summary>
+    [<NoComparison>]
     type FilePath =
       ///<summary>
       /// A named `dotnet` tool, carried unaltered
@@ -177,10 +177,10 @@ namespace AltCoverFake.DotNet.Testing
 // ```
 // ### Yes/No choices
 // ```
-    [<NoComparison>]
     ///<summary>
     /// Corresponds to a yes/no choice
     ///</summary>
+    [<NoComparison>]
     type Flag =
       ///<summary>
       /// A type-safe boolean

diff --git a/AltCover.Engine/WhatIfExtension.fsi b/AltCover.Engine/WhatIfExtension.fsi
@@ -7,31 +7,31 @@ open System.Runtime.CompilerServices /// no doc
 // ```
 // ## module `PrepareExtension` and module `CollectExtension`
 // ```
-[<Extension>]
 ///<summary>
 /// `Abstract.IPrepareOptions` extension methods
 ///</summary>
+[<Extension>]
 module PrepareExtension = begin
-  [<Extension>]
   ///<summary>
   /// Validates the supplied options
   ///</summary>
   /// <param name="prepare">The options</param>
   /// <returns>The validation outcome.</returns>
+  [<Extension>]
   val WhatIf : prepare:Abstract.IPrepareOptions -> AltCover.ValidatedCommandLine
 end
-[<Extension>]
 ///<summary>
 /// `Abstract.ICollectOptions` extension methods
 ///</summary>
+[<Extension>]
 module CollectExtension = begin
-  [<Extension>]
   ///<summary>
   /// Validates the supplied options
   ///</summary>
   /// <param name="collect">The options</param>
   /// <param name="afterPreparation">Values indicating whether the instrumentation has already taken place</param>
   /// <returns>The validation outcome.</returns>
+  [<Extension>]
   val WhatIf :
     collect:Abstract.ICollectOptions ->
       afterPreparation:bool -> AltCover.ValidatedCommandLine
@@ -43,10 +43,10 @@ end
 //
 // ## module `WhatIfExtension`
 // ```
-[<AutoOpen>]
 ///<summary>
 /// F#-style I&lt;Whatever&gt;Options extension methods
 ///</summary>
+[<AutoOpen>]
 module WhatIfExtension = begin
   ///<summary>
   /// F# style `Abstract.ICollectOptions` extension methods

diff --git a/AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj b/AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj
@@ -20,18 +20,15 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Expecto" Version="9.0.4" />
-    <PackageReference Include="Expecto.TestResults" Version="8.13.2" />
     <PackageReference Include="YoloDev.Expecto.TestSdk" Version="1.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\AltCover.Tests\AltCover.Tests.fsproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageReference Update="FSharp.Core" Version="6.0.5">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>

diff --git a/AltCover.Fake.DotNet.Testing.AltCover/AltCover.Fake.DotNet.Testing.AltCover.fsproj b/AltCover.Fake.DotNet.Testing.AltCover/AltCover.Fake.DotNet.Testing.AltCover.fsproj
@@ -48,11 +48,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageReference Update="FSharp.Core" Version="6.0.5">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>

diff --git a/AltCover.Fake/AltCover.Fake.fsproj b/AltCover.Fake/AltCover.Fake.fsproj
@@ -37,7 +37,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageReference Update="FSharp.Core" Version="6.0.5">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>

diff --git a/AltCover.FontSupport/AltCover.FontSupport.csproj b/AltCover.FontSupport/AltCover.FontSupport.csproj
@@ -22,8 +22,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fake.Core.Process" Version="5.22.0" Condition="'$(TargetFramework)' != 'net472'" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.2" Condition="'$(TargetFramework)' == 'net472'">
+    <PackageReference Include="Fake.Core.Process" Version="5.23.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>
@@ -35,8 +35,4 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
-  </ItemGroup>
 </Project>
diff --git a/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj b/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+       <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;net472</TargetFrameworks>
@@ -19,13 +19,13 @@
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="Unquote" Version="6.1.0" Condition="'$(TargetFramework)' != 'net472'" />
     <Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
       <HintPath>..\ThirdParty\Unquote.dll</HintPath>
     </Reference>
     <PackageReference Include="YoloDev.Expecto.TestSdk" Version="1.0.0" Condition="'$(TargetFramework)' != 'net472'" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.2" 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>
@@ -49,7 +49,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageReference Update="FSharp.Core" Version="6.0.5">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>

diff --git a/AltCover.Monitor/AltCover.Monitor.csproj b/AltCover.Monitor/AltCover.Monitor.csproj
@@ -31,13 +31,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net20" Version="1.0.2" Condition="'$(TargetFramework)' == 'net20'">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net20" Version="1.0.3" Condition="'$(TargetFramework)' == 'net20'">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
-  </ItemGroup>
 </Project>