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/windows phone8 support #2

Merged
merged 2 commits into from
Oct 7, 2013
Merged

Feature/windows phone8 support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d98b5c8
upgrades to caliburn 1.5.2
Sep 27, 2013
5bde933
adds support for windows phone 8
Sep 27, 2013
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
12 changes: 3 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,7 +2,7 @@
<package >
<metadata>
<id>Caliburn.Micro.Autofac</id>
<version>1.5.0</version>
<version>1.5.2</version>
<title>Caliburn.Micro.Autofac</title>
<authors>David Buksbaum</authors>
<owners>David Buksbaum</owners>
Expand All @@ -17,19 +17,13 @@
Integration of Caliburn.Micro with Autofac. Source code with sample projects available at https://github.com/dbuksbaum/Caliburn.Micro.Autofac
</summary>
<releaseNotes>
* Upgraded to Autofac 2.6.3.862
* Upgraded to Caliburn.Micro 1.4
* Upgraded solution / project files to VS2012
* Minimum WPF support is now .NET 4
* Added support for Silverlight 5
* Changed NuGet packaging to be a project in the solutions
* Minor changes to the physical directory structure
* Added support for WP8
</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.4" />
<dependency id="Caliburn.Micro" version="1.5.2" />
<dependency id="Autofac" version="2.6.3.862" />
</dependencies>
<references></references>
Expand Down
10 changes: 4 additions & 6 deletions src/Caliburn.Micro.Autofac.SL4/Caliburn.Micro.Autofac.SL4.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<HintPath>..\packages\Autofac.2.6.3.862\lib\SL4\Autofac.dll</HintPath>
</Reference>
<Reference Include="Caliburn.Micro">
<HintPath>..\packages\Caliburn.Micro.1.4\lib\sl4\Caliburn.Micro.dll</HintPath>
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\sl4\Caliburn.Micro.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
Expand All @@ -61,11 +61,9 @@
<Reference Include="system" />
<Reference Include="System.Core" />
<Reference Include="System.Net" />
<Reference Include="System.Windows.Controls, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.1.4\lib\sl4\System.Windows.Controls.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Interactivity">
<HintPath>..\packages\Caliburn.Micro.1.4\lib\sl4\System.Windows.Interactivity.dll</HintPath>
<Reference Include="System.Windows.Controls, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\sl4\System.Windows.Interactivity.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Autofac.SL4/packages.config
View file
Open in desktop
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="sl40" />
<package id="Caliburn.Micro" version="1.4" targetFramework="sl40" />
<package id="Caliburn.Micro" version="1.5.2" targetFramework="sl40" />
</packages>
9 changes: 3 additions & 6 deletions src/Caliburn.Micro.Autofac.SL5/Caliburn.Micro.Autofac.SL5.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<HintPath>..\packages\Autofac.2.6.3.862\lib\SL4\Autofac.dll</HintPath>
</Reference>
<Reference Include="Caliburn.Micro">
<HintPath>..\packages\Caliburn.Micro.1.4\lib\sl5\Caliburn.Micro.dll</HintPath>
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\sl5\Caliburn.Micro.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System.ComponentModel.Composition, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
Expand All @@ -62,12 +62,9 @@
<Reference Include="System.Core">
<HintPath>$(TargetFrameworkDirectory)System.Core.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Controls, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.1.4\lib\sl5\System.Windows.Controls.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Controls, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Windows.Interactivity, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Caliburn.Micro.1.4\lib\sl5\System.Windows.Interactivity.dll</HintPath>
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\sl5\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Net" />
Expand Down
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Autofac.SL5/packages.config
View file
Open in desktop
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="Caliburn.Micro" version="1.4" targetFramework="sl50" />
<package id="Caliburn.Micro" version="1.5.2" targetFramework="sl50" />
</packages>
Loading