Back-port a lot of goodness

SteveGilham · Jul 22, 2024 · ac9b30e · ac9b30e
1 parent 47f7ffa
commit ac9b30e
Show file tree

Hide file tree

Showing 21 changed files with 402 additions and 611 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.3.0",
+      "version": "5.3.6",
       "commands": [
         "reportgenerator"
       ],
@@ -38,7 +38,7 @@
       "rollForward": false
     },
     "nbgv": {
-      "version": "3.6.133",
+      "version": "3.6.139",
       "commands": [
         "nbgv"
       ],

diff --git a/AltCover.Avalonia/AltCover.Avalonia.fsproj b/AltCover.Avalonia/AltCover.Avalonia.fsproj
@@ -10,6 +10,7 @@
     <GlobalDefineConstants>AVALONIA;$(TOGGLE)</GlobalDefineConstants>
     <UseStandardResourceNames>True</UseStandardResourceNames>
     <Win32Resource>$(ProjectDir)../AltCover.Visualizer/Resource.res</Win32Resource>
+    <NoWarn>NU1902,NU1903,NU1904</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">

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
@@ -7,7 +7,7 @@
     <GlobalDefineConstants>NoCanonicalDirectories;FAKEAPI</GlobalDefineConstants>
     <!-- something; Could not locate the assembly "Mono.Posix" -->
     <MSBuildWarningsAsMessages>MSB3277;MSB3245</MSBuildWarningsAsMessages>
-    <NoWarn>NU1701;NU1605</NoWarn>
+    <NoWarn>NU1701;NU1605;NU1902,NU1903,NU1904</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">

diff --git a/AltCover.Fake/AltCover.Fake.fsproj b/AltCover.Fake/AltCover.Fake.fsproj
@@ -5,7 +5,7 @@
     <RootNamespace>AltCover.Fake</RootNamespace>
     <AssemblyName>AltCover.Fake</AssemblyName>
     <GlobalDefineConstants>RUNNER</GlobalDefineConstants>
-    <NoWarn>NU1701;NU1605</NoWarn>
+    <NoWarn>NU1701;NU1605;NU1902,NU1903,NU1904</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">

diff --git a/AltCover.Recorder.Tests/Adapter.cs b/AltCover.Recorder.Tests/Adapter.cs
diff --git a/AltCover.Recorder.Tests/Adapter.fs b/AltCover.Recorder.Tests/Adapter.fs
diff --git a/AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj b/AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj
@@ -23,11 +23,11 @@
       <Link>AssemblyVersion.fs</Link>
     </Compile>
     <Compile Include="AssemblyInfo.fs" />
-    <Compile Include="Adapter.fs" />
     <Compile Include="Base.Tests.fs" />
     <Compile Include="Tracer.Tests.fs" />
     <Compile Include="Recorder.Tests.fs" />
-    <Compile Include="Program.fs" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <Compile Include="Program.fs" Condition="'$(TargetFramework)' != 'net472'" />
+    <None Include="Program.cs" Condition="'$(TargetFramework)' == 'net472'" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AltCover.Recorder.Tests/AssemblyInfo.cs b/AltCover.Recorder.Tests/AssemblyInfo.cs
diff --git a/AltCover.Recorder.Tests/Program.cs b/AltCover.Recorder.Tests/Program.cs
diff --git a/AltCover.Recorder.Tests/Recorder.Tests.cs b/AltCover.Recorder.Tests/Recorder.Tests.cs