Convert to .net 4.5.1, win 8.1; remove sl5 and wp8

jamesloi · Jun 7, 2015 · cc00946 · cc00946
1 parent eea908a
commit cc00946
Show file tree

Hide file tree

Showing 154 changed files with 177 additions and 45,619 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,7 @@ dist
 *.cache
 *.dotCover
 /src/Ninject.SilverlightTests/Bin
-packages
-AppPackages
+packages/
+AppPackages
+.vs/
+TestResults/
diff --git a/Ninject.sln b/Ninject.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.22823.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3E299B94-5F07-49DE-8226-55EDC56F13E3}"
 	ProjectSection(SolutionItems) = preProject
@@ -31,14 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAssembly.WinRT", "src\T
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestModules.WinRT", "src\TestModules\TestModules.WinRT.csproj", "{875065AA-EA3B-4C7A-B7DD-9B660AA76D27}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.SL", "src\Ninject\Ninject.SL.csproj", "{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.SilverlightTests", "src\Ninject.SilverlightTests\Ninject.SilverlightTests.csproj", "{033B09D3-8532-419A-B906-36F8EB605B30}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.WP", "src\Ninject\Ninject.WP.csproj", "{E940833E-228E-4AFD-90F4-95D386C5342F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.WindowsPhone8Tests", "src\Ninject.WindowsPhone8Tests\Ninject.WindowsPhone8Tests.csproj", "{0BE8F374-CDF9-4861-89BD-497358E32CA6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonServiceLocator.NinjectAdapter.Tests", "src\CommonServiceLocator.NinjectAdapter.Tests\CommonServiceLocator.NinjectAdapter.Tests.csproj", "{3B703A23-DB64-4606-B124-16BA83C461B2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F1218241-9ED7-4DFA-9943-868AF26365CC}"
@@ -51,7 +43,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemotingTestServer", "Remot
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemotingTestClient", "RemotingTestClient\RemotingTestClient.csproj", "{0BAD25A0-BE8E-4D8F-9EB2-AB7B307B9D94}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.Net40", "src\Ninject\Ninject.Net40.csproj", "{37AAD36A-2252-43D6-8BC4-F63BFEFDFECB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.Net45", "src\Ninject\Ninject.Net45.csproj", "{37AAD36A-2252-43D6-8BC4-F63BFEFDFECB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.Wpa81", "src\Ninject\Ninject.Wpa81.csproj", "{A380D911-6F72-4CB3-8FCE-8D373D059BED}"
 EndProject
@@ -229,86 +221,6 @@ Global
 		{875065AA-EA3B-4C7A-B7DD-9B660AA76D27}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{875065AA-EA3B-4C7A-B7DD-9B660AA76D27}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{875065AA-EA3B-4C7A-B7DD-9B660AA76D27}.Release|x86.ActiveCfg = Release|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Release|ARM.ActiveCfg = Release|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{58D24EB0-14B2-4942-97DE-3B2AC31F8DEA}.Release|x86.ActiveCfg = Release|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Release|Any CPU.Build.0 = Release|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Release|ARM.ActiveCfg = Release|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{033B09D3-8532-419A-B906-36F8EB605B30}.Release|x86.ActiveCfg = Release|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Debug|ARM.ActiveCfg = Debug|ARM
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Debug|ARM.Build.0 = Debug|ARM
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Debug|x86.Build.0 = Debug|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Release|ARM.ActiveCfg = Release|ARM
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Release|ARM.Build.0 = Release|ARM
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Release|x86.ActiveCfg = Release|Any CPU
-		{E940833E-228E-4AFD-90F4-95D386C5342F}.Release|x86.Build.0 = Release|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|ARM.ActiveCfg = Debug|ARM
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|ARM.Build.0 = Debug|ARM
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|ARM.Deploy.0 = Debug|ARM
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|x86.ActiveCfg = Debug|x86
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|x86.Build.0 = Debug|x86
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Debug|x86.Deploy.0 = Debug|x86
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|ARM.ActiveCfg = Release|ARM
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|ARM.Build.0 = Release|ARM
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|ARM.Deploy.0 = Release|ARM
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|Mixed Platforms.Build.0 = Release|x86
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|Mixed Platforms.Deploy.0 = Release|x86
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|x86.ActiveCfg = Release|x86
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|x86.Build.0 = Release|x86
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6}.Release|x86.Deploy.0 = Release|x86
 		{3B703A23-DB64-4606-B124-16BA83C461B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B703A23-DB64-4606-B124-16BA83C461B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3B703A23-DB64-4606-B124-16BA83C461B2}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -523,8 +435,6 @@ Global
 		{AA75BE5B-8603-489D-8F9F-6ACD02598FD3} = {F1218241-9ED7-4DFA-9943-868AF26365CC}
 		{E02E7007-D499-45FC-A48D-1C195DB58021} = {F1218241-9ED7-4DFA-9943-868AF26365CC}
 		{875065AA-EA3B-4C7A-B7DD-9B660AA76D27} = {F1218241-9ED7-4DFA-9943-868AF26365CC}
-		{033B09D3-8532-419A-B906-36F8EB605B30} = {F1218241-9ED7-4DFA-9943-868AF26365CC}
-		{0BE8F374-CDF9-4861-89BD-497358E32CA6} = {F1218241-9ED7-4DFA-9943-868AF26365CC}
 		{3B703A23-DB64-4606-B124-16BA83C461B2} = {F1218241-9ED7-4DFA-9943-868AF26365CC}
 		{E2FCFE04-2D57-4F43-8E13-12B47B878C18} = {F1218241-9ED7-4DFA-9943-868AF26365CC}
 		{0BAD25A0-BE8E-4D8F-9EB2-AB7B307B9D94} = {F1218241-9ED7-4DFA-9943-868AF26365CC}

diff --git a/Portable.Ninject.nuspec b/Portable.Ninject.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Portable.Ninject</id>
-    <version>3.3.1</version>
+    <version>4.0-alpha1</version>
     <title>Ninject for Portable Class Libraries</title>
     <authors>Oren Novotny</authors>
     <owners />
@@ -14,7 +14,7 @@
     <description>
       Stop writing monolithic applications that make you feel like you have to move mountains to make the simplest of changes. Ninject helps you use the technique of dependency injection to break your applications into loosely-coupled, highly-cohesive components, and then glue them back together in a flexible manner.
 
-      Portable version of Ninject for .NET4, SL4, WP8, Wpa 8.1, Win8, iOS (Classic and Unified) and Android
+      Portable version of Ninject for .NET4.5.1, Wpa 8.1, Win8.1, UWP, iOS (Classic and Unified) and Android
     </description>
     <summary>IoC container for .NET</summary>
     <releaseNotes>Xamarin support for iOS and Android</releaseNotes>
@@ -23,39 +23,27 @@
   <files>
 
     <!-- PCL -->
-    <file src="src\Ninject\bin\PCL\Release\Ninject.dll" target="lib\portable-net4+sl5+wp8+win8+wpa81+monotouch+monoandroid+Xamarin.iOS\Ninject.dll" />
-    <file src="src\Ninject\bin\PCL\Release\Ninject.pdb" target="lib\portable-net4+sl5+wp8+win8+wpa81+monotouch+monoandroid+Xamarin.iOS\Ninject.pdb" />
-    <file src="src\Ninject\bin\PCL\Release\Ninject.xml" target="lib\portable-net4+sl5+wp8+win8+wpa81+monotouch+monoandroid+Xamarin.iOS\Ninject.xml" />
+    <file src="src\Ninject\bin\PCL\Release\Ninject.dll" target="lib\portable-net451+win81+wpa81+monotouch+monoandroid+Xamarin.iOS\Ninject.dll" />
+    <file src="src\Ninject\bin\PCL\Release\Ninject.pdb" target="lib\portable-net451+win81+wpa81+monotouch+monoandroid+Xamarin.iOS\Ninject.pdb" />
+    <file src="src\Ninject\bin\PCL\Release\Ninject.xml" target="lib\portable-net451+win81+wpa81+monotouch+monoandroid+Xamarin.iOS\Ninject.xml" />
 
-    <!-- .NET 4 -->
-    <file src="src\Ninject\bin\Net4\Release\Ninject.dll" target="lib\net40-client\Ninject.dll" />
-    <file src="src\Ninject\bin\Net4\Release\Ninject.pdb" target="lib\net40-client\Ninject.pdb" />
-    <file src="src\Ninject\bin\Net4\Release\Ninject.xml" target="lib\net40-client\Ninject.xml" />
+    <!-- .NET 4.5.1 -->
+    <file src="src\Ninject\bin\Net4\Release\Ninject.dll" target="lib\net451\Ninject.dll" />
+    <file src="src\Ninject\bin\Net4\Release\Ninject.pdb" target="lib\net451\Ninject.pdb" />
+    <file src="src\Ninject\bin\Net4\Release\Ninject.xml" target="lib\net451\Ninject.xml" />
 
-    <!-- Win8 -->
-    <file src="src\Ninject\bin\WinRT\Release\Ninject.dll" target="lib\win8\Ninject.dll" />
-    <file src="src\Ninject\bin\WinRT\Release\Ninject.pdb" target="lib\win8\Ninject.pdb" />
-    <file src="src\Ninject\bin\WinRT\Release\Ninject.xml" target="lib\win8\Ninject.xml" />
-    <file src="src\Ninject\bin\WinRT\Release\Ninject.pri" target="lib\win8\Ninject.pri" />
-
-
-    <!-- WP8 -->
-    <file src="src\Ninject\bin\wp8\Release\Ninject.dll" target="lib\wp8\Ninject.dll" />
-    <file src="src\Ninject\bin\wp8\Release\Ninject.pdb" target="lib\wp8\Ninject.pdb" />
-    <file src="src\Ninject\bin\wp8\Release\Ninject.xml" target="lib\wp8\Ninject.xml" />
+    <!-- Win8.1 -->
+    <file src="src\Ninject\bin\WinRT\Release\Ninject.dll" target="lib\win81\Ninject.dll" />
+    <file src="src\Ninject\bin\WinRT\Release\Ninject.pdb" target="lib\win81\Ninject.pdb" />
+    <file src="src\Ninject\bin\WinRT\Release\Ninject.xml" target="lib\win81\Ninject.xml" />
+    <file src="src\Ninject\bin\WinRT\Release\Ninject.pri" target="lib\win81\Ninject.pri" />
 
     <!-- Wpa81 -->
     <file src="src\Ninject\bin\Wpa81\Release\Ninject.dll" target="lib\Wpa81\Ninject.dll" />
     <file src="src\Ninject\bin\Wpa81\Release\Ninject.pdb" target="lib\Wpa81\Ninject.pdb" />
     <file src="src\Ninject\bin\Wpa81\Release\Ninject.xml" target="lib\Wpa81\Ninject.xml" />
     <file src="src\Ninject\bin\Wpa81\Release\Ninject.pri" target="lib\Wpa81\Ninject.pri" />
 
-
-    <!-- SL5 -->
-    <file src="src\Ninject\bin\sl\Release\Ninject.dll" target="lib\sl5\Ninject.dll" />
-    <file src="src\Ninject\bin\sl\Release\Ninject.pdb" target="lib\sl5\Ninject.pdb" />
-    <file src="src\Ninject\bin\sl\Release\Ninject.xml" target="lib\sl5\Ninject.xml" />
-
      <!-- iOS Classic --> 
     <file src="src\Ninject\bin\iPhone\Release\Ninject.dll" target="lib\monotouch\Ninject.dll" />
     <file src="src\Ninject\bin\iPhone\Release\Ninject.pdb" target="lib\monotouch\Ninject.pdb" />

diff --git a/...ommonServiceLocator.NinjectAdapter.Tests/CommonServiceLocator.NinjectAdapter.Tests.csproj b/...ommonServiceLocator.NinjectAdapter.Tests/CommonServiceLocator.NinjectAdapter.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -10,9 +10,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CommonServiceLocator.NinjectAdapter.Tests</RootNamespace>
     <AssemblyName>CommonServiceLocator.NinjectAdapter.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <NuGetPackageImportStamp>2b47efd2</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FluentAssertions">
@@ -61,9 +64,9 @@
       <Project>{9BD94717-484B-4EB1-AF32-8D4244F02E8E}</Project>
       <Name>CommonServiceLocator.NinjectAdapter</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Ninject\Ninject.Net40.csproj">
+    <ProjectReference Include="..\Ninject\Ninject.Net45.csproj">
       <Project>{37aad36a-2252-43d6-8bc4-f63bfefdfecb}</Project>
-      <Name>Ninject.Net40</Name>
+      <Name>Ninject.Net45</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>