Merge pull request #5 from elijajah/hardening/upgradeToAutofac3

Upgrade to Autofac 3.1.3
jagui · Oct 24, 2013 · 61a50ef · 61a50ef
2 parents 5874c64 + d5926e2
commit 61a50ef
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 18 deletions.
diff --git a/src/Caliburn.Micro.Autofac.Packaging/Caliburn.Micro.Autofac.Packaging.csproj b/src/Caliburn.Micro.Autofac.Packaging/Caliburn.Micro.Autofac.Packaging.csproj
@@ -53,7 +53,9 @@
     <None Include="NuGetSetup.ps1" />
     <None Include="NuGet.exe" />
     <None Include="NuGet.config" />
-    <None Include="Package.nuspec" />
+    <None Include="Package.nuspec">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="tools\init.ps1" />
     <None Include="tools\install.ps1" />
     <None Include="tools\uninstall.ps1" />

diff --git a/src/Caliburn.Micro.Autofac.Packaging/NuGet.exe b/src/Caliburn.Micro.Autofac.Packaging/NuGet.exe
diff --git a/src/Caliburn.Micro.Autofac.Packaging/Package.nuspec b/src/Caliburn.Micro.Autofac.Packaging/Package.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Caliburn.Micro.Autofac</id>
-    <version>1.5.3</version>
+    <version>1.5.4</version>
     <title>Caliburn.Micro.Autofac</title>
     <authors>David Buksbaum</authors>
     <owners>David Buksbaum</owners>
@@ -17,14 +17,14 @@
       Integration of Caliburn.Micro with Autofac. Source code with sample projects available at https://github.com/dbuksbaum/Caliburn.Micro.Autofac
     </summary>
     <releaseNotes>
-      * Fixed tombstoning support for WP8
+      * Upgrade to Autofac 3.1.3
     </releaseNotes>
     <copyright>Copyright David Buksbaum 2009-2012</copyright>
     <tags>Caliburn.Micro Autofac IoC DI MVVM</tags>
     <language>en-US</language>
     <dependencies>
       <dependency id="Caliburn.Micro" version="1.5.2" />
-      <dependency id="Autofac" version="2.6.3.862" />
+      <dependency id="Autofac" version="3.1.3" />
     </dependencies>
     <references></references>
   </metadata>

diff --git a/src/Caliburn.Micro.Autofac.SL5/Caliburn.Micro.Autofac.SL5.csproj b/src/Caliburn.Micro.Autofac.SL5/Caliburn.Micro.Autofac.SL5.csproj
@@ -48,8 +48,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac">
-      <HintPath>..\packages\Autofac.2.6.3.862\lib\SL4\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Autofac.3.1.3\lib\portable-win+net40+sl50+wp8\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Caliburn.Micro">
       <HintPath>..\packages\Caliburn.Micro.1.5.2\lib\sl5\Caliburn.Micro.dll</HintPath>

diff --git a/src/Caliburn.Micro.Autofac.SL5/packages.config b/src/Caliburn.Micro.Autofac.SL5/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="2.6.3.862" targetFramework="sl50" />
+  <package id="Autofac" version="3.1.3" targetFramework="sl50" />
   <package id="Caliburn.Micro" version="1.5.2" targetFramework="sl50" />
 </packages>
diff --git a/src/Caliburn.Micro.Autofac.WP8/Caliburn.Micro.Autofac.WP8.csproj b/src/Caliburn.Micro.Autofac.WP8/Caliburn.Micro.Autofac.WP8.csproj
@@ -100,8 +100,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Autofac">
-      <HintPath>..\packages\Autofac.2.6.3.862\lib\SL4-WindowsPhone\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Autofac.3.1.3\lib\portable-win+net40+sl50+wp8\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Caliburn.Micro">
       <HintPath>..\packages\Caliburn.Micro.1.5.2\lib\wp8\Caliburn.Micro.dll</HintPath>

diff --git a/src/Caliburn.Micro.Autofac.WP8/packages.config b/src/Caliburn.Micro.Autofac.WP8/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="2.6.3.862" targetFramework="wp80" />
+  <package id="Autofac" version="3.1.3" targetFramework="wp80" />
   <package id="Caliburn.Micro" version="1.5.2" targetFramework="wp80" />
 </packages>
diff --git a/src/Caliburn.Micro.Autofac.WPF/Caliburn.Micro.Autofac.WPF.csproj b/src/Caliburn.Micro.Autofac.WPF/Caliburn.Micro.Autofac.WPF.csproj
@@ -33,11 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac">
-      <HintPath>..\..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac.Configuration">
-      <HintPath>..\..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll</HintPath>
+    <Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Autofac.3.1.3\lib\net40\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Caliburn.Micro">
       <HintPath>..\packages\Caliburn.Micro.1.5.2\lib\net40\Caliburn.Micro.dll</HintPath>

diff --git a/src/Caliburn.Micro.Autofac.WPF/packages.config b/src/Caliburn.Micro.Autofac.WPF/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="2.6.3.862" targetFramework="net40" />
+  <package id="Autofac" version="3.1.3" targetFramework="net40" />
   <package id="Caliburn.Micro" version="1.5.2" targetFramework="net40" />
 </packages>
diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.5.3.0")]
-[assembly: AssemblyFileVersion("1.5.3.0")]
+[assembly: AssemblyVersion("1.5.4.0")]
+[assembly: AssemblyFileVersion("1.5.4.0")]