From 0d83fb87fd99efadeed96d6c5048ccc33ece6e1c Mon Sep 17 00:00:00 2001
From: alistairjevans <alistairjevans@gmail.com>
Date: Thu, 13 Feb 2020 22:37:51 +0000
Subject: [PATCH 1/2] Upgrading to 5.0 compatibility

---
 appveyor.yml                                  |  4 +-
 .../Autofac.Multitenant.Wcf.csproj            | 33 +++++-----
 .../Autofac.Multitenant.Wcf.nuspec            |  6 +-
 .../Properties/Resources.Designer.cs          |  2 +-
 src/Autofac.Multitenant.Wcf/app.config        | 21 ++++---
 src/Autofac.Multitenant.Wcf/packages.config   |  7 ---
 .../Autofac.Multitenant.Wcf.Test.csproj       | 62 +++++++------------
 test/Autofac.Multitenant.Wcf.Test/app.config  | 21 ++++---
 .../packages.config                           | 14 -----
 9 files changed, 66 insertions(+), 104 deletions(-)
 delete mode 100644 src/Autofac.Multitenant.Wcf/packages.config
 delete mode 100644 test/Autofac.Multitenant.Wcf.Test/packages.config

diff --git a/appveyor.yml b/appveyor.yml
index 878740e..a7f0f49 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 environment:
-  package_semantic_version: 4.0.0
-  assembly_semantic_version: 4.0.0
+  package_semantic_version: 5.0.0
+  assembly_semantic_version: 5.0.0
 
 version: $(package_semantic_version).{build}
 
diff --git a/src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.csproj b/src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.csproj
index 99e6d2d..ba337fa 100644
--- a/src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.csproj
+++ b/src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">
     </TargetFrameworkProfile>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
@@ -46,22 +46,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.4.0.0\lib\net451\Autofac.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Autofac.Integration.Wcf, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Wcf.4.0.0\lib\net45\Autofac.Integration.Wcf.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Autofac.Multitenant, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Multitenant.4.0.0\lib\net451\Autofac.Multitenant.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Castle.Core.3.2.2\lib\net45\Castle.Core.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
@@ -111,7 +95,20 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="Autofac.Multitenant.Wcf.nuspec" />
-    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Autofac">
+      <Version>5.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="Autofac.Multitenant">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Autofac.Wcf">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Castle.Core">
+      <Version>3.2.2</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.nuspec b/src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.nuspec
index 180c625..8f4591c 100644
--- a/src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.nuspec
+++ b/src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.nuspec
@@ -14,9 +14,9 @@
     <iconUrl>https://cloud.githubusercontent.com/assets/1156571/13684110/16b8f152-e6bf-11e5-84ae-22c66c6d351a.png</iconUrl>
     <releaseNotes>Release notes are at https://github.com/autofac/Autofac.Multitenant.Wcf/releases</releaseNotes>
     <dependencies>
-      <dependency id="Autofac" version="[4.0.0,5.0.0)" />
-      <dependency id="Autofac.Multitenant" version="[4.0.0,5.0.0)" />
-      <dependency id="Autofac.Wcf" version="[4.0.0,5.0.0)" />
+      <dependency id="Autofac" version="[5.1.1,6.0.0)" />
+      <dependency id="Autofac.Multitenant" version="[5.0.0,6.0.0)" />
+      <dependency id="Autofac.Wcf" version="[5.0.0,6.0.0)" />
       <dependency id="Castle.Core" version="3.2.2" />
     </dependencies>
   </metadata>
diff --git a/src/Autofac.Multitenant.Wcf/Properties/Resources.Designer.cs b/src/Autofac.Multitenant.Wcf/Properties/Resources.Designer.cs
index 17fcb9c..d75697a 100644
--- a/src/Autofac.Multitenant.Wcf/Properties/Resources.Designer.cs
+++ b/src/Autofac.Multitenant.Wcf/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Autofac.Multitenant.Wcf.Properties {
     // 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", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
diff --git a/src/Autofac.Multitenant.Wcf/app.config b/src/Autofac.Multitenant.Wcf/app.config
index a5834e4..aeb08f5 100644
--- a/src/Autofac.Multitenant.Wcf/app.config
+++ b/src/Autofac.Multitenant.Wcf/app.config
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+</configuration>
diff --git a/src/Autofac.Multitenant.Wcf/packages.config b/src/Autofac.Multitenant.Wcf/packages.config
deleted file mode 100644
index e72687a..0000000
--- a/src/Autofac.Multitenant.Wcf/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Autofac" version="4.0.0" targetFramework="net451" />
-  <package id="Autofac.Multitenant" version="4.0.0" targetFramework="net451" />
-  <package id="Autofac.Wcf" version="4.0.0" targetFramework="net451" />
-  <package id="Castle.Core" version="3.2.2" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Autofac.Multitenant.Wcf.Test/Autofac.Multitenant.Wcf.Test.csproj b/test/Autofac.Multitenant.Wcf.Test/Autofac.Multitenant.Wcf.Test.csproj
index 3dc426f..25d4281 100644
--- a/test/Autofac.Multitenant.Wcf.Test/Autofac.Multitenant.Wcf.Test.csproj
+++ b/test/Autofac.Multitenant.Wcf.Test/Autofac.Multitenant.Wcf.Test.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\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">
     </TargetFrameworkProfile>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
@@ -43,22 +42,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.4.0.0\lib\net451\Autofac.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Autofac.Integration.Wcf, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Wcf.4.0.0\lib\net45\Autofac.Integration.Wcf.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Autofac.Multitenant, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Multitenant.4.0.0\lib\net451\Autofac.Multitenant.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Castle.Core.3.2.2\lib\net45\Castle.Core.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
@@ -73,22 +56,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -110,18 +77,31 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Autofac">
+      <Version>5.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="Autofac.Multitenant">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Autofac.Wcf">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Castle.Core">
+      <Version>3.2.2</Version>
+    </PackageReference>
+    <PackageReference Include="xunit">
+      <Version>2.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio">
+      <Version>2.1.0</Version>
+    </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\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/test/Autofac.Multitenant.Wcf.Test/app.config b/test/Autofac.Multitenant.Wcf.Test/app.config
index a5834e4..aeb08f5 100644
--- a/test/Autofac.Multitenant.Wcf.Test/app.config
+++ b/test/Autofac.Multitenant.Wcf.Test/app.config
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+</configuration>
diff --git a/test/Autofac.Multitenant.Wcf.Test/packages.config b/test/Autofac.Multitenant.Wcf.Test/packages.config
deleted file mode 100644
index 710e1bb..0000000
--- a/test/Autofac.Multitenant.Wcf.Test/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Autofac" version="4.0.0" targetFramework="net451" />
-  <package id="Autofac.Multitenant" version="4.0.0" targetFramework="net451" />
-  <package id="Autofac.Wcf" version="4.0.0" targetFramework="net451" />
-  <package id="Castle.Core" version="3.2.2" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file

From 2078d3aa0e3fca142eaa34f2995ee2d0e80644ec Mon Sep 17 00:00:00 2001
From: alistairjevans <alistairjevans@gmail.com>
Date: Thu, 13 Feb 2020 22:41:56 +0000
Subject: [PATCH 2/2] Update appveyor image

---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index a7f0f49..fa5753d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,6 +2,8 @@ environment:
   package_semantic_version: 5.0.0
   assembly_semantic_version: 5.0.0
 
+image: Visual Studio 2019
+
 version: $(package_semantic_version).{build}
 
 assembly_info: