From 1de9659c89e4d2d47aa381620ae921e21def9a08 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Fri, 20 Oct 2017 14:54:47 +0200
Subject: [PATCH 1/5] Migrate to PackageReference

---
 Unity.Wcf/Unity.Wcf.csproj | 14 +++++---------
 Unity.Wcf/packages.config  |  5 -----
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 Unity.Wcf/packages.config

diff --git a/Unity.Wcf/Unity.Wcf.csproj b/Unity.Wcf/Unity.Wcf.csproj
index 94e76b1..c6a7ef1 100644
--- a/Unity.Wcf/Unity.Wcf.csproj
+++ b/Unity.Wcf/Unity.Wcf.csproj
@@ -49,14 +49,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Unity.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.Abstractions.2.0.1\lib\net45\Unity.Abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Unity.Container, Version=5.0.0.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.Container.5.0.0\lib\net45\Unity.Container.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -69,13 +61,17 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="content\WcfServiceFactory.cs.pp" />
-    <None Include="packages.config" />
     <None Include="Unity.Wcf.nuspec" />
     <None Include="Unity.Wcf.snk" />
   </ItemGroup>
   <ItemGroup>
     <None Include="content\Unity.Wcf.README.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Unity.Container">
+      <Version>5.0.0</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. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Unity.Wcf/packages.config b/Unity.Wcf/packages.config
deleted file mode 100644
index 70a61e7..0000000
--- a/Unity.Wcf/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Unity.Abstractions" version="2.0.1" targetFramework="net45" />
-  <package id="Unity.Container" version="5.0.0" targetFramework="net45" />
-</packages>
\ No newline at end of file

From 775628e9ca03dd9e070813b0aed8deb5f7408290 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Fri, 20 Oct 2017 15:00:13 +0200
Subject: [PATCH 2/5] Simplify null checks

---
 Unity.Wcf/UnityContractBehavior.cs | 11 +++--------
 Unity.Wcf/UnityInstanceProvider.cs | 18 ++++--------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/Unity.Wcf/UnityContractBehavior.cs b/Unity.Wcf/UnityContractBehavior.cs
index f7b587d..71cefbe 100644
--- a/Unity.Wcf/UnityContractBehavior.cs
+++ b/Unity.Wcf/UnityContractBehavior.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using System.ServiceModel.Dispatcher;
@@ -11,12 +11,7 @@ public class UnityContractBehavior : IContractBehavior
 
         public UnityContractBehavior(IInstanceProvider instanceProvider)
         {
-            if (instanceProvider == null)
-            {
-                throw new ArgumentNullException("instanceProvider");
-            }
-
-            _instanceProvider = instanceProvider;
+            _instanceProvider = instanceProvider ?? throw new ArgumentNullException("instanceProvider");
         }
 
         public void AddBindingParameters(ContractDescription contractDescription, ServiceEndpoint endpoint, BindingParameterCollection bindingParameters)
@@ -37,4 +32,4 @@ public void Validate(ContractDescription contractDescription, ServiceEndpoint en
         {
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Unity.Wcf/UnityInstanceProvider.cs b/Unity.Wcf/UnityInstanceProvider.cs
index 5a3a1a6..1f570d0 100644
--- a/Unity.Wcf/UnityInstanceProvider.cs
+++ b/Unity.Wcf/UnityInstanceProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Dispatcher;
@@ -12,18 +12,8 @@ public class UnityInstanceProvider : IInstanceProvider
 
         public UnityInstanceProvider(IUnityContainer container, Type contractType)
         {
-            if (container == null)
-            {
-                throw new ArgumentNullException("container");
-            }
-
-            if (contractType == null)
-            {
-                throw new ArgumentNullException("contractType");
-            }
-
-            _container = container;
-            _contractType = contractType;
+            _container = container ?? throw new ArgumentNullException("container");
+            _contractType = contractType ?? throw new ArgumentNullException("contractType");
         }
 
         public object GetInstance(InstanceContext instanceContext, Message message)
@@ -44,4 +34,4 @@ public void ReleaseInstance(InstanceContext instanceContext, object instance)
             instanceContext.Extensions.Find<UnityInstanceContextExtension>().DisposeOfChildContainer();
         }
     }
-}
\ No newline at end of file
+}

From d10ca11231a9a92b7f9f9efaae5830fa4173a722 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Fri, 20 Oct 2017 16:14:18 +0200
Subject: [PATCH 3/5] Migrate to dotnet sdk

---
 Build.bat                                     |  13 +-
 CHANGELOG.md                                  |   1 +
 Unity.Wcf/Properties/AssemblyInfo.cs          |  36 -----
 Unity.Wcf/{content => }/Unity.Wcf.README.txt  |   0
 Unity.Wcf/Unity.Wcf.csproj                    | 132 +++++++-----------
 Unity.Wcf/Unity.Wcf.nuspec                    |  22 ---
 .../{content => }/WcfServiceFactory.cs.pp     |   0
 7 files changed, 60 insertions(+), 144 deletions(-)
 delete mode 100644 Unity.Wcf/Properties/AssemblyInfo.cs
 rename Unity.Wcf/{content => }/Unity.Wcf.README.txt (100%)
 delete mode 100644 Unity.Wcf/Unity.Wcf.nuspec
 rename Unity.Wcf/{content => }/WcfServiceFactory.cs.pp (100%)

diff --git a/Build.bat b/Build.bat
index 23f8f39..725716c 100644
--- a/Build.bat
+++ b/Build.bat
@@ -1,4 +1,11 @@
-@rem ..\..\tools\nuget pack
-@nuget pack Unity.Wcf\Unity.Wcf.csproj -properties Configuration=Release -symbols -build -OutputDirectory bin %*
+@rem nuget pack Unity.Wcf\Unity.Wcf.csproj -properties Configuration=Release -symbols -build -OutputDirectory bin %*
 
-@rem pause
+@echo off
+
+for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
+  set InstallDir=%%i
+)
+
+if exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
+  "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" Unity.Wcf.sln /nologo /p:Configuration=Release /m /v:m %*
+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83cca6b..748ab83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Changed
 - Migrated Unity to Unity.Container 5.0.0
+- Migrated to dotnet sdk
 
 
 ## [3.0.0] - 2017-08-18
diff --git a/Unity.Wcf/Properties/AssemblyInfo.cs b/Unity.Wcf/Properties/AssemblyInfo.cs
deleted file mode 100644
index 15c7703..0000000
--- a/Unity.Wcf/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Unity.Wcf")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("DevTrends")]
-[assembly: AssemblyProduct("Unity.Wcf")]
-[assembly: AssemblyCopyright("Copyright © DevTrends 2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("23d35d8e-4fcf-4883-a014-63e622391798")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0")]
-[assembly: AssemblyInformationalVersion("4.0.0")]
diff --git a/Unity.Wcf/content/Unity.Wcf.README.txt b/Unity.Wcf/Unity.Wcf.README.txt
similarity index 100%
rename from Unity.Wcf/content/Unity.Wcf.README.txt
rename to Unity.Wcf/Unity.Wcf.README.txt
diff --git a/Unity.Wcf/Unity.Wcf.csproj b/Unity.Wcf/Unity.Wcf.csproj
index c6a7ef1..dcc8889 100644
--- a/Unity.Wcf/Unity.Wcf.csproj
+++ b/Unity.Wcf/Unity.Wcf.csproj
@@ -1,83 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8D78E387-BD71-4399-8A8E-6AE0DC8600F6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Unity.Wcf</RootNamespace>
-    <AssemblyName>Unity.Wcf</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Unity.Wcf.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.ServiceModel.Activation" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UnityContractBehavior.cs" />
-    <Compile Include="UnityInstanceContextExtension.cs" />
-    <Compile Include="UnityInstanceContextInitializer.cs" />
-    <Compile Include="UnityInstanceProvider.cs" />
-    <Compile Include="UnityServiceHost.cs" />
-    <Compile Include="UnityServiceHostFactory.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="content\WcfServiceFactory.cs.pp" />
-    <None Include="Unity.Wcf.nuspec" />
-    <None Include="Unity.Wcf.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="content\Unity.Wcf.README.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Unity.Container">
-      <Version>5.0.0</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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <PackageId>Unity.Wcf</PackageId>
+        <Description>Unity.Wcf is a library that allows simple Integration of Microsoft's Unity IoC container with WCF. This project includes a bespoke InstanceProvider that creates a child container per client connection and disposes of all registered IDisposable instances once the connection is terminated.</Description>
+        <Version>4.0.0</Version>
+        <AssemblyVersion>4.0.0.0</AssemblyVersion>
+        <FileVersion>4.0.0.0</FileVersion>
+        <Copyright>Copyright © DevTrends 2012</Copyright>
+        <PackageProjectUrl>https://github.com/ViceIce/unity.wcf</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/ViceIce/unity.wcf</RepositoryUrl>
+        <PackageLicenseUrl>https://github.com/ViceIce/unity.wcf/blob/master/LICENSE</PackageLicenseUrl>
+        <PackageIconUrl></PackageIconUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageReleaseNotes></PackageReleaseNotes>
+        <Authors>Paul Hiles, Michael Kriese</Authors>
+        <PackageTags>wcf unity ioc di</PackageTags>
+        <RootNamespace>Unity.Wcf</RootNamespace>
+        <Configurations>Debug;Release</Configurations>
+    </PropertyGroup>
+    <PropertyGroup>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>Unity.Wcf.snk</AssemblyOriginatorKeyFile>
+        <TargetFrameworks>net45</TargetFrameworks>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <PackageOutputPath>$(SolutionDir)bin</PackageOutputPath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+        <DebugType>Full</DebugType>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Content Include="Unity.Wcf.README.txt" />
+      <Content Include="WcfServiceFactory.cs.pp" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Reference Include="System.ServiceModel" />
+        <Reference Include="System.ServiceModel.Activation" />
+        <PackageReference Include="Unity.Container">
+            <Version>5.0.0</Version>
+        </PackageReference>
+    </ItemGroup>
+</Project>
diff --git a/Unity.Wcf/Unity.Wcf.nuspec b/Unity.Wcf/Unity.Wcf.nuspec
deleted file mode 100644
index 7b0a26a..0000000
--- a/Unity.Wcf/Unity.Wcf.nuspec
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Unity.Wcf</id>
-    <version>$version$</version>
-    <authors>Paul Hiles, Michael Kriese</authors>
-    <owners>DevTrends</owners>
-    <licenseUrl>https://github.com/ViceIce/unity.wcf/raw/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/ViceIce/unity.wcf</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Unity.Wcf is a library that allows simple Integration of Microsoft's Unity IoC container with WCF. This project includes a bespoke InstanceProvider that creates a child container per client connection and disposes of all registered IDisposable instances once the connection is terminated.</description>
-    <tags>wcf unity ioc di</tags>
-    <dependencies>
-    </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.ServiceModel.Activation" />
-    </frameworkAssemblies>
-  </metadata>
-  <files>
-    <file src="content\**\*.*" target="content" />
-  </files>
-</package>
diff --git a/Unity.Wcf/content/WcfServiceFactory.cs.pp b/Unity.Wcf/WcfServiceFactory.cs.pp
similarity index 100%
rename from Unity.Wcf/content/WcfServiceFactory.cs.pp
rename to Unity.Wcf/WcfServiceFactory.cs.pp

From c7767845069f4ffb44b49b0097f4b2fea2943d19 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Fri, 20 Oct 2017 16:26:59 +0200
Subject: [PATCH 4/5] Remove content files.

---
 Unity.Wcf/Unity.Wcf.README.txt    |  6 ------
 Unity.Wcf/Unity.Wcf.csproj        |  5 -----
 Unity.Wcf/WcfServiceFactory.cs.pp | 16 ----------------
 3 files changed, 27 deletions(-)
 delete mode 100644 Unity.Wcf/Unity.Wcf.README.txt
 delete mode 100644 Unity.Wcf/WcfServiceFactory.cs.pp

diff --git a/Unity.Wcf/Unity.Wcf.README.txt b/Unity.Wcf/Unity.Wcf.README.txt
deleted file mode 100644
index 400c8e5..0000000
--- a/Unity.Wcf/Unity.Wcf.README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Getting started with Unity.Wcf
-------------------------------
-
-Find out how to use Unity.Wcf by visiting http://unitywcf.codeplex.com/
-
-Please report all bugs and feature requests on CodePlex.
\ No newline at end of file
diff --git a/Unity.Wcf/Unity.Wcf.csproj b/Unity.Wcf/Unity.Wcf.csproj
index dcc8889..a0cfc50 100644
--- a/Unity.Wcf/Unity.Wcf.csproj
+++ b/Unity.Wcf/Unity.Wcf.csproj
@@ -34,11 +34,6 @@
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     </PropertyGroup>
 
-    <ItemGroup>
-      <Content Include="Unity.Wcf.README.txt" />
-      <Content Include="WcfServiceFactory.cs.pp" />
-    </ItemGroup>
-
     <ItemGroup>
         <Reference Include="System.ServiceModel" />
         <Reference Include="System.ServiceModel.Activation" />
diff --git a/Unity.Wcf/WcfServiceFactory.cs.pp b/Unity.Wcf/WcfServiceFactory.cs.pp
deleted file mode 100644
index afcadc9..0000000
--- a/Unity.Wcf/WcfServiceFactory.cs.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-using Unity;
-using Unity.Wcf;
-
-namespace $rootnamespace$
-{
-	public class WcfServiceFactory : UnityServiceHostFactory
-    {
-        protected override void ConfigureContainer(IUnityContainer container)
-        {
-			// register all your components with the container here
-            // container
-            //    .RegisterType<IService1, Service1>()
-            //    .RegisterType<DataContext>(new HierarchicalLifetimeManager());
-        }
-    }
-}

From 4ddc0c717f72f6c8a7e4205816852defebdf46a7 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Mon, 23 Oct 2017 10:07:21 +0200
Subject: [PATCH 5/5] Fix reference.

---
 Unity.Wcf/Unity.Wcf.csproj | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Unity.Wcf/Unity.Wcf.csproj b/Unity.Wcf/Unity.Wcf.csproj
index a0cfc50..2212029 100644
--- a/Unity.Wcf/Unity.Wcf.csproj
+++ b/Unity.Wcf/Unity.Wcf.csproj
@@ -37,8 +37,6 @@
     <ItemGroup>
         <Reference Include="System.ServiceModel" />
         <Reference Include="System.ServiceModel.Activation" />
-        <PackageReference Include="Unity.Container">
-            <Version>5.0.0</Version>
-        </PackageReference>
+        <PackageReference Include="Unity.Container" Version="5.0.0" />
     </ItemGroup>
 </Project>