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.

Sign up for GitHub

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

Feature/caliburn 200 autofac 313 #6

Merged
merged 2 commits into from
Jun 12, 2014
Merged

Feature/caliburn 200 autofac 313 #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f16912
Upgrades to Autofac 3.4.1 and Caliburn 2.0.0
Jun 12, 2014
5683eb5
removes unused generic
Jun 12, 2014
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
Binary file modified src/Caliburn.Micro.Autofac.Packaging/NuGet.exe
View file
Open in desktop
Binary file not shown.
18 changes: 9 additions & 9 deletions src/Caliburn.Micro.Autofac.Packaging/Package.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<package >
<metadata>
<id>Caliburn.Micro.Autofac</id>
<version>1.5.4</version>
<version>2.0.0</version>
<title>Caliburn.Micro.Autofac</title>
<authors>David Buksbaum</authors>
<owners>David Buksbaum</owners>
<projectUrl>http://buksbaum.us/2011/07/06/introducing-caliburn-micro-logging-nlog/</projectUrl>
<authors>David Buksbaum, Eli Brody, Juan Agüí</authors>
<owners>Juan Agüí</owners>
<projectUrl>https://github.com/jagui/Caliburn.Micro.Autofac</projectUrl>
<iconUrl>http://www.eyecatch.no/favicon.ico</iconUrl>
<licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -17,20 +17,20 @@
Integration of Caliburn.Micro with Autofac. Source code with sample projects available at https://github.com/dbuksbaum/Caliburn.Micro.Autofac
</summary>
<releaseNotes>
* Upgrade to Autofac 3.1.3
* Upgrades to Autofac 3.4.1
* Upgrades to Caliburn 2.0.0
</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="3.1.3" />
<dependency id="Caliburn.Micro" version="2.0.0"/>
<dependency id="Caliburn.Micro.Core" version="2.0.0"/>
<dependency id="Autofac" version="3.1.3"/>
</dependencies>
<references></references>
</metadata>
<files>
<file src="lib\**" target="lib" />
<!--file src="tools\" target="tools" />
<file src="content\" target="content" /-->
</files>
</package>
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Autofac.WP71/AutofacBootstrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace Caliburn.Micro.Autofac
{
public class AutofacBootstrapper : PhoneBootstrapper
public class AutofacBootstrapper : PhoneBootstrapperBase
{
#region Properties
protected IContainer Container { get; private set; }
Expand Down
21 changes: 14 additions & 7 deletions src/Caliburn.Micro.Autofac.WP8/Caliburn.Micro.Autofac.WP8.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,25 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<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 Include="Autofac">
<HintPath>..\packages\Autofac.3.4.1\lib\portable-win+net40+sl50+wp8\Autofac.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Caliburn.Micro">
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\wp8\Caliburn.Micro.dll</HintPath>
<HintPath>..\packages\Caliburn.Micro.Core.2.0.0\lib\portable-net45+win8+wp8+wpa81\Caliburn.Micro.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Caliburn.Micro.Extensions">
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\wp8\Caliburn.Micro.Extensions.dll</HintPath>
<HintPath>..\packages\Caliburn.Micro.2.0.0\lib\wp8\Caliburn.Micro.Extensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows.Interactivity, Version=3.9.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\wp8\System.Windows.Interactivity.dll</HintPath>
<Reference Include="Caliburn.Micro.Platform">
<HintPath>..\packages\Caliburn.Micro.2.0.0\lib\wp8\Caliburn.Micro.Platform.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows.Interactivity">
<HintPath>..\packages\Caliburn.Micro.2.0.0\lib\wp8\System.Windows.Interactivity.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/Caliburn.Micro.Autofac.WP8/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autofac" version="3.1.3" targetFramework="wp80" />
<package id="Caliburn.Micro" version="1.5.2" targetFramework="wp80" />
<package id="Autofac" version="3.4.1" targetFramework="wp80" />
<package id="Caliburn.Micro" version="2.0.0" targetFramework="wp80" />
<package id="Caliburn.Micro.Core" version="2.0.0" targetFramework="wp80" />
</packages>
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Autofac.WPF/AutofacBootstrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Caliburn.Micro.Autofac
/// A strongly-typed version of Caliburn.Micro.Bootstrapper that specifies the type of root model to create for the application.
/// </summary>
/// <typeparam name="TRootViewModel">The type of root view model for the application.</typeparam>
public class AutofacBootstrapper<TRootViewModel> : Bootstrapper<TRootViewModel>
public class AutofacBootstrapper<TRootViewModel> : BootstrapperBase
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove unused TRootViewModel generics specification.

{
#region Properties
protected IContainer Container { get; private set; }
Expand Down
18 changes: 12 additions & 6 deletions src/Caliburn.Micro.Autofac.WPF/Caliburn.Micro.Autofac.WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,26 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<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 Include="Autofac">
<HintPath>..\packages\Autofac.3.4.1\lib\net40\Autofac.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Caliburn.Micro">
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\net40\Caliburn.Micro.dll</HintPath>
<HintPath>..\packages\Caliburn.Micro.Core.2.0.0\lib\net40\Caliburn.Micro.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Caliburn.Micro.Platform">
<HintPath>..\packages\Caliburn.Micro.2.0.0\lib\net40\Caliburn.Micro.Platform.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\net40\System.Windows.Interactivity.dll</HintPath>
<Reference Include="System.Windows.Interactivity">
<HintPath>..\packages\Caliburn.Micro.2.0.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/Caliburn.Micro.Autofac.WPF/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autofac" version="3.1.3" targetFramework="net40" />
<package id="Caliburn.Micro" version="1.5.2" targetFramework="net40" />
<package id="Autofac" version="3.4.1" targetFramework="net40" />
<package id="Caliburn.Micro" version="2.0.0" targetFramework="net40" />
<package id="Caliburn.Micro.Core" version="2.0.0" targetFramework="net40" />
</packages>
39 changes: 4 additions & 35 deletions src/Caliburn.Micro.Autofac.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,27 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5C004298-15FB-42F6-836A-C0782CAF41FE}"
ProjectSection(SolutionItems) = preProject
..\acknowledgments.txt = ..\acknowledgments.txt
..\License.txt = ..\License.txt
..\README.md = ..\README.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Autofac.WPF", "Caliburn.Micro.Autofac.WPF\Caliburn.Micro.Autofac.WPF.csproj", "{E2D4682D-D053-4A01-800E-9684D0A9EC64}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Autofac.WP71", "Caliburn.Micro.Autofac.WP71\Caliburn.Micro.Autofac.WP71.csproj", "{39FB1548-6960-40B0-B946-E3947AE50A21}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Autofac.SL4", "Caliburn.Micro.Autofac.SL4\Caliburn.Micro.Autofac.SL4.csproj", "{8DF13A94-7A16-449B-B926-F93D09C8850E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{0FE140EC-6EAB-4E8C-B9B9-D00CBC3EEDFD}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Autofac.SL5", "Caliburn.Micro.Autofac.SL5\Caliburn.Micro.Autofac.SL5.csproj", "{77677344-A72B-4BD1-9FD4-7C3A664A1E05}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Autofac.WPF", "Caliburn.Micro.Autofac.WPF\Caliburn.Micro.Autofac.WPF.csproj", "{E2D4682D-D053-4A01-800E-9684D0A9EC64}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Autofac.Packaging", "Caliburn.Micro.Autofac.Packaging\Caliburn.Micro.Autofac.Packaging.csproj", "{0451BAEF-DF2E-4B98-8644-94EE9415E389}"
ProjectSection(ProjectDependencies) = postProject
{E2D4682D-D053-4A01-800E-9684D0A9EC64} = {E2D4682D-D053-4A01-800E-9684D0A9EC64}
{77677344-A72B-4BD1-9FD4-7C3A664A1E05} = {77677344-A72B-4BD1-9FD4-7C3A664A1E05}
{39FB1548-6960-40B0-B946-E3947AE50A21} = {39FB1548-6960-40B0-B946-E3947AE50A21}
{8DF13A94-7A16-449B-B926-F93D09C8850E} = {8DF13A94-7A16-449B-B926-F93D09C8850E}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Autofac.WP8", "Caliburn.Micro.Autofac.WP8\Caliburn.Micro.Autofac.WP8.csproj", "{C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}"
Expand All @@ -51,30 +44,6 @@ Global
{E2D4682D-D053-4A01-800E-9684D0A9EC64}.Release|Any CPU.Build.0 = Release|Any CPU
{E2D4682D-D053-4A01-800E-9684D0A9EC64}.Release|ARM.ActiveCfg = Release|Any CPU
{E2D4682D-D053-4A01-800E-9684D0A9EC64}.Release|x86.ActiveCfg = Release|Any CPU
{39FB1548-6960-40B0-B946-E3947AE50A21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39FB1548-6960-40B0-B946-E3947AE50A21}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39FB1548-6960-40B0-B946-E3947AE50A21}.Debug|ARM.ActiveCfg = Debug|Any CPU
{39FB1548-6960-40B0-B946-E3947AE50A21}.Debug|x86.ActiveCfg = Debug|Any CPU
{39FB1548-6960-40B0-B946-E3947AE50A21}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39FB1548-6960-40B0-B946-E3947AE50A21}.Release|Any CPU.Build.0 = Release|Any CPU
{39FB1548-6960-40B0-B946-E3947AE50A21}.Release|ARM.ActiveCfg = Release|Any CPU
{39FB1548-6960-40B0-B946-E3947AE50A21}.Release|x86.ActiveCfg = Release|Any CPU
{8DF13A94-7A16-449B-B926-F93D09C8850E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8DF13A94-7A16-449B-B926-F93D09C8850E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8DF13A94-7A16-449B-B926-F93D09C8850E}.Debug|ARM.ActiveCfg = Debug|Any CPU
{8DF13A94-7A16-449B-B926-F93D09C8850E}.Debug|x86.ActiveCfg = Debug|Any CPU
{8DF13A94-7A16-449B-B926-F93D09C8850E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8DF13A94-7A16-449B-B926-F93D09C8850E}.Release|Any CPU.Build.0 = Release|Any CPU
{8DF13A94-7A16-449B-B926-F93D09C8850E}.Release|ARM.ActiveCfg = Release|Any CPU
{8DF13A94-7A16-449B-B926-F93D09C8850E}.Release|x86.ActiveCfg = Release|Any CPU
{77677344-A72B-4BD1-9FD4-7C3A664A1E05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{77677344-A72B-4BD1-9FD4-7C3A664A1E05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{77677344-A72B-4BD1-9FD4-7C3A664A1E05}.Debug|ARM.ActiveCfg = Debug|Any CPU
{77677344-A72B-4BD1-9FD4-7C3A664A1E05}.Debug|x86.ActiveCfg = Debug|Any CPU
{77677344-A72B-4BD1-9FD4-7C3A664A1E05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{77677344-A72B-4BD1-9FD4-7C3A664A1E05}.Release|Any CPU.Build.0 = Release|Any CPU
{77677344-A72B-4BD1-9FD4-7C3A664A1E05}.Release|ARM.ActiveCfg = Release|Any CPU
{77677344-A72B-4BD1-9FD4-7C3A664A1E05}.Release|x86.ActiveCfg = Release|Any CPU
{0451BAEF-DF2E-4B98-8644-94EE9415E389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0451BAEF-DF2E-4B98-8644-94EE9415E389}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0451BAEF-DF2E-4B98-8644-94EE9415E389}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down