From 7e8516fc41b71933d08c276f45741f90ec8d89e1 Mon Sep 17 00:00:00 2001
From: TheCakeIsNaOH <TheCakeIsNaOH@gmail.com>
Date: Mon, 27 Jun 2022 11:23:33 -0500
Subject: [PATCH] (#2738) Fix ILMerge errors

The older AlphaFS version had an invalid PDB file, updated it to fix that.
Also updated the location of the system DLLs for the updated .NET version.
---
 recipe.cake                                      | 2 +-
 src/chocolatey.console/chocolatey.console.csproj | 4 ++--
 src/chocolatey.console/packages.config           | 2 +-
 src/chocolatey/chocolatey.csproj                 | 4 ++--
 src/chocolatey/packages.config                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/recipe.cake b/recipe.cake
index b45b02373f..65bc415b78 100644
--- a/recipe.cake
+++ b/recipe.cake
@@ -16,7 +16,7 @@ Func<List<ILMergeConfig>> getILMergeConfigs = () =>
 {
     var mergeConfigs = new List<ILMergeConfig>();
 
-    var targetPlatform = "v4,C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0";
+    var targetPlatform = "v4,C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8";
     var assembliesToILMerge = GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco/*.{exe|dll}")
                             - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco/choco.exe")
                             - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco/System.Management.Automation.dll");
diff --git a/src/chocolatey.console/chocolatey.console.csproj b/src/chocolatey.console/chocolatey.console.csproj
index e53c5498ce..924056dbbb 100644
--- a/src/chocolatey.console/chocolatey.console.csproj
+++ b/src/chocolatey.console/chocolatey.console.csproj
@@ -127,8 +127,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AlphaFS, Version=2.1.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
-      <HintPath>..\packages\AlphaFS.2.1.3\lib\net452\AlphaFS.dll</HintPath>
+    <Reference Include="AlphaFS, Version=2.2.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
+      <HintPath>..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
diff --git a/src/chocolatey.console/packages.config b/src/chocolatey.console/packages.config
index 7c7fe2b693..1cfafa8a8a 100644
--- a/src/chocolatey.console/packages.config
+++ b/src/chocolatey.console/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AlphaFS" version="2.1.3" targetFramework="net48" />
+  <package id="AlphaFS" version="2.2.6" targetFramework="net48" />
   <package id="log4net" version="2.0.12" targetFramework="net48" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
   <package id="SimpleInjector" version="2.5.0" targetFramework="net48" />
diff --git a/src/chocolatey/chocolatey.csproj b/src/chocolatey/chocolatey.csproj
index 215d030022..8bd899e266 100644
--- a/src/chocolatey/chocolatey.csproj
+++ b/src/chocolatey/chocolatey.csproj
@@ -68,8 +68,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AlphaFS, Version=2.1.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
-      <HintPath>..\packages\AlphaFS.2.1.3\lib\net452\AlphaFS.dll</HintPath>
+    <Reference Include="AlphaFS, Version=2.2.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
+      <HintPath>..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
diff --git a/src/chocolatey/packages.config b/src/chocolatey/packages.config
index 86853a04d5..078754253c 100644
--- a/src/chocolatey/packages.config
+++ b/src/chocolatey/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AlphaFS" version="2.1.3" targetFramework="net48" />
+  <package id="AlphaFS" version="2.2.6" targetFramework="net48" />
   <package id="log4net" version="2.0.12" targetFramework="net48" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
   <package id="Rx-Core" version="2.1.30214.0" targetFramework="net48" />