From 54ba78dbb0badc212da6fd0d6fb68f91ee4d5a97 Mon Sep 17 00:00:00 2001
From: Yury Malich <YuryMalich@yandex.com>
Date: Fri, 6 Nov 2020 18:17:26 +0100
Subject: [PATCH 1/4] Bug#277: Fixed re-saving image resources for NET Core
 WindowsForms assemblies.

---
 ILRepack/ResReader.cs                 |  3 ++-
 ILRepack/Steps/ResourcesRepackStep.cs | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ILRepack/ResReader.cs b/ILRepack/ResReader.cs
index bf06efcb..8471ef4d 100644
--- a/ILRepack/ResReader.cs
+++ b/ILRepack/ResReader.cs
@@ -187,6 +187,7 @@ public bool IsString
 
     internal sealed class ResReader : IEnumerable<Res>, IDisposable
     {
+        public string ReaderType { get; private set; }
         private BinaryReader _store;    // backing store we're reading from.
         private readonly long _nameSectionOffset;  // Offset to name section of file.
         private readonly long _dataSectionOffset;  // Offset to Data section of file.
@@ -226,7 +227,7 @@ public ResReader(Stream stream)
 
                     // Read in type name for a suitable ResourceReader
                     // Note ResourceWriter & InternalResGen use different Strings.
-                    String readerType = _store.ReadString();
+                    ReaderType = _store.ReadString();
 
                     // Skip over type name for a suitable ResourceSet
                     SkipString();
diff --git a/ILRepack/Steps/ResourcesRepackStep.cs b/ILRepack/Steps/ResourcesRepackStep.cs
index 4331f772..f92f910d 100644
--- a/ILRepack/Steps/ResourcesRepackStep.cs
+++ b/ILRepack/Steps/ResourcesRepackStep.cs
@@ -257,9 +257,12 @@ private Resource FixResxResource(
             MemoryStream stream = (MemoryStream)er.GetResourceStream();
             var output = new MemoryStream((int)stream.Length);
             var rw = new ResourceWriter(output);
+            var resourceBytes = stream.ToArray();
+            string readerType; 
 
             using (var rr = new ResReader(stream))
             {
+                readerType = rr.ReaderType;
                 foreach (var res in rr)
                 {
                     foreach (var processor in resourcePrcessors)
@@ -275,6 +278,18 @@ private Resource FixResxResource(
 
             rw.Generate();
             output.Position = 0;
+
+            if (readerType.StartsWith("System.Resources.Extensions.DeserializingResourceReader"))
+            {
+                // Bugfix#277 
+                // Default ResourceWriter creates incompatible resourses for NET Core WindowsForms applications 
+                // because the new deserializer of type "System.Resources.Extensions.DeserializingResourceReader" is used there.
+                // Therefore unchanged original resourceBytes must be passed in EmbeddedResource constructor for an NET Core WindowsForms applications
+                // if the readerType is the new type "System.Resources.Extensions.DeserializingResourceReader"
+
+                return new EmbeddedResource(er.Name, er.Attributes, new MemoryStream(resourceBytes));
+            }
+
             return new EmbeddedResource(er.Name, er.Attributes, output);
         }
 

From 984835bd41def58a87dcaeda6abddce616134b96 Mon Sep 17 00:00:00 2001
From: Yury Malich <YuryMalich@yandex.com>
Date: Fri, 6 Nov 2020 18:23:30 +0100
Subject: [PATCH 2/4] Bug#277 - Added new Integration tests for NET Core
 applications (Winforms and WPF). - Fixed problem - Nuget download doesn't
 work without SecurityProtocolType.Tls12 anymore. - Added NUnitTestAdapter
 package to run tests in VS 2019 TestExplorer.

---
 .../ILRepack.IntegrationTests.csproj          |  33 ++++-
 .../NuGet/NuGetHelpers.cs                     |   2 +
 ILRepack.IntegrationTests/Scenarios.cs        |  12 ++
 .../Scenarios/ClassLibrary/packages.config    |  15 +++
 .../ClassLibraryCore/ClassLibraryCore.csproj  |  33 +++++
 .../ClassLibraryCore/DummyUserControl.xaml    |  14 ++
 .../ClassLibraryCore/DummyUserControl.xaml.cs |  31 +++++
 .../Properties/Resources.Designer.cs          |  73 +++++++++++
 .../Properties/Resources.resx                 | 124 ++++++++++++++++++
 .../ClassLibraryCore/Resources/image.png      | Bin 0 -> 182 bytes
 .../ClassLibraryCore/TextBlockStyles.xaml     |   8 ++
 .../DesignTimeBuild/.dtbcache.v2              | Bin 0 -> 81058 bytes
 .../WPFSampleApplicationCore/AssemblyInfo.cs  |  10 ++
 .../WPFSampleApplicationCore/MainWindow.xaml  |  17 +++
 .../MainWindow.xaml.cs                        |  27 ++++
 .../WPFSampleApplicationCore/Program.cs       |  23 ++++
 .../WPFSampleApplicationCore.csproj           |  21 +++
 .../test_sign_key.snk                         | Bin 0 -> 596 bytes
 .../Form1.Designer.cs                         |  60 +++++++++
 .../WindowsFormsTestNetCoreApp/Form1.cs       |  33 +++++
 .../WindowsFormsTestNetCoreApp/Form1.resx     |  60 +++++++++
 .../WindowsFormsTestNetCoreApp/Program.cs     |  28 ++++
 .../Properties/Resources.Designer.cs          |  73 +++++++++++
 .../Properties/Resources.resx                 | 124 ++++++++++++++++++
 .../Properties/launchSettings.json            |   7 +
 .../WindowsFormsTestNetCoreApp.csproj         |  34 +++++
 .../checkbox_checked.png                      | Bin 0 -> 174 bytes
 ILRepack.IntegrationTests/packages.config     |   3 +
 ILRepack.Tests/ILRepack.Tests.csproj          |  31 ++++-
 ILRepack.Tests/packages.config                |   5 +-
 ILRepack.sln                                  |  31 ++++-
 31 files changed, 921 insertions(+), 11 deletions(-)
 create mode 100644 ILRepack.IntegrationTests/Scenarios/ClassLibrary/packages.config
 create mode 100644 ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/ClassLibraryCore.csproj
 create mode 100644 ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/DummyUserControl.xaml
 create mode 100644 ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/DummyUserControl.xaml.cs
 create mode 100644 ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Properties/Resources.Designer.cs
 create mode 100644 ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Properties/Resources.resx
 create mode 100644 ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Resources/image.png
 create mode 100644 ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/TextBlockStyles.xaml
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/.vs/WPFSampleApplicationCore/DesignTimeBuild/.dtbcache.v2
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/AssemblyInfo.cs
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/MainWindow.xaml
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/MainWindow.xaml.cs
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/Program.cs
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/WPFSampleApplicationCore.csproj
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/test_sign_key.snk
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.Designer.cs
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.cs
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.resx
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Program.cs
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/Resources.Designer.cs
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/Resources.resx
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/launchSettings.json
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/WindowsFormsTestNetCoreApp.csproj
 create mode 100644 ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/checkbox_checked.png

diff --git a/ILRepack.IntegrationTests/ILRepack.IntegrationTests.csproj b/ILRepack.IntegrationTests/ILRepack.IntegrationTests.csproj
index c74c2073..5a666611 100644
--- a/ILRepack.IntegrationTests/ILRepack.IntegrationTests.csproj
+++ b/ILRepack.IntegrationTests/ILRepack.IntegrationTests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props" Condition="Exists('..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ILRepack.IntegrationTests</RootNamespace>
     <AssemblyName>ILRepack.IntegrationTests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -20,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,14 +31,19 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="BamlParser, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -54,6 +62,17 @@
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.util.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System.Reactive.Core">
       <HintPath>..\packages\Rx-Core.2.2.5\lib\net40\System.Reactive.Core.dll</HintPath>
     </Reference>
@@ -107,4 +126,10 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/ILRepack.IntegrationTests/NuGet/NuGetHelpers.cs b/ILRepack.IntegrationTests/NuGet/NuGetHelpers.cs
index 3cbd9fdf..d367a0c6 100644
--- a/ILRepack.IntegrationTests/NuGet/NuGetHelpers.cs
+++ b/ILRepack.IntegrationTests/NuGet/NuGetHelpers.cs
@@ -55,6 +55,8 @@ public static IObservable<Tuple<string, Func<Stream>>> GetNupkgAssembliesAsync(P
  
         public static IObservable<Tuple<string, Func<Stream>>> GetNupkgContentAsync(Package package)
         {
+            // can't download from  nuget.org without Tls12 anymore, net472 is needed for Tls12
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
             var o = CreateDownloadObservable(new Uri($"http://nuget.org/api/v2/package/{package.Name}/{package.Version}"));
             return o.SelectMany(input => {
                 return Observable.Create<Tuple<ZipFile, ZipEntry>>(observer => {
diff --git a/ILRepack.IntegrationTests/Scenarios.cs b/ILRepack.IntegrationTests/Scenarios.cs
index 76335a42..e52b1a5f 100644
--- a/ILRepack.IntegrationTests/Scenarios.cs
+++ b/ILRepack.IntegrationTests/Scenarios.cs
@@ -53,6 +53,18 @@ public void GivenDotNet462AppUsingNetStandard2LibrarySetAndReflection_MergedAppl
             RunScenario("DotNet462NetStandard2");
         }
 
+        [Test]
+        public void GivenNetCore3WinFormsAppUsesImageResources_MergedCore3WinFormsApplicationRunsSuccessfully()
+        {
+            RunScenario("WindowsFormsTestNetCoreApp");
+        }
+
+        [Test]
+        public void GivenNetCore3WpfAppUsesImageResources_MergedCore3WpfApplicationRunsSuccessfully()
+        {
+            RunScenario("WPFSampleApplicationCore");
+        }
+
         private void RunScenario(string scenarioName)
         {
             string scenarioExecutable = GetScenarioExecutable(scenarioName);
diff --git a/ILRepack.IntegrationTests/Scenarios/ClassLibrary/packages.config b/ILRepack.IntegrationTests/Scenarios/ClassLibrary/packages.config
new file mode 100644
index 00000000..7547653d
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/ClassLibrary/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="BamlParser" version="1.0.0" targetFramework="net40" />
+  <package id="fasterflect" version="2.1.3" targetFramework="net40" />
+  <package id="FSharp.Core" version="4.0.0.1" targetFramework="net40" />
+  <package id="Moq" version="4.2.1409.1722" targetFramework="net40" />
+  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="net40" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net40" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="net40" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="net40" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net40" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
+  <package id="SourceLink" version="1.1.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/ClassLibraryCore.csproj b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/ClassLibraryCore.csproj
new file mode 100644
index 00000000..ee177907
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/ClassLibraryCore.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\image.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="Resources\image.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+
+</Project>
diff --git a/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/DummyUserControl.xaml b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/DummyUserControl.xaml
new file mode 100644
index 00000000..37172f95
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/DummyUserControl.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="ClassLibraryCore.DummyUserControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Width="150" Height="50" Background="Red">
+    <UserControl.Resources>
+        <ImageSource x:Key="ImageSource">/ClassLibraryCore;component/Resources/image.png</ImageSource>
+    </UserControl.Resources>
+    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+        <TextBlock Text="Library User Control" />
+        
+        <Image x:Name="TheImage" Source="{StaticResource ImageSource}" Height="10" Width="10" />
+        
+    </StackPanel>
+</UserControl>
diff --git a/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/DummyUserControl.xaml.cs b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/DummyUserControl.xaml.cs
new file mode 100644
index 00000000..d32e3fa2
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/DummyUserControl.xaml.cs
@@ -0,0 +1,31 @@
+
+using System;
+using System.Windows;
+
+namespace ClassLibraryCore
+{
+    public partial class DummyUserControl
+    {
+        public DummyUserControl()
+        {
+            InitializeComponent();
+
+            Loaded += OnLoaded;
+
+            if (Properties.Resources.image.Size.Width <= 0)
+            {
+                throw new Exception("Image from resource doesn't seem to be loaded! :(");
+            }
+        }
+
+        private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
+        {
+            /*
+            if (TheImage.ActualWidth <= 0)
+            {
+                throw new Exception("Image doesn't seem to be loaded! :(");
+            }
+            */
+        }
+    }
+}
diff --git a/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Properties/Resources.Designer.cs b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..0281d64f
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Properties/Resources.Designer.cs
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ClassLibraryCore.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ClassLibraryCore.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap image {
+            get {
+                object obj = ResourceManager.GetObject("image", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Properties/Resources.resx b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Properties/Resources.resx
new file mode 100644
index 00000000..99f83cee
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Properties/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Resources/image.png b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/Resources/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..7eb2b9ad8705a5c9b521a00ebfa3849dfecc8af8
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_>3?$zOPHh5G(g8jpu4m4inKo_Os#UADZ{NOg
z<Hk92=Iq<IZ}H;AM~@z5UGm8usEo6~BeIx*f$s<iGfvg!lLiVpdb&7<So9_*NU$z$
z_}Ach^A3aCA||o64u)l70-bt?rIZv72r?>NOuZqb%w(bDpwecm^^DC&S7B0Bo;>Se
apb<}hbENYsC8hxlWAJqKb6Mw<&;$U~ggUnX

literal 0
HcmV?d00001

diff --git a/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/TextBlockStyles.xaml b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/TextBlockStyles.xaml
new file mode 100644
index 00000000..5c0a3270
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/ClassLibraryCore/TextBlockStyles.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="RedTextTextBlock"  TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="Red" />
+    </Style>
+</ResourceDictionary>
diff --git a/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/.vs/WPFSampleApplicationCore/DesignTimeBuild/.dtbcache.v2 b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/.vs/WPFSampleApplicationCore/DesignTimeBuild/.dtbcache.v2
new file mode 100644
index 0000000000000000000000000000000000000000..1708aa10e581e469e99438db43df9c292c4fa4a2
GIT binary patch
literal 81058
zcmd5_3xFL}d7j}J-cNy2#JFHY2sgW%2b&cz$!<axHeuP_gcvV@`<UIG<nFzfxpOz!
z5HTVmA|ghl6p>Oyq?A%bL_|bHL_|bHq=<-=QcA70XB=y(rMBOB%)RHFdpDV#y)!ZJ
z?>T3_Z+HHG&innZdl-gsaIclEj&568oSfY=ux6X__GMMOknhRl#;l%F(aqS!%0R|(
z?M$IJ<7SM#S7Ztm%Q$?%DQ&cJ?h3m&YB^=cF1p5&McIygu5)pFzH@Qs{Kff>O#9*m
zi{~%yS~QYboIP!R`}{=<@(UL%$YxKoGK)Jq7cc6}XBRH$>dLf_bXu83IiqbjQ`xjE
zQ?c@ASw+jqxFu(WU9c+3TXMPfk*>w_J2SbCY)7Uu+rF@)t3BT}vZ%9belD9^xG1}@
zGv7XcaYtss!pul6n{Qv7>%cE$E&NjMv<~BFYN0C(IJfGStL|A&saiHZZ7%OlZ!S5T
zDi>BtRVQavP93$~v|TvWvC5g;rgUHbAoHa9imo*Z{p?b4*s8dd^ia+!W*oazNuNKk
zVkk3SE?7&;<$|4KoSu?nrL%T1&A#=Nl$28~y7su0D-}oV(bUFDsc4)s)!%DI-V^#8
zbHe?Gu{VFgNHR7Xxdc9}k?!eEBVrLX<Fi@HN#{#$(Q?z3{HFB$R7Yw-`~37!ep4mA
z%Fa2ZN@>JRtzJHy!lSgCaYijfWdo8Dh|$x6ziu4X@b`^bwKrTAYYHr7H|{D0<_iU5
zFW0GBM!c$o$P84K<EBi@6g_4t)YvOU@mP~~{bR<Mw569!>WOdmNn5%Wy{DdBXRoy@
z)l6abkXy~$rF3U|$KrHPX?(m|wB5<{sv%acr+cc7V-?->GL%O3lt_7{VoHE(EvJH#
zt(GbWTmNd~9lLnBaY9e2P(Tf{raW9i&13b9S-DMpMHJS(R>dAI4x^wnP8hT*rNV@@
zv{JFgvxUh)Ys7+iD7huln67?MD9|!p&hO{j#e8Wq{nbrwshmOqp28nw<wkqjfe$4~
z4n=vUTt-=vUYf&uDt6W`-~+P+xAzFE90wF+?riZr&sdOZr~l2J-BT^NRmVD`XjNS&
zQ<yt@pqfQpagH@PT-sz6&zRql9hu*?a8V|YD$|<3&^YLl!OUh_psmh~TOTy?VJ$-0
zM(dtknj%HU&{)PPGi!$Qrx7g4w$C3~IC9!ZM@N2PduD#dD8{EcPyc8>*trz5nw9|@
z>PF~z-JA{@FAKxOOoKgkGWJkY-rv*|&5BUztHFvGV+EONerIaHvBz!Kp0Fw`X<bk^
zMaS#*EI@tT87WdeY=(`MX=Zs{?LlkQuDH%*isyLRV0KCcW}+RAE1MfN4OWu2mZruJ
zOl6;JQAcWiqzK%ckVQk271tVHK7ksMC(H|Vt7L|3S$nvonaiD)?U+9@lFN7I^ZA7x
zQ@2p{$|!8nJzhbTRIsxw(VY{7R8_+j3a6cxS%~ga$Kv@5toE+O#)V-cA*`yXJ}Yjf
zn9n$QrtNC!L0#caWcyGGH+<VoVHKWct{-r$3Q|a|E60={(x28Xh+fZE6R=<fI!6}m
zjHQ-ZPKnuafozM4x5BE4#I5RNW^I_-tj<>0)zBnwQNwa-wfk+?Vy0zw&S`~pTM~`6
zo<as~=^QieqUOd4N-JzDCu$q5F4r}+sTH;)TW0iEi<zC385D1YRdKZdnnpuvur!$|
z@SJtw&KRw*EOd`y2DQ|hJ{Cvk$+oQNi=cg0ZxqC({h);r=X%vcv&?zwvk2NZ^rNk?
z`95ruhBpss|C+Y_tt~G5?!yg_W#v1=H60r|Y1x>RUsfH#s0nZXo+mUH&t$cuws_-8
zF+$UxQr_w<jq~)bK2x<1)e~uGQ(hd?M;D`87-p+ru%ejb!*a}uOw9^50H#q?qdKCE
zT8t!M70tqH8cmV)kJ`TvU42h88_SW>hmlh^lMQNxMnh6HM%^T8P_!6HBAu-+71_L6
z(9CLLQ=L*bD*8B#lRz>XDqA^BPTE^7-l=Ssdn8UP%nIG&ns)LVFPDnwX|6(<R!A)^
z7E8R-$;;+^Exx9r$;Q#yt`I}b4Yf?@PR-1Wqm#+Hfn&`L)TpwNblf(CkqzyD&~?(x
zjARY}rbekoV8CG4lLEUdrr78ho0MN#nJn@i+7vORQDq~e7WHmyMTnA#wDIX&(@2v>
zv1QYuw&y~3ab}hXhbPN)CC7y2xR%2j7$eQCQ;4lF@bb8Z;cNQSbrMy+4uiI$>Y-Jc
zVg?ISn7M_}blK?ka6{J(4aU&3jnj@*$vkG)`OWN7O$b#wHWVyzbu<t|n62gA?4Y9|
zp2=!QEh<_*US0dXm_emQ`D*EbtZ>L$sG%<%S1X)Wn8*%nN?&e;OV4HXqn2NBHCdUO
z^v96pF5lu>MY<S)H-Rn^G0>bM8`U1N`J<0-#FdDc#&RN}4^)N2Wma9`(B;iEhm(RY
z%@$j*<UgQ1ilV!|7$B~GT(6xOEtV>-onxJAtg*-i^Lv2}%^0dl(HdoinA$6{No*A%
zi;@pCF^8eDDN)PQxY{R*DYbYQVk<70RYCh?XGGb+kn`pZRdrnRQcWU-wT$~qqs+by
zJ0Ylcg<Ad)-L7diLFD+Li;={-roQ3`pGLHr*roAQ^P*+3?J+kiWitmXXQbqeXRxHK
zr-aqHqDdL_e|An)jg1zUEnk__B#y9Rmab%DY4d`qaoL<dxi&+s9I2#+T&(LGMw!oB
zZM8N-Q;KX<)PnNT1j_tj%q^VnVEWf#mi1%V5nUqB;%vN0oK3-Rg}F&oal@rjfhWjj
zRUAWGVM<&BlybSi;!CRCf&t1YIIS=%i9&;#h0PyR78(MV&52rQ#I?SymTerYGcGxk
zLzXjPqa<WD)zh7Z$`*y~`RNVc^)Zzgw1d&d&5EL?-nR(dK9AV9a59@|5|X;A>w-8@
zAk~&=6=_1Y@O9@b1?jeMNVO$gpHELdp@*+$7B4h41>-cmJVIKb{di1?U#KXJ(z0ks
zYe}j;)GHgqRvktdgx?sKF_Xp2I40@_`Iazd$@>FKR7^G_Y7-`|itwyLDN85k*xJcd
z4;I<b<)6HS4JyJZIIS=%^x()edqS$pG@k^6u?o@(6GB&hGcrLNXUmF|rdX4zlUiX|
z=mL3~hV`9GE0i+U?6OTv%bb#1uvz}OP*~NJA)6Gop`zE9q08l&nMBiDP`RkKw8DtE
zX53UwQ*>ZJ#0Rw}m~oquC7Twu*`>!%TqD++((COqwT`8^p!eCFq8b%$<%n+71u@k?
z(3nO{e=XC<%7)D$ddua5VU>;6a)HiLx@z2%6QsDE@MJ4P4lFiIpv6_~sA|jAj)KT0
z{HZkv6h%|L4z`5V#t(xA!4#ZUm=#xTs;XRXVzMk0)TUFBT47j>wW*Y&&d<0w7lMyE
zNwsMsqZKB_)lWb)^kE(vdy4Zz==Nis0E?xdpU?=m!kALnf^YgwgH_fz1}|1&SF)9-
zF~M8c!6XCBX&|)1pwMGXkxTLc4C7`-gE6MHwR$L317tg*mep}>bCJ}w%ZQW4%1CM&
z3^Y<y+d?f~Zm5TH@g+L0F|C3IHA`j1qt-q#7Sn5rn9V_+&+}X{<YGTRUp+1r(@jaO
zFf6X+1^ssMVpfU;YgFh1S>dP+w$OVjr&(?>g_my$x@o-3S}&544z|LOxY}e)SDcWP
z!D4;B^E(&{P!QRK_EfZq&$zmmOwseImNQvf?;dn7Rj3t4WMV3lcy?xaAXuovAIVCG
z9OY}6QQr`g(yJ}LVQ7^|_z27DhVAF-y{x#(eX8zC*X7591m%A4P*(g;t+WYrRHjXX
z(nbemL!xeaiZcdQWo%y1$T2`4wnFi^8r}3G)5B}nfjw1vaGKKSZiHoHqBbMq8t-A+
zS}xs0Pdl$zA5t?YXw)^Q$VNrYBXK6JfuOZ5CoTF=Ry=BK#8rLKPp$R1gX&9#T4BU!
zj5Wcab#axRCdhI|(BGjZ1i+uV0Yet{F$RZW$p!>KD-4LMMM^)kSOG9l!g-b~7UViY
z24zE{))8?n|7M1ia+`443bP^Dgeg6j)sI>Z#nqsuYMyUpdkQvo!Z8Da2DO67CPa;a
zxMn?tqARUT-g4@jN|`aiAm<bu*{rAqZJcEkVg}0vxA61s<SZTlvH?-!C9c6t@y&-s
z=8%$DFqqktA)6F6PU5Wm@aY4S=zxq|`PHFT7!h03qdIOmbg{lXp0rv#lob!#A=2l_
zVyiO(#n-YGWa=nJU_eTMvLPL*MUnP=##LvWo292Y^L@uO5`sEIdakM;Y7th$fMn>^
zGSLQ&(F()?%3@Js(1Z;h%KC>)M-BUi;~JO5F{AXXQ`#%)wJT*h%Th08gK^2JNUCAc
z(p6jsqewc_WEC8YQhzKfAGIYCI#o?`jIyp}YB^4?WTjKE21~<aGon@zaqYL!R895u
zi__JEPI$22W@kjzz-UJcgx+s6!+7eqN5|aF7X8WMESUAz?UQ(|FfXoFi>$V~9WrRO
zG-aqJMJumEPx3{Nu~n9v$<qz1w0sD5pGXD;c-<VF;vVskl>}l)8;EEULv=>or07Si
z#I;&WiUE2qKz->Si>F|<)|9MPm=?OYh}Kx3Ba!Tq2Wed+GcK4pZ$^;q3c1C&VKO1E
z#%Nt%9Gr%ZCo?7(z|cY2kf;?_d}%L;nLum#IEQ-Ln}XE})8daKzL{%^IO1R{4A~mf
zcxA9Ioi4S-niHqCcV<nok{RJEYHTs9wF|CnW_!eb(IrWn$q$q7Vez+dS9S`rY-rRx
z7uVSwK^)OqIN0+cp2=!QZKB6DtrV!O)lb1%u12^O#>Cd&5PLmV;*9KI8CR{pp<=Qb
zQIk?!qo2V?r<Wu-rE;xgph+tj{hWd$n-w*weKhp;@aZ;MMHJ|E30w4;KvydjcKvIz
z^-<S|gunWrMb?YPR}i5zlFPfWT>X_+SRHrqg1E!b63(aQBYb-CQioMzLUofH+J|us
z6$eq&U#hhZgP~#-l8xvHd5(_01SPfxl*oj&!Bv{zYK>eCR1JyN1&*!HD0D^f$d0e9
zFCnP)8JjU=lR}PSHk>;ZcVkI4X$4y!fvSM#9lfzM6<IYj+Jd>b4(bfDi>mwCxUY}3
z2ZMt;r>3dKh1>U|=dfgBu|8_iw8^V}i8@&}G-`z&TQ{>={z|PI=ZmXq-OQ<2vS}R=
z2c%+Nd>$;j*vaDa<`mVoP}NxUxt?h@L~0u2J_vi97b-z3S;JH_qLu$~WwW}f&Scr8
zS5}tCaF0}Bw1gEjW5TYWu-p|{HgtZ(<K;se8g00(xd}aDvM$JNQ?gVGqiu(Xt00*|
z=?Y&by9?7QW!bc-eYv<!ZEkMb@?x%(59V2ev#@qfZH1BB!VdDZGKCIo5{>?#R&Q=6
zrKvVXD>Xys!pNnjT-?+vYNb}6!o=DgeyX9-%GL1Q^p?gZP6NP1yOpn<#~B=+HI>a0
zUp71HcC*;}=gswBx3GP24^DozN9a}5VryW~KM(gSvei+WaG_ImE8|*k$xUJIxVCOS
zRNd0hX^(4ZR848x&kdHe1P|q?3ELUeyAd(ZvIVN9aFXJ<&5q>YO}1c`tr<bJD_Vra
zH6&Em7b8MByPV<Og<wdi5tfaKTD>P#^PxTvHi?X=^k*AwO9`54W3-wtu7Q@C*34sJ
z!)MTP2?ko4GE|eI)p2nRf}yuf531wK^{~W~#ZoW`rh~E}Aq$Cyb#HMENeW%%14x4*
zNfnA<L_>!(uK5mn)Ml#IB&PRK4PbvUFXe*yjwv{@SyAuGjcXmgsxqy9f_3-`qM8sb
zpTxDSQc+Z2<`FEboQl*6!{Vxh6rC${y96r&f=Z|nmW>J7bZuzjwEWh2F-^p@tqq<I
z=}%SFL)9$}s>ho3aS3>}ka6_Q>`K;e<j7`4ZB~cw^+#(~50Bw&1lG@QJiMZ2U2~3X
zUC8v-P+rHDd1@;6jAe>NOB^&@%RCLRYD}mit|0}+mU(L0(h|Csd4i|1>QNh?aUES#
zPhRKZa-sq|zlIfKLD!%ep%n(jR^0?&JvE%EY^tQ_7{f@Rw3!)It8S(s$%ZY8IGqsJ
z!jyVMaKmU)3x?b^Og1BGf{Sa~PE%EH5Cj8!Q`2PQLf)^}P!J@Q_>?0_rb>JPNj5C%
z%9FS{J5qG8tfO>xbWk=VYVwP}yyIFA;Eekz%DXzD6$T|xEZEq<$82d*EKsZ!X2i9v
z6(`kW%_`e{#XD`mwpJOC4G7tbZdi8_TZ2Y6pud#UhNNUOQVdp&iPoTrYsc8yOrdHG
zSIgr3)L_S0{jsWiw86o+&hrU6V!?Sn2&?KM>HG;DGEUW{=lQI0?Lu&DLy&<rOf@4~
zl8L#y5)4`5N<r75*M|(+*{oQS6LeRm;HcJxizI!Iaa=321C?o`D_EH=o<&hxAO8<M
zDK6fLTMRb2r82$p9_Nybq**&C?Z8*G+*}Dg#&Q|Yg5Ff1{S*td8)4O^Xx;so=QIMP
z>B=^=^6NL`1s#`W1l6u+Ni6h5LqdUwai!R`Ja6NWR9-O#8%3MhmlDKQ*crM7)(Si2
zkxj+0R#+1AdDnryeZ_LsO<|XmUB*xp-AB$NEZF(F6J9H<Oent%I93H`!qivF>iJD3
zw8E~?r!7QFhwCz8tzmFzCw<Tgz2j=$1T*SE^9JEos2kVZIaQY(U`exhFn1n2Y=z=+
zb$O|dd=F=nU4l9&8xnOOIj$?+sIHjE(-yb~S8Fw(vMEtJS#eE=QDxWlmU1}pMLU*C
zL1Yu64nV}!UuTMr7Zf9c=Dvot!i+c*71RyVl^A%C6P1Ft!j!m1@7Y%$$hc!{>?9by
zuRU#r>Tw<6P*YON6~Pe>P4HHj6M76~npN_ezNJ;S#1Hb6&IMc3_*}LkWFghCo+9+F
z>=|1zWMeskQ<{Jy8u8gilN3?}`x-{N;%dOlss~oFtaE-dB!VRkF%`NHn?X#`12%Yj
zeONYwJ#K{!aW!Lw$;&bozTbbf^q>`bhn}^c=C>Dg*3G56a<TWKc7E^rDZp0PbD}s3
za!q--gt<YhXUxiNI=AYg@5ToahA~uboJbG7C`@1x5xxGx>b1(aGta`ZJgXwHju(Gx
zsP`O<!dMOn3Vy7>S2#FynI2SJXBlr>W#^nyr8I&gnU@duV9bV&<`{b}MKk%hI@b7A
zjo_~?EoKUnTT!A&8XYa(80cNvTr6OxX~lTE0D91H!ZG;*7ng@u4BXa+qw{mFFgwpr
zlwdJZ*I9bcc5``mnp#x3P#geq>Zt9e?ZT;!RmL|<_w^4lPfCj0VS27^dMIZVGmc%V
zq_KCXQt7v|PR5y}A0VBzi|Jk~TOHMgv2-FUZLW<)g;I87I2Cf0vQyfK?^cHH;}|J-
z>#3$md`sW%jIcW>q;!Fvh#2KF_GW{9MsL`^(wKszKQ>2;_o-6yF>1Q1rwQW(fhhTD
zS=BDc*=bJwvz|Y&Vkkqu7gBqHu7}4s2}}L7e;9^W&S#A|^^`K@-=n<aMS4aI)m4_F
zqAkegh)S0Fn`Gj%^wd``g)lHm|J(IsLa_?tPD!O2lf3@NQ#@T6hlw*?BxU!TS1jd9
z#Swedm^H7;PIx)h*l!;0g2FMw`BRPAz&B@{Vt2=B?HzORqm%v+zRvdcE@S_BBTxh<
z8;(`rFP189zF=ohF^-sLIZnwz)-5@1H`4WZ*){f^$Nty?WA41XHDVX7?%~0uJ<H$Q
zyL{Q2v))V7=DCB*mkta_-uV}H7>Dt{h2pY+NiZ6_#!>Td!w9~tW95-9GR4tut9a^~
zA>)vFV>lj;7D&iM6PZ(t>O97y#b|e1E7Et9A#uKn%Ffm%TiT3In9_T9d%1S8q)h0K
z(6p#%Vtu`0=@}Z!IBauVn{i1pujD82prwK<b%QM5W=tgiauhX*8I9t1ey4Ucew%TP
zoa92s^3IC#okliS0_z{`itAv5YYy#{ikPCKm1&!?eYYyaRJeS1sK6JxE}uXt#9IGt
zh8<^m9Ixa`4$55q(F<|D3NwKf7l#;SoIHQqmMCwVW|ET!|9eVk)3TVoEQy$vUtMc}
zrIzCKBd)|pcCQkhT#GAquNM8bE8^s%yH63;=0P36(#8i9PL=hfvAdIIf3?UCTx~NF
zDfyb`kHOL;?t|x15veAgK>@L*FS++(CMP$h#k~_H>4j}+i5(Q^<<NST?oMLqt(3q!
zmsLm5+7{JW5|JuwrMs?rOY9!UHsjI+3>95ZHq(x;jC*e|1S39lCE@o+FU+QyqGY4{
z#>cB}a9?2Z-+Xnc$WAd2%JL5-{LP2TR*p?;TB3;)t)VgP2pBJyib!aD>*vy9vBZ}{
zh#VKKil3PhbeBVeB9XHG%=BQnV0U}~)`F*l;Q6JM$)admd^l1YXJ%hOJ<TI(-99rN
z=%fY8Lu}~5iEq5#`E;aDG0n=oRu9lYs;U^!ha&ZmbcS?WwBep<e;MiR$yLEH8uJID
zT@`CLulCJ@&Q=l?A3L}OBb4KOWp6Sy4|^&7F=V;wO4c?biBHVl&kDFC#wkU-^6_7u
za3gh<rkP)Q?aU}07^bJJA`xS*C>IQjOeRpf%dclMLEQ3a9i$nUUe{xY-A};PNMr~h
zh<GU?SmoAV8l8z2Gx!)QaJIadDWvBsb1goZV1-hTjS4-&W`rJQiaCOw5{`uoD!5q3
zu$#mQRzA={RQ@rN=<LWJVaUZCE4CEnL=B_NV1yn{o<WkJ#|7|ZkxUEuO6N8s>4IVy
zd-y~|B+&zrBZ65k7ZFJ(L#lu{N++Q~{90acFk@PBCdC;sA_7Jes3f9ywWGCXd!5W?
z`i<oVPo%ndX0Ml<0+G6QGkZPz>RS_t-r#fVJ*mw}ynC{k8OLx&aB4I&I*CH%tU@W9
zDcD>2BB&mW$<mn{k*OlJH>X*;s|ql?qs<A<=)HQoK2kQDrUrfI(wvPY3hZFK)H0k-
zS+IG%9x0p6?Dg!+Co*uM*-cw{qHJe6B+;hPR9J79sTTa(Z%iP&<NeIms}gL?;+@i`
zZZZ|0L~d7=VBa8#QcitsuVYVG^&Ukc#f_?gUd1F-+(_|%KD}l(=))vYyW#`%VQ2~~
zU-Ls~zF~1I&jQ<$$!@ExakLp%VSlofr=LO8aFLqL(b_Zk0DSdpt=XK&RJbTw>Dz6(
z(!5E=FDDZP{QWG?Cza*a6wzTvQp@w`$MK(5M$8i?F>)8|KWsB1t$~?lh0fll9YmMR
zU^jbnaGX$bEg1IN^Qx9JS)Yn5CXkkSV&ZmgO5lB~Eit#8L`J1AqsM}9^O8un!5h`V
zoTO}Bm9g1DOl?LIwIH>1H8y3i_21QC<4H2}80_7ayBWJDwCn2HjHJHyK&|piqKiW<
z)|*;xLK$|@y0}XBo$!2=)LUz(S+i<3soWbJ*IcrbTm?g8cc_Ft2*F2Aq60%;iqnzm
zyF}ZJBswtSwJX`(&h?cz$tEt?joF7Sll-ko^jU=2K`hH(J*n~oMhCBFc`A{T66Xv!
z;=ajb+K#mw71y%Cbx~?1F{OWQmhOP!OPbgRjx^jFtxJZwq3G6Xq(nL;*bYYbJ7Vcz
zs@JYyOH^)5%2P?K43#v9{=KK!HId%AeB2hT*+eGS^*8tRvz3E<xSQD@ZE}5vAD|x_
z(A>=y{h3^8Du0VDu7xXY#Zgf)Z%PtF5Yp>cS#Bne6*arXcD+TI$e_1mJY6NH&o@L%
zgwaYp+V`kBSVW+mft*ZDQ-3=@<cKGMgyJADJWxVe7MMh9Ie0OyZNN>B!T9UPB25EK
zw+Iq<nTid*PHp~t4cpSo<KfEPstMny*~3*yV#k6q-I_%IKX{>@|06YeA|`;9*qm1z
z08gUx5*SU7WWbi|TEb)1?~Wu>oUVb;tYJ7L+BVsU@u4dvO7-BYv9FY5+Jru67YFy<
z$GlNGXd8&aseV0uLbZ{2Z>|5szIGB_+aP+88`Kl>+KfaCVfFp=Se%TDY$|$yiEM0X
z{wab>fp+Wn*gb7Ukto%up=YYG)S2Y8VQoCI$+Te-byn^D*t;w4`%Wl5)ZZ-MnX6vW
z9aWWR?e^vxiA%KGj6|ByQ|Q2NyKXZQ*@4wuhuR%{ERTFVQmdks@e*7e9W{+ivoX>9
zqv*v~w8mCTKZ||`bJR0QTJn9G-H;qL!dm&2YGr*Aqs_IX!*WiNBN4SXYxe^uGZ$Nb
zd+p-e-B)(dp=f@gut-O|u1}&RTKf*nBi)gkOcPvm2bKG5lj(GbH!C}8lIRaBH*{hR
zuyki^GV66z1z4g_Wb#9OuRaEnL?2htpmuj^n-S~bXQGeG-d*q2B$m<|uOH=QOSHyX
zv}&$?Ra=veL?RJiyLnN*_cNi0uf3aPwIo)&*1xxUy=K(CTGMQ8)nDIu8D^W2M8{Fr
zfPMKyMl<v`>&09$C2cLq@d!{CXC^VzA$^A0&5dnFvT2{|5L~sGc)|<rMQk&YSpJ0_
znaWLu$uy#sx7My7Y%`Kr$xy!*kXL9)ti`1_<FT?Ni9(FNOuM2l>KIG3YCGtQuoD^7
zTlLzEBqrzr1=uH#Ho`SC%k|Pb$?kDrymBQQ`x4Ri-OubxC|XDt!$mCATcHg57D?`*
z3u0u7E7#hL-H|-x0~UGN6lvXFv<L~VF>5oDD18$h7o#srb_WlAqki>QGRIobH>=Z4
zEN>;TqME*1xmzolb{c!FdLLGDpBgU@zILz%D2WjWW^-`kR5FYH>aWz|I8vv7nq`!H
zp^m(EJlcAz8NXb)X^EHAk@`b3Py}P0>^3O=_DBcj%;4>{yN=q7B&sN(X>dhR#GM+`
zv{%qsYl*Jxk?t32!`&8ndd<u!xPpRty6MFibn~Kd@VpW1O2$bXqs8up9i7Ip^EO$N
z^ij8qT|^gF@ccqNNmYuQaD_&x?Aqh@R_j#blzFA9+a2<nlj|@mTE)^Y%Wb^oV)jW}
zx)!}BUAw4ZHeZZ4d&sTk?NYk4y<>5j9z;_u;<E7cF!s^TX6GNJaV8W_ZJW(*1*+H;
z@iaY%7tO|rc@_N0qCH;4MJPG^I=#*)Pq9i$sL}@8-HbB|r8eWXk1dvQ5W4{cXKK>R
zK~6Oem{)a2x?m=*N@5=l%TvbjH|b$<rx=IMqc?lt$Vs}Ixw|XXZk#?3dw$ssMLBi^
zWcMzv)<{|GmSavf4p~~MSmW8kBs(A=S1}I94#6Ui)zlVxX)B)Xk9>rP9jE@T`o|A$
zRKnrQbH%}BXH3v*bArFQ)Wy=OY!y*Tf3vgxn^WE<6Z~eN&E{Pg6XyP-sa}?@>m%7b
znzE^~N6L|MO84qD9gEr*8v75kn4@)yamWfA-<@A+#U9LBfm>ggZ{NXE$?dfrV;0?e
zkE3oZW4~I@$~a)qqW2b0Sd_6Je((dHj02Hms)$z(%<98MSS}Kuada=e7Y6$_5DRqk
zNbNPpXh8i>9ibs~52m5hC5`$j=U9{66ywly9eb3T*5_K|^ypt>U(D7`;3Na%0Gy4K
zb8O^BTsLz7E-|X<xc`bOO_1z82i4C1rq)xl*d1T_6}a%m*jFSJV?U&^RlSUHC{~N}
zTfHa+f7Uo``FPgKi<N?`80DXmdW~5t?V`)SGcv7Bi<6`2_CtKgJddB60>%M-mHK=3
z$A<V)ag-@}uvmo^sIzZRwcu7A%Q%Fcc06L|0_2FkN*^v#vU9dum}KA8${YJGE!fDh
z6=N@MviL$Y`MStM^t!6xrlwUHXOra^2L_*&YmT_2#hq~&*O<mG&YEM`k;<b$jak9(
z8+)Rdp>e_zgK->v7aNHhLKGDWSY|CU5iU`qA4Ysy9=k#QG7jo1<_gt3<3i(umT!@R
zhtv;W>$fJXf^kWl`EaTXihNjxmHQd|-@$P1+ru!v3b`NhHOK>yuR|V$d;{_j<eQL(
zA>V>L0{J%NQ2g$raOv;TzwsT&bpOUN_#2Pm_r42x9P&K~{X0)Uz7Kg4@&m|IkRL*x
zhWrTf4CKd<XCXg<Q2m~R{1oy$<R2g}Kz;@>@s1ba?g{tja4GjC$UX@F0xo^u%MkiE
ze+i+#i~o&R@Z%pL$HD(9T&m|kL1bNDLzw=4pl4Ve{~5nSb$T80FOX(Bzk%oU-)ZkM
z3}SqQm}C#KC)tbaP4;>7aI)_Xa|fBVl<Y@l;lKUK0pvh(5INXK;1F^sIgA`mj#x&H
zByS@}kt6Wm{^V$K4EZy1tdGE-ljF$S!8m@0c`bRz4)d+=k=Z@uoxV@n$ZVgS;Me{k
z$o`QNIsPtkqKcm=@HrfRH<_d2a|C`8$KOLvQt^`nelo{TAt$T&$pW9t@l(lM6`w2c
z6vyY0l!~VW-p=t3(yrp|0`KJbeA21nodRFL@r7i8iZ2lOB95O%7OD6mfp>9yG3iqA
zE`fJ*{Jo@G#k&Q5I>*l-r>pqs0zZ@E?;~fb_?ZG<!tteKiHa`~_%e?7kYy^qOyIp7
zUru^eyjS2WIDQscq2en9zLMj8WTlF)6!_U3KZl&H;%5uIpW~}Yzl!$@d^N|<C973@
zwZI2BejXW6@d1Gka(svks`#M5hdI8646FFCz}Is8e6m)>*9v?c$KOxZsrWj9ujlv&
z$a)oDFYq+SFCb|ZPYZkl$1fxsRD6TLFXDKHT%_U`2|Ua39LcJ9R^WM#TO_aId4Z2`
ze3Xo+_=v#AIBt_M6(1A$MviYH8&!OxzzZB7Cj}KR2)xMg5-F;9QQ&2cUrfp>UKY5+
z@d|NN+!46T@hWju+!go)$2XG+6`v6J7LHGnEh@f6;9EI<3E8URTLr$2;~ym3RD7Gj
zFXi}$$fYWNslc~${KI6sif<SAWgPzqxlF|`6ZqvE|0ua!#V;556&(K<xkAOS5criG
z|2Vl)#jh0jRUH2Wxk|;a68O~||0KCu#jh6lH5~sGxkkmW5%{$n|1`N)#jh3k4vv3@
z>`?I?0>6&qpC#9+_;mump5uQ(u2=Ev1%3m^|B~FG;x`EVMvi}u+^FI=3j8LHf1cc=
z;x`HWW{&?Axmm?;7Wge3|7&uKir*seTRHv(a;u8pD)8Gl{zY<|ir*&i+d2Lva=VJ(
zF7P`z{x{?f6~9B^cXIr1$(<^Gr@-&x_}`JcRQxW1-_7yACwHs(-2%Ud<6kECsQ5hs
zzn9}*A@{2Iy#l|F<6kBBsrY>Yzn|k@BloNL{Q`f0<6kEasQ3c{e~{zfAP=heg93ku
z<KH9?srW+zf0*OnA`h$h!vcSV<KHHasQ4oSf0X0jA&;u~qXK`7<KHEZsrX|8f1Kmr
zBaf^2;{tzz<KHJwsQ42Cf0E-rAWy3JlLCK=<3A)%srXX@f12YzB2TOM(*l2n<3A?P
zsQ5Dif0pAvA<wG#vjTsP<3A<OsrYjOf1cz2K%Q6e=LP-($A3m%Q1KT8{vyYJPF_^;
z7X|(j$A3XyQt_7r{xZjZNnTd*mj(U`$N!PMqT;Uz{8f(s6M0p|UlsUk9RFwXnu@<B
z@Ygy1FXVL<e_h~jaQt7%8!G;Wz<<T@e<QzA@m~r2*Bt+M@@p0UwZMPF@&6#dQSsjh
zoN(MDM8%1~f6H;7{8q((EAZcO{6ER>RQz`W|2@b5i~L^2e=qPiIsV_|O%;Dr;D6xw
z|ByeZ_#XuR7RUdWyrtrA3H*;7|3C6a75^j0J;P)K&otpxC^XFed3y-Xo+i912Vu_H
zOK|o!y}dLJ!kn{@;OuL9`)C}5IcJvO>}PtjG!DX?v%laRV0!y&9E3UNK*2f4^bXWG
z2y@QCf^&%J9jtK>=A1(X=P=VdRO2AbIfo0*5vF&z#zB~Kjuf1?nck5a2Vu@RN^p)g
zy`wY^!klxA;QX2C9iwp&=A2^%=g&>=SdD`)=Nu<EZ#TW;G!DX?bG+cZ!}N~VI0$pj
zY{7Y_>CM(S2y;%G;GAH3Z5jt*&N)$V-er0xY8-?)XO7^!+w|sW9E3UNB*A%)>7Ar;
z5ayhd1?LpgJ6Yo(%sF!f=Ty_1t8ozKoRr|qGrg3?L6~#e1*gOG+BFWsoYN^d^G&Z)
z;~>mA3j}AO=`GMW2y@ON!8y(J7HJ%WIj2i-7Mos|#zB~Kx&`OGrq``;5ayiI1?LRY
zJ6+=-%sFQY&ihR7OpSvu=PVJNrKYz;;~>mA%LJ##^p<HHggK{IaF&~1uf{=`b5;n>
zS*Eu_;~>mAD+Q;|^j2ydggNJI!8ynD&ek{xb56hDtTMfRje{`ftQMSeO>ecvL6~y}
z1m`@{8_+libIzdP44K}b#zB~Kh6QJh=?!ZfggIxe;GA!IYc&qSoU=}F-fw#AG!DX?
zvtDpMV0!B{4#J$17Mu%AFRgJ9=9~?JbD`;N&^QQl&P9TgF};g44#J$16`Y*uWi<}M
zoRb$E%k=UZ2Vu?`5u8!e8__rjbIzFH*rqq8aS-O5je@hu^fqc7ggK`mIOC>Q&^QQl
zPEl}5rdQNB2y;$Za4t5zvc^G}a~#2`n4Y6?5at|LaH^)~Y8-?)XF_l`o8E-RL6~#4
z2+pMGZP7RgbIw-5xy1CgY8-?)XPe-B(Db%x9E3UNQo;F<>0PRE5ayiig7ab1+pcjC
z=A6p}=Od<fnZ`kwb1oO0kDA`)8V6y{xk7M0W_nj>9E3UNO2PTK>0POD5ayh#1m_c`
zca_FLm~*ZcoKKqG)fxw3&bdZ#K4p5>XdHw&=UTz}wCP=|aS-O59fI>2)7znO5ayig
z1n0A+cb&#Tm~*ZdoWC%=>opF-oO6TV{H5vLpm7l9oErt_bEbEr#zB~KZW5f&o8C<t
z2Vu^+S#bW!^lsKT2y@OYg7ep=cZ<eBm~(CwoG+N(tr`bm&bdu+zG!;4X&i((=XSyQ
zlIh*9aS-O5I|S!%Oz#ejgD~gZDL8*?dUt9ZggNIf!TCGWyG!FB%sF=p&flBf-5LjB
z&bi0LT$1-?_VZr$^DFqd!@JMy^}cF)_nW=G_ciwX0rvCj?B|2{`PLI;_HrK+P2M-m
z<=#Uk9G{$sCnx%34xBkYISI~5J~<iA$v&A2XRc3Da8f>LhtuwpPB@)DSpa8&PZq&h
z<dZHqT|ViC)9sVf;hgT1GvS=+lO=GL_+%NJWj^VJ)9aHJa8~$aC7hK$IUCN|KIw<k
z?~~PVR{LZC&VWw_;SBm@7|yUy*1}oqlXY;``D8tu^*%|%N&932oDDv?2+l=5$->F{
zBo8O=lMy&0J{f~E=97(ZHu|Ihr{I$!oT5+4aLPV$;5a^U;kZ7TfHUEfEpWE@WGkGl
zKG_Cmn@=u<bE!|Z!`beW%ivt*lgr^;?vpFvT;Y=|;ausHtKeMaldIue?UQTZT;r2#
z;auyJ9dLH|<T^Ol`Q&;y*ZbrKI5+s@MmRV6<R&;b`Q&CeH~ZukIJfxZRyeo%<Tg0B
z`Q&yuxBKJ{ICuEuPB?e^<SsaO`Q&amcl+cXIQRJEUO4yq<UTm}`Q&~$_xt1lI1l*b
zK{yZk<RLf@`Q%|Z5Bua1IFI<`Q8<tK<S{sp`Q&jpkNe~aI8XTGNjOjX<S95$`Q&Lh
zPy6H<IM4XxSvb%7<T*Ic`Q&*x&->&BI4}6*MK~||<Rv&S`Q&9dFZ<*bIIsBRRXDHu
z<TW_2`Q&vtulwW;IB)pmS8#silV8L6wNHKn=Qlnfa0rGK;QZDnzk~BTpZp%q?|t$n
zoHu>)2RMK5$y;#V^2s0J{Lx3Rd^!E$qbm;29`Ni%J$u2k5B2N=&n)Vh1<(G}vp+ls
zQqO_#985h2!*eM09173j)N?pIM^ev`@Ek=wN5OLp^&A7wvD9-cJjYSbaqt{ZJ;%c{
zn|fx$(?&gQ@SI3JC&Dv_dgj1$67`$}&&kwtGCXssXD&P`>Pf-VPCf1LbW%?zJPW92
z0X&PSXAwMI)YAn|H}!PGb2{~$4$qm?b0$1XsAma0%cy4=JiXM@3(pGbSpm;V>RAcT
z+0=73JpI(u56^1qSq;ws^$fr>NIiq_3{%fAJZq_EEj;U}XB|B2sb@VrY3fPCvw?ax
zz;hAxTm(;+db053sV5K52=$D>Ge$jQ@NA@>jqntxrvOipdW!IrsizE&Lp=^WF7>$Z
zOi<4RJX@$|3p`t?XDdA0sAn5Imr~EA@NB1^?eJViJ(t0AIrUr)&lS{j1w2<$&z108
zMLk!+b2ar`4bL^ya}7M#QqQ&U?4X_<@LWed*THi=^;{3n4b*c3JU3F$jquz=JvYH~
zGxgjI&n?t*3p}?{&#my>Mm@K|b366i4$mFba|b+kQqP_6+(kWi!E-nD+zrn+QDx9-
zWrdF)-otqEEt4FH3I-4EH@!!K2j6BD%%kk*ckuH%^0u>l-+RoYKflX<KF)rAk5Qh$
z&rhT3S;?!j@6*5eq^R8Rh*nCqf8Gy3e(MeIDRYVUL&(#RA3>gh{21~q<R_5lAU}mX
z5BUek3y_~dUWEJ{@)G11ke4C9guDXzN64#?e}cRQ`De)Mkbi-^0r^+RuOR;h`8DL<
zA-{qA2ZTU8$ZsJ&<adz&g!~@zUywH;{|)&A<bNP<LH-x=N67y{j6IfkCS(uDo{+sD
zdqeht><gI%*$=Wm<N(Nlkb@uxLk@u)3ONjNIOGV(k&w4Rj)EKwIR^4)kYgc#4ml3;
zcF6INcR*%C-U(@goB%ly@-E06$h#pYLEZy78FC6_F62~53NjDU4(Wh&LgqsjKo&w4
zK~95oK^8;0A@7Bp4mksICggpPC6J|%Wsn|7FJw7n1>`KqN=P5%Y{)r~e#k1wYRI{e
z0mylfLC6qf7_tVk7IHph9pwFx^^gxh(vS-v8z2`#E`nqrSx63&hggsi$S7nCVna4U
zHbDxIaYzwTf|MZ_LmWs2;zFvB3CL#17RV%IE94T$HpmAdmqI=S*$(+I<TA)dAeTcv
z3b_LEG02sWk3+74d;)Sc<dcwVAfJL<3;8r;2jnx5>mZ+nTo3sR$PJLcgxm=E9ONd*
z=OH&k{t9vn<gX#OLcRdG4e~|E?T{})?tuIa<W9)nLhge69prAv-$U+!d>L{t<STnD
I*}nb%0i(LS_W%F@

literal 0
HcmV?d00001

diff --git a/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/AssemblyInfo.cs b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/AssemblyInfo.cs
new file mode 100644
index 00000000..8b5504ec
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/MainWindow.xaml b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/MainWindow.xaml
new file mode 100644
index 00000000..87ccb4ec
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/MainWindow.xaml
@@ -0,0 +1,17 @@
+<Window x:Class="WPFSampleApplicationCore.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:WPFSampleApplicationCore" 
+        xmlns:classlibrarycore="clr-namespace:ClassLibraryCore;assembly=ClassLibraryCore"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="268" Width="800"
+        Loaded="MainWindow_Loaded">
+    <StackPanel Background="AliceBlue">
+        <Button Content="Button" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+        <TextBox HorizontalAlignment="Left" Text="TextBox" TextWrapping="Wrap" VerticalAlignment="Top" Width="120"/>
+        <classlibrarycore:DummyUserControl />
+
+    </StackPanel>
+</Window>
diff --git a/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/MainWindow.xaml.cs b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/MainWindow.xaml.cs
new file mode 100644
index 00000000..292bd10a
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/MainWindow.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Threading;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace WPFSampleApplicationCore
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void MainWindow_Loaded(object sender, RoutedEventArgs e)
+        {
+            Dispatcher.CurrentDispatcher.BeginInvoke((Action)delegate
+            {
+                Thread.Sleep(100);
+                Close();
+            });
+        }
+    }
+}
diff --git a/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/Program.cs b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/Program.cs
new file mode 100644
index 00000000..d6309bd0
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/Program.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Windows;
+
+namespace WPFSampleApplicationCore
+{
+    public class Program
+    {
+        [STAThread]
+        public static int Main()
+        {
+            try
+            {
+                new Application().Run(new MainWindow());
+                return 0;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                return 1;
+            }
+        }
+    }
+}
diff --git a/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/WPFSampleApplicationCore.csproj b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/WPFSampleApplicationCore.csproj
new file mode 100644
index 00000000..68656a74
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/WPFSampleApplicationCore.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>test_sign_key.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ClassLibraryCore\ClassLibraryCore.csproj" />
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="mkdir $(TargetDir)\merged&#xD;&#xA;xcopy /Y $(TargetDir)WPFSampleApplicationCore.exe $(TargetDir)\merged\&#xD;&#xA;xcopy /Y $(TargetDir)WPFSampleApplicationCore.runtimeconfig.json $(TargetDir)\merged\&#xD;&#xA;$(SolutionDir)ILRepack\bin\$(ConfigurationName)\ILRepack.exe /keyfile:&quot;$(ProjectDir)test_sign_key.snk&quot; /verbose /log /out:$(TargetDir)\merged\$(TargetFileName) $(TargetPath) $(TargetDir)ClassLibraryCore.dll&#xD;&#xA;&#xD;&#xA;set SAVED_ERROR_LEVEL=%25ERRORLEVEL%25&#xD;&#xA;REM Ensure re-build is done every time to use latest built ILRepack version&#xD;&#xA;del /q $(ProjectDir)\obj\$(ConfigurationName)\*.*&#xD;&#xA;exit /b %25SAVED_ERROR_LEVEL%25&#xD;&#xA;" />
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/test_sign_key.snk b/ILRepack.IntegrationTests/Scenarios/WPFSampleApplicationCore/test_sign_key.snk
new file mode 100644
index 0000000000000000000000000000000000000000..781163bd878fec397fe1e5e1538fc5770efb4ca6
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50096|hl#^bsloDp5VATOF%M4sf&(}Jp59aJ
zf;goYa|t57AOD$6n8`W#Yh}AxU_Fk10n03YaqoJbrlEj+i~P*(rqlk&Bbu>8$P<SA
zrMr;V*J@@FrgnP2l40_lX$yAjG}_MeftO&>Y*$?8E$PQbU^;EEV<yt8%63SW^!>jl
z?_!y$ijf=uv7rX#f_|z|I&al`;Wq@?IGs$>f@QqG%`r}<W={)p%UH*RAox^&>b9*R
znZ)WbNlh8hcNoLRU{#9eaVANZF`IeR*D+6fAQ{|`o{c%pE&eNN<bv_N(X_QA%boKy
zg<zOSV{lT<MM?>n+G>vc?U(9fb?y5-JHBd&mWPyR2?@)oUtG^>v;JPBcRw)9bRxZT
z4(y>10~3q8L0)z`?=dfyyURD%39W#6nvMR{QDQh|2`Gr^2b@@J&K0T-Uc2Y8JMQ(`
zy*hT8_(GhT@ZZf_6INt5Z=Lwn94mg-h+{apK?y=b0JBr=HLsZow-S5pKKa-{>$*G5
z{6ud9pinylC#rjh)a^if-)Xv4_c%h9G4O)*ywcx0F3t~zq$WGL8GvD-PC8IbD<C)c
zwd^EMlR9|Qg!*!PJb8ANojk^i_N<%7QIVq4fPM5PGsB+Fol>gxzPBtlr}VBjq`y71
znNV$@N4i!=%Z*}t8OwlQ4m1ZRG)oTEbbVwgTY6Of4mj6;bIno}P++5_9hmycL1X=p
iC1RA#0%U6@ZVd9glWu4{)Fg~Eo}0(9C)>025v5tMuOy=Y

literal 0
HcmV?d00001

diff --git a/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.Designer.cs b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.Designer.cs
new file mode 100644
index 00000000..c1c6b13f
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.Designer.cs
@@ -0,0 +1,60 @@
+namespace WindowsFormsTestNetCoreApp
+{
+    partial class Form1
+    {
+        /// <summary>
+        ///  Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        ///  Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.button1 = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(172, 108);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 23);
+            this.button1.TabIndex = 0;
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.button1);
+            this.Name = "Form1";
+            this.Text = "Form1";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button button1;
+    }
+}
+
diff --git a/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.cs b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.cs
new file mode 100644
index 00000000..795eac97
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.cs
@@ -0,0 +1,33 @@
+using ClassLibrary;
+using System;
+using System.Windows.Forms;
+
+namespace WindowsFormsTestNetCoreApp
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+
+            this.Load += Form_OnLoad;
+
+            button1.Image = Properties.Resources.checkbox_checked;
+            new DummyConverter();
+        }
+
+        private void Form_OnLoad(object sender, EventArgs e)
+        {
+            var timer = new Timer() { Enabled = true, Interval = 300 };
+            timer.Tick += delegate
+            {
+                this.Close();
+            };
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            
+        }
+    }
+}
diff --git a/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.resx b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.resx
new file mode 100644
index 00000000..f298a7be
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Form1.resx
@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Program.cs b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Program.cs
new file mode 100644
index 00000000..3afbb10f
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Program.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Windows.Forms;
+
+namespace WindowsFormsTestNetCoreApp
+{
+    static class Program
+    {
+        /// <summary>
+        ///  The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static int Main()
+        {
+            try
+            {
+                ///Application.SetHighDpiMode(HighDpiMode.SystemAware);
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                Application.Run(new Form1());
+                return 0;
+            }
+            catch (Exception)
+            {
+                return 1;
+            }
+        }
+    }
+}
diff --git a/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/Resources.Designer.cs b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..0aae2a42
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/Resources.Designer.cs
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WindowsFormsTestNetCoreApp.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WindowsFormsTestNetCoreApp.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap checkbox_checked {
+            get {
+                object obj = ResourceManager.GetObject("checkbox_checked", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/Resources.resx b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/Resources.resx
new file mode 100644
index 00000000..1f7a8c21
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="checkbox_checked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\checkbox_checked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/launchSettings.json b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/launchSettings.json
new file mode 100644
index 00000000..a0949f4e
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/Properties/launchSettings.json
@@ -0,0 +1,7 @@
+{
+  "profiles": {
+    "WindowsFormsTestNetApp": {
+      "commandName": "Project"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/WindowsFormsTestNetCoreApp.csproj b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/WindowsFormsTestNetCoreApp.csproj
new file mode 100644
index 00000000..541274b3
--- /dev/null
+++ b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/WindowsFormsTestNetCoreApp.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <PackageId>WindowsFormsTestNetCoreApp</PackageId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="mkdir $(TargetDir)\merged&#xD;&#xA;xcopy /Y &quot;$(TargetDir)\WindowsFormsTestNetCoreApp.runtimeconfig.json&quot; $(TargetDir)\merged\&#xD;&#xA;xcopy /Y &quot;$(TargetDir)\WindowsFormsTestNetCoreApp.exe&quot; $(TargetDir)\merged\&#xD;&#xA;$(SolutionDir)ILRepack\bin\$(ConfigurationName)\ILRepack.exe /verbose /log /out:$(TargetDir)\merged\$(TargetFileName) $(TargetPath) $(TargetDir)ClassLibrary.dll&#xD;&#xA; &#xD;&#xA;set SAVED_ERROR_LEVEL=%25ERRORLEVEL%25&#xD;&#xA;REM Ensure re-build is done every time to use latest built ILRepack version&#xD;&#xA;del /q $(ProjectDir)\obj\$(ConfigurationName)\*.*&#xD;&#xA;exit /b %25SAVED_ERROR_LEVEL%25&#xD;&#xA;&#xD;&#xA;" />
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/checkbox_checked.png b/ILRepack.IntegrationTests/Scenarios/WindowsFormsTestNetCoreApp/checkbox_checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e94a5863a5f4dca7c654293a5f6dadf8cc6e072
GIT binary patch
literal 174
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y$ZW{!9e;y1H%P7;~F4~v%n*=
zn1O*?7=#%aX3dcR3i^4vIEH8hFFpI3k3oTjE#UqCOTQi(O*FW_W!fAjhZ$4tr>jQm
zM>kZmHT;TQ@K+?_*j=F*;YUv$v>AH;>o)x;<9%_9r}#O0(!B-en6|uT_)^Bj%Hv*b
Q2Q-<%)78&qol`;+00t&DS^xk5

literal 0
HcmV?d00001

diff --git a/ILRepack.IntegrationTests/packages.config b/ILRepack.IntegrationTests/packages.config
index 7547653d..1bdc5009 100644
--- a/ILRepack.IntegrationTests/packages.config
+++ b/ILRepack.IntegrationTests/packages.config
@@ -5,6 +5,9 @@
   <package id="FSharp.Core" version="4.0.0.1" targetFramework="net40" />
   <package id="Moq" version="4.2.1409.1722" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
+  <package id="NUnit.Runners.Net4" version="2.6.4" targetFramework="net40" />
+  <package id="NUnitTestAdapter" version="2.3.0" targetFramework="net40" />
+  <package id="NUnitTestAdapter.WithFramework" version="2.0.0" targetFramework="net40" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net40" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net40" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net40" />
diff --git a/ILRepack.Tests/ILRepack.Tests.csproj b/ILRepack.Tests/ILRepack.Tests.csproj
index e362ef67..fa767ad8 100644
--- a/ILRepack.Tests/ILRepack.Tests.csproj
+++ b/ILRepack.Tests/ILRepack.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props" Condition="Exists('..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -51,11 +52,27 @@
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="PresentationCore" Condition=" '$(Configuration)' != 'Debug_unix' " />
-    <Reference Include="PresentationFramework" Condition=" '$(Configuration)' != 'Debug_unix' " />
+    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.util.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xaml" />
@@ -137,4 +154,10 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/ILRepack.Tests/packages.config b/ILRepack.Tests/packages.config
index c43b0a00..b72cfa4a 100644
--- a/ILRepack.Tests/packages.config
+++ b/ILRepack.Tests/packages.config
@@ -4,4 +4,7 @@
   <package id="fasterflect" version="2.1.3" targetFramework="net40" />
   <package id="Moq" version="4.2.1409.1722" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
-</packages>
+  <package id="NUnit.Runners.Net4" version="2.6.4" targetFramework="net40" />
+  <package id="NUnitTestAdapter" version="2.3.0" targetFramework="net40" />
+  <package id="NUnitTestAdapter.WithFramework" version="2.0.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/ILRepack.sln b/ILRepack.sln
index 90d3b5b1..e62789bf 100755
--- a/ILRepack.sln
+++ b/ILRepack.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30611.23
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4547EE79-6D49-4318-B473-B5BBF73B434C}"
 	ProjectSection(SolutionItems) = preProject
@@ -48,6 +48,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet462NetStandard2", "IL
 		{4A253A60-D998-4CA2-B9D5-46567A2FBF80} = {4A253A60-D998-4CA2-B9D5-46567A2FBF80}
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsFormsTestNetCoreApp", "ILRepack.IntegrationTests\Scenarios\WindowsFormsTestNetCoreApp\WindowsFormsTestNetCoreApp.csproj", "{87B1E249-BCFA-46DD-B4A1-39196A8594CF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibraryCore", "ILRepack.IntegrationTests\Scenarios\ClassLibraryCore\ClassLibraryCore.csproj", "{DE44D3FF-04A5-45DB-B562-CEA6901486DE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPFSampleApplicationCore", "ILRepack.IntegrationTests\Scenarios\WPFSampleApplicationCore\WPFSampleApplicationCore.csproj", "{6851A974-AF84-4D10-B719-C4648BB50691}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_unix|Any CPU = Debug_unix|Any CPU
@@ -136,6 +142,24 @@ Global
 		{90F1C943-3C23-4091-B07F-0B34748AE056}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{90F1C943-3C23-4091-B07F-0B34748AE056}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{90F1C943-3C23-4091-B07F-0B34748AE056}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87B1E249-BCFA-46DD-B4A1-39196A8594CF}.Debug_unix|Any CPU.ActiveCfg = Debug|Any CPU
+		{87B1E249-BCFA-46DD-B4A1-39196A8594CF}.Debug_unix|Any CPU.Build.0 = Debug|Any CPU
+		{87B1E249-BCFA-46DD-B4A1-39196A8594CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87B1E249-BCFA-46DD-B4A1-39196A8594CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87B1E249-BCFA-46DD-B4A1-39196A8594CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87B1E249-BCFA-46DD-B4A1-39196A8594CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE44D3FF-04A5-45DB-B562-CEA6901486DE}.Debug_unix|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE44D3FF-04A5-45DB-B562-CEA6901486DE}.Debug_unix|Any CPU.Build.0 = Debug|Any CPU
+		{DE44D3FF-04A5-45DB-B562-CEA6901486DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE44D3FF-04A5-45DB-B562-CEA6901486DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE44D3FF-04A5-45DB-B562-CEA6901486DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE44D3FF-04A5-45DB-B562-CEA6901486DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6851A974-AF84-4D10-B719-C4648BB50691}.Debug_unix|Any CPU.ActiveCfg = Debug|Any CPU
+		{6851A974-AF84-4D10-B719-C4648BB50691}.Debug_unix|Any CPU.Build.0 = Debug|Any CPU
+		{6851A974-AF84-4D10-B719-C4648BB50691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6851A974-AF84-4D10-B719-C4648BB50691}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6851A974-AF84-4D10-B719-C4648BB50691}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6851A974-AF84-4D10-B719-C4648BB50691}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -150,6 +174,9 @@ Global
 		{6A827942-BEEF-4E49-A3A4-306E21428E85} = {04819B25-ABEA-46F7-90D5-149C8304F67F}
 		{EECC6459-78C6-4A08-9039-DE37E75866E6} = {04819B25-ABEA-46F7-90D5-149C8304F67F}
 		{90F1C943-3C23-4091-B07F-0B34748AE056} = {04819B25-ABEA-46F7-90D5-149C8304F67F}
+		{87B1E249-BCFA-46DD-B4A1-39196A8594CF} = {04819B25-ABEA-46F7-90D5-149C8304F67F}
+		{DE44D3FF-04A5-45DB-B562-CEA6901486DE} = {04819B25-ABEA-46F7-90D5-149C8304F67F}
+		{6851A974-AF84-4D10-B719-C4648BB50691} = {04819B25-ABEA-46F7-90D5-149C8304F67F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {54C7CB02-6231-428F-BBD0-113CC9852908}

From 017707cb8d1f6a6ec07870f4df200d75d8d0e00c Mon Sep 17 00:00:00 2001
From: Yury Malich <YuryMalich@yandex.com>
Date: Wed, 3 Mar 2021 16:10:19 +0100
Subject: [PATCH 3/4] Updated files, changed in maser, but skipped by merging.

---
 .../ILRepack.IntegrationTests.csproj          | 63 +------------------
 .../Scenarios/ClassLibrary/packages.config    | 15 -----
 ILRepack.Tests/ILRepack.Tests.csproj          | 39 ------------
 3 files changed, 1 insertion(+), 116 deletions(-)
 delete mode 100644 ILRepack.IntegrationTests/Scenarios/ClassLibrary/packages.config

diff --git a/ILRepack.IntegrationTests/ILRepack.IntegrationTests.csproj b/ILRepack.IntegrationTests/ILRepack.IntegrationTests.csproj
index 53a60e7b..200dea07 100644
--- a/ILRepack.IntegrationTests/ILRepack.IntegrationTests.csproj
+++ b/ILRepack.IntegrationTests/ILRepack.IntegrationTests.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props" Condition="Exists('..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,9 +9,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ILRepack.IntegrationTests</RootNamespace>
     <AssemblyName>ILRepack.IntegrationTests</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,7 +20,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,60 +28,8 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="BamlParser, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\BamlParser.1.0.0\lib\net35\BamlParser.dll</HintPath>
-    </Reference>
-    <Reference Include="Fasterflect, Version=2.1.3.0, Culture=neutral, PublicKeyToken=38d18473284c1ca7, processorArchitecture=MSIL">
-      <HintPath>..\packages\fasterflect.2.1.3\lib\net40\Fasterflect.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.util.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net40\System.Reactive.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net40\System.Reactive.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net40\System.Reactive.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net40\System.Reactive.PlatformServices.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -149,10 +94,4 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props'))" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/ILRepack.IntegrationTests/Scenarios/ClassLibrary/packages.config b/ILRepack.IntegrationTests/Scenarios/ClassLibrary/packages.config
deleted file mode 100644
index 7547653d..00000000
--- a/ILRepack.IntegrationTests/Scenarios/ClassLibrary/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BamlParser" version="1.0.0" targetFramework="net40" />
-  <package id="fasterflect" version="2.1.3" targetFramework="net40" />
-  <package id="FSharp.Core" version="4.0.0.1" targetFramework="net40" />
-  <package id="Moq" version="4.2.1409.1722" targetFramework="net40" />
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net40" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net40" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net40" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net40" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net40" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
-  <package id="SourceLink" version="1.1.0" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/ILRepack.Tests/ILRepack.Tests.csproj b/ILRepack.Tests/ILRepack.Tests.csproj
index 6688583e..0b279575 100644
--- a/ILRepack.Tests/ILRepack.Tests.csproj
+++ b/ILRepack.Tests/ILRepack.Tests.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props" Condition="Exists('..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,38 +40,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BamlParser, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\BamlParser.1.0.0\lib\net35\BamlParser.dll</HintPath>
-    </Reference>
-    <Reference Include="Fasterflect, Version=2.1.3.0, Culture=neutral, PublicKeyToken=38d18473284c1ca7, processorArchitecture=MSIL">
-      <HintPath>..\packages\fasterflect.2.1.3\lib\net40\Fasterflect.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\nunit.util.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnitTestAdapter.WithFramework.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     <Reference Include="PresentationCore" Condition=" '$(Configuration)' != 'Debug_unix' " />
     <Reference Include="PresentationFramework" Condition=" '$(Configuration)' != 'Debug_unix' " />
     <Reference Include="System" />
@@ -164,10 +131,4 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnitTestAdapter.2.3.0\build\NUnitTestAdapter.props'))" />
-  </Target>
 </Project>
\ No newline at end of file

From c110fc789375cbe9deea5930da8ba4775df91608 Mon Sep 17 00:00:00 2001
From: Yury Malich <YuryMalich@yandex.com>
Date: Wed, 3 Mar 2021 16:14:20 +0100
Subject: [PATCH 4/4] Fixed broken test
 GenerateThemesGenericXaml_GivenIncludedXamlFiles_GeneratesSameBamlAsSample.
 The test is broken sometimes, because AssemblyInfoRecords were not sorted and
 the order in the list is not is not stable, it can change in some
 circumstances, but it does mean the Baml is wrong.

---
 ILRepack.Tests/Utils/BamlDocumentMatcher.cs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/ILRepack.Tests/Utils/BamlDocumentMatcher.cs b/ILRepack.Tests/Utils/BamlDocumentMatcher.cs
index 2249461d..9d572f22 100644
--- a/ILRepack.Tests/Utils/BamlDocumentMatcher.cs
+++ b/ILRepack.Tests/Utils/BamlDocumentMatcher.cs
@@ -153,7 +153,23 @@ private bool Equals(IEnumerable expected, IEnumerable actual)
 
         private List<BamlRecord> GetRelevantRecords(BamlDocument document)
         {
-            return document.Where(node => !(node is LineNumberAndPositionRecord || node is LinePositionRecord)).ToList();
+            var list = document.Where(node => !(node is LineNumberAndPositionRecord || node is LinePositionRecord)).ToList();
+            return OrderAssemblyInfoRecordsByName(list);
+        }
+
+        private List<BamlRecord> OrderAssemblyInfoRecordsByName(List<BamlRecord> bamlRecords)
+        {
+            var assemblyRecords = bamlRecords
+                .OfType<AssemblyInfoRecord>()
+                .OrderBy(x => x.AssemblyFullName)
+                .ToList();
+
+            bamlRecords = bamlRecords
+                .Except(assemblyRecords)
+                .Concat(assemblyRecords)
+                .ToList();
+
+            return bamlRecords;
         }
 
         public override void WriteActualValueTo(MessageWriter writer)