Dependency updates

SteveGilham · Oct 9, 2024 · 0cd69fb · 0cd69fb
1 parent e3a102b
commit 0cd69fb
Show file tree

Hide file tree

Showing 22 changed files with 62 additions and 187 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.8",
+      "version": "5.3.10",
       "commands": [
         "reportgenerator"
       ],
@@ -38,7 +38,7 @@
       "rollForward": false
     },
     "nbgv": {
-      "version": "3.6.141",
+      "version": "3.6.143",
       "commands": [
         "nbgv"
       ],

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.400'
+        dotnet-version: '8.0.403'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
@@ -63,7 +63,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.400'
+        dotnet-version: '8.0.403'
     - 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
@@ -74,22 +74,6 @@
     <PackageReference Include="FSharp.Core">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
-    <Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
-    </Reference>
-    <Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
-      <HintPath>..\ThirdParty\Unquote.dll</HintPath>
-    </Reference>    
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AltCover.Engine/AltCover.Engine.fsproj b/AltCover.Engine/AltCover.Engine.fsproj
@@ -80,19 +80,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
-    <Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Mono.Cecil" />
     <PackageReference Include="System.IO.Compression" />
     <PackageReference Include="FSharp.Core">
       <ExcludeAssets>contentfiles</ExcludeAssets>

diff --git a/AltCover.PowerShell/AltCover.PowerShell.fsproj b/AltCover.PowerShell/AltCover.PowerShell.fsproj
@@ -35,19 +35,6 @@
     <PackageReference Include="FSharp.Core">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
-    <Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AltCover.Toolkit/AltCover.Toolkit.fsproj b/AltCover.Toolkit/AltCover.Toolkit.fsproj
@@ -48,19 +48,6 @@
     <PackageReference Include="FSharp.Core">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
-    <Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(MSBuildThisFileDirectory)\..\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(MSBuildThisFileDirectory)\..\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(MSBuildThisFileDirectory)\..\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(MSBuildThisFileDirectory)\..\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj b/AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj
@@ -9,7 +9,6 @@
     <AssemblyName>AltCover.ValidateGendarmeEmulation</AssemblyName>
     <OtherFlags />
     <SignAssembly>false</SignAssembly>
-    <NoWarn Condition="'$(LocalCecil)' == 'true'">MSB3277</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -26,19 +25,7 @@
     <Reference Include="Gendarme.Rules.Maintainability">
       <HintPath>$(GendarmeToolDir)Gendarme.Rules.Maintainability.dll</HintPath>
     </Reference>
-    <PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
-    <Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
-    </Reference>
+    <PackageReference Include="mono.cecil" />
     <Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
       <HintPath>..\ThirdParty\Unquote.dll</HintPath>
     </Reference>

diff --git a/AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj b/AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj
@@ -33,25 +33,10 @@
     <PackageReference Include="NUnit" Condition="'$(TargetFramework)' != 'net472'" />
     <PackageReference Include="NUnit" VersionOverride="3.14.0" Condition="'$(TargetFramework)' == 'net472'" />
     <PackageReference Include="YoloDev.Expecto.TestSdk" Condition="'$(TargetFramework)' != 'net472'" />
+    <PackageReference Include="Mono.Cecil" />
     <PackageReference Include="FSharp.Core">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
-    <Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
-      <HintPath>..\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
-      <HintPath>..\ThirdParty\Unquote.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Build/NuGet.csproj b/Build/NuGet.csproj
@@ -16,7 +16,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ILRepack"/>
+    <PackageReference Include="ILRepack">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Mono.Options" />
     <PackageReference Include="NUnit.ConsoleRunner" />
     <PackageReference Include="OpenCover" />
@@ -28,6 +31,6 @@
     <PackageReference Include="AltCode.Dixon" />
     <PackageReference Include="altcode.gendarme" />
     <PackageReference Include="XmlDoc2CmdletDoc" />
-    <PackageReference Include="System.ValueTuple" VersionOverride="4.0.0-rc3-24212-01"/>
+    <PackageReference Include="System.ValueTuple" VersionOverride="4.0.0-rc3-24212-01" />
   </ItemGroup>
 </Project>
diff --git a/Build/targets.fs b/Build/targets.fs
@@ -39,21 +39,6 @@ module Targets =
   let mutable Copyright = String.Empty
   let mutable Version = String.Empty
 
-  let localCecil =
-    let xml =
-      "./Directory.Build.props"
-      |> Path.getFullName
-      |> XDocument.Load
-
-    xml.Descendants()
-    |> Seq.filter (fun (e: XElement) ->
-      e.Name.LocalName.Equals("LocalCecil", StringComparison.OrdinalIgnoreCase))
-    |> Seq.map (fun x -> x.Value |> Boolean.TryParse |> snd)
-    |> Seq.tryLast
-    |> Option.defaultValue false
-
-  printfn "Local Cecil = %A" localCecil
-
   let currentBranch =
     "."
     |> Path.getFullName
@@ -600,13 +585,7 @@ module Targets =
   let dotnetBuildDebug proj =
     DotNet.build
       (fun p ->
-        { p.WithCommon(
-            dotnetOptions
-            >> dotnetOptionsWithSkipGtkInstall
-            >> (fun o ->
-              { o with
-                  Verbosity = Some DotNet.Verbosity.Minimal })
-          ) with
+        { p.WithCommon(dotnetOptions >> dotnetOptionsWithSkipGtkInstall) with
             Configuration = DotNet.BuildConfiguration.Debug }
         |> buildWithCLIArguments)
       (Path.GetFullPath proj)
@@ -1483,13 +1462,13 @@ module Targets =
                     @@ "gtksharp/"
                        + (ddItem "gtksharp")
                        + "/lib/netstandard2.0"
-                    if localCecil then
-                      Path.GetFullPath "./ThirdParty/cecil"
-                    else
-                      nugetCache
-                      @@ "mono.cecil/"
-                         + (ddItem "mono.cecil")
-                         + "/lib/netstandard2.0"
+                    //if localCecil then
+                    //  Path.GetFullPath "./ThirdParty/cecil"
+                    //else
+                    nugetCache
+                    @@ "mono.cecil/"
+                       + (ddItem "mono.cecil")
+                       + "/lib/netstandard2.0"
                     nugetCache
                     @@ "mono.options/"
                        + (ddItem "mono.options")
@@ -1538,20 +1517,10 @@ module Targets =
           |> Path.getFullName
           |> XDocument.Load
 
-        let skip =
-          if localCecil then
-            "mono.cecil"
-          else
-            "$$$$$$$"
-
         let packages =
           xml.Descendants(XName.Get("PackageReference"))
           |> Seq.filter (_.Attribute(XName.Get("Include")) >> isNull >> not)
           |> Seq.map _.Attribute(XName.Get("Include")).Value
-          |> Seq.filter (
-            _.Equals(skip, StringComparison.OrdinalIgnoreCase)
-            >> not
-          ) //CECIL
           |> Seq.toList
 
         let dirs =
@@ -4576,12 +4545,10 @@ module Targets =
                   "AltCover.Cake"
                   "AltCover.Base"
                   "Recorder"
-                  "Mono"
                   "DataCollector"
                   "FSharp" ]
               InPlace = false
               ReportFormat = "OpenCover"
-              LocalSource = true
               Save = true
               VisibleBranches = true }
         )

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,12 +6,11 @@
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
     <!-- .nuget\packages\dotnet.reproduciblebuilds.isolated\x.x.x\Sdk\Sdk.targets -->
     <EnsureNETFrameworkReferenceAssembliesProvided>false</EnsureNETFrameworkReferenceAssembliesProvided>
-    <LocalCecil>true</LocalCecil>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning"
-                      Condition="('$(TargetFramework)' != 'net20') AND ('$(Configuration)'!='Debug')">
+    <PackageReference Include="Nerdbank.GitVersioning" 
+                      Condition="('$(TargetFramework)' != 'net20') AND ('$(Configuration)'!='Debug')" >
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>