From 3564ab1030fd4467b6ce61108c6137326db1310e Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Sat, 30 Mar 2024 11:04:33 +0100
Subject: [PATCH] Fix Wpf slnf (missing BamlDecompiler project), update NuGet
 packages for Installer (WiX), update NuGet packages ILSpy

---
 Directory.Packages.props                                  | 8 ++++----
 .../ICSharpCode.Decompiler.Tests.csproj                   | 5 ++++-
 .../ILSpy.BamlDecompiler.Tests.csproj                     | 5 ++++-
 ILSpy.Installer/ILSpy.Installer.csproj                    | 4 ++--
 ILSpy.Tests/ILSpy.Tests.csproj                            | 5 ++++-
 ILSpy.Wpf.slnf                                            | 1 +
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 42ac5d6aff..13e1ebab60 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -13,8 +13,8 @@
     <PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="8.0.0-rc.2.23471.30" />
     <PackageVersion Include="Iced" Version="1.21.0" />
     <PackageVersion Include="JunitXml.TestLogger" Version="3.1.12" />
-    <PackageVersion Include="K4os.Compression.LZ4" Version="1.3.6" />
-    <PackageVersion Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.0" />
+    <PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
+    <PackageVersion Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
     <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.9.2" />
     <PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22171-02" />
@@ -30,7 +30,7 @@
     <PackageVersion Include="Mono.Cecil" Version="0.11.5" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
-    <PackageVersion Include="NUnit" Version="4.0.1" />
+    <PackageVersion Include="NUnit" Version="4.1.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="NuGet.Protocol" Version="6.9.1" />
     <PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
@@ -42,6 +42,6 @@
     <PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.14.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
index 1dfb43ed0d..13c9a3f6b8 100644
--- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
+++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
@@ -52,7 +52,10 @@
 	<PackageReference Include="Microsoft.DiaSymReader" />
 	<PackageReference Include="Microsoft.DiaSymReader.Native" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="coverlet.collector">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="NUnit" />
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="JunitXml.TestLogger" />
diff --git a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
index b8a51da296..0c00fb98c1 100644
--- a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
+++ b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
@@ -34,7 +34,10 @@
     <PackageReference Include="NUnit3TestAdapter" />
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="JunitXml.TestLogger" />
-    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="coverlet.collector">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ILSpy.Installer/ILSpy.Installer.csproj b/ILSpy.Installer/ILSpy.Installer.csproj
index 27d5be9bba..d5cab6a357 100644
--- a/ILSpy.Installer/ILSpy.Installer.csproj
+++ b/ILSpy.Installer/ILSpy.Installer.csproj
@@ -15,8 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixSharp" Version="1.25.1" />
-    <PackageReference Include="WixSharp.wix.bin" Version="3.14.0.1" />
+    <PackageReference Include="WixSharp" Version="1.25.2" />
+    <PackageReference Include="WixSharp.wix.bin" Version="3.14.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ILSpy.Tests/ILSpy.Tests.csproj b/ILSpy.Tests/ILSpy.Tests.csproj
index 40a3a218e2..79e95586a9 100644
--- a/ILSpy.Tests/ILSpy.Tests.csproj
+++ b/ILSpy.Tests/ILSpy.Tests.csproj
@@ -54,7 +54,10 @@
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="coverlet.collector">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="NUnit" />
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="JunitXml.TestLogger" />
diff --git a/ILSpy.Wpf.slnf b/ILSpy.Wpf.slnf
index 48681d712b..831214ce7f 100644
--- a/ILSpy.Wpf.slnf
+++ b/ILSpy.Wpf.slnf
@@ -8,6 +8,7 @@
 			"ICSharpCode.ILSpyX\\ICSharpCode.ILSpyX.csproj",
 			"ILSpy.BamlDecompiler.Tests\\ILSpy.BamlDecompiler.Tests.csproj",
 			"ILSpy.BamlDecompiler\\ILSpy.BamlDecompiler.csproj",
+			"ICSharpCode.BamlDecompiler\\ICSharpCode.BamlDecompiler.csproj",
 			"ILSpy.ReadyToRun\\ILSpy.ReadyToRun.csproj",
 			"ILSpy.Tests\\ILSpy.Tests.csproj",
 			"ILSpy\\ILSpy.csproj",