Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Autofac 3.1.3 #5

Merged
merged 1 commit into from
Oct 24, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Binary file modified src/Caliburn.Micro.Autofac.Packaging/NuGet.exe
Binary file not shown.
6 changes: 3 additions & 3 deletions src/Caliburn.Micro.Autofac.Packaging/Package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Autofac.SL5/packages.config
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Autofac.WP8/packages.config
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Autofac.WPF/packages.config
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions src/GlobalAssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -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")]