Updated all packages to framework 4.6.1. Unity API changed, so made t…

…he necessary change for releasing presenters.
DavidRogersDev · Jun 28, 2018 · cd15398 · cd15398
1 parent 570dd20
commit cd15398
Show file tree

Hide file tree

Showing 39 changed files with 23,611 additions and 123 deletions.
diff --git a/Samples/Basic/.vs/Basic/v15/Server/sqlite3/db.lock b/Samples/Basic/.vs/Basic/v15/Server/sqlite3/db.lock
diff --git a/Samples/Basic/.vs/Basic/v15/Server/sqlite3/storage.ide b/Samples/Basic/.vs/Basic/v15/Server/sqlite3/storage.ide
diff --git a/Samples/SimpleInjector/.vs/SimpleInjector/v15/Server/sqlite3/db.lock b/Samples/SimpleInjector/.vs/SimpleInjector/v15/Server/sqlite3/db.lock
diff --git a/Samples/SimpleInjector/.vs/SimpleInjector/v15/Server/sqlite3/storage.ide b/Samples/SimpleInjector/.vs/SimpleInjector/v15/Server/sqlite3/storage.ide
diff --git a/Samples/SimpleInjector/SimpleInjector.sln b/Samples/SimpleInjector/SimpleInjector.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleInjector", "SimpleInjector\SimpleInjector.csproj", "{0ED8F98F-5917-445A-A371-333A5801A15A}"
 EndProject
@@ -31,4 +31,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0C582CDF-96C6-4826-8364-689E30748D8F}
+	EndGlobalSection
 EndGlobal
diff --git a/Samples/SimpleInjector/SimpleInjector/App.config b/Samples/SimpleInjector/SimpleInjector/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/Samples/SimpleInjector/SimpleInjector/Forms/ChildView1.cs b/Samples/SimpleInjector/SimpleInjector/Forms/ChildView1.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using SimpleInjector.Views;
 using WinFormsMvp.Forms;
 

diff --git a/Samples/SimpleInjector/SimpleInjector/Properties/Resources.Designer.cs b/Samples/SimpleInjector/SimpleInjector/Properties/Resources.Designer.cs
diff --git a/Samples/SimpleInjector/SimpleInjector/Properties/Settings.Designer.cs b/Samples/SimpleInjector/SimpleInjector/Properties/Settings.Designer.cs
diff --git a/Samples/SimpleInjector/SimpleInjector/SimpleInjector.csproj b/Samples/SimpleInjector/SimpleInjector/SimpleInjector.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SimpleInjector</RootNamespace>
     <AssemblyName>SimpleInjector</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,8 +34,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SimpleInjector, Version=4.0.8.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
-      <HintPath>..\packages\SimpleInjector.4.0.8\lib\net45\SimpleInjector.dll</HintPath>
+    <Reference Include="SimpleInjector, Version=4.3.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
+      <HintPath>..\packages\SimpleInjector.4.3.0\lib\net45\SimpleInjector.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -84,6 +85,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">

diff --git a/Samples/SimpleInjector/SimpleInjector/packages.config b/Samples/SimpleInjector/SimpleInjector/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SimpleInjector" version="4.0.8" targetFramework="net461" />
+  <package id="SimpleInjector" version="4.3.0" targetFramework="net462" />
 </packages>
diff --git a/Samples/SimpleInjector/packages/SimpleInjector.4.3.0/SimpleInjector.4.3.0.nupkg b/Samples/SimpleInjector/packages/SimpleInjector.4.3.0/SimpleInjector.4.3.0.nupkg
diff --git a/Samples/SimpleInjector/packages/SimpleInjector.4.3.0/lib/net40/SimpleInjector.dll b/Samples/SimpleInjector/packages/SimpleInjector.4.3.0/lib/net40/SimpleInjector.dll