diff --git a/src/Caliburn.Micro.Autofac.Packaging/Package.nuspec b/src/Caliburn.Micro.Autofac.Packaging/Package.nuspec index 4bc7ae2..0df300e 100644 --- a/src/Caliburn.Micro.Autofac.Packaging/Package.nuspec +++ b/src/Caliburn.Micro.Autofac.Packaging/Package.nuspec @@ -2,7 +2,7 @@ Caliburn.Micro.Autofac - 1.5.0 + 1.5.2 Caliburn.Micro.Autofac David Buksbaum David Buksbaum @@ -17,19 +17,13 @@ Integration of Caliburn.Micro with Autofac. Source code with sample projects available at https://github.com/dbuksbaum/Caliburn.Micro.Autofac - * 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 Copyright David Buksbaum 2009-2012 Caliburn.Micro Autofac IoC DI MVVM en-US - + diff --git a/src/Caliburn.Micro.Autofac.SL4/Caliburn.Micro.Autofac.SL4.csproj b/src/Caliburn.Micro.Autofac.SL4/Caliburn.Micro.Autofac.SL4.csproj index 528601e..9505ce8 100644 --- a/src/Caliburn.Micro.Autofac.SL4/Caliburn.Micro.Autofac.SL4.csproj +++ b/src/Caliburn.Micro.Autofac.SL4/Caliburn.Micro.Autofac.SL4.csproj @@ -52,7 +52,7 @@ ..\packages\Autofac.2.6.3.862\lib\SL4\Autofac.dll - ..\packages\Caliburn.Micro.1.4\lib\sl4\Caliburn.Micro.dll + ..\packages\Caliburn.Micro.1.5.2\lib\sl4\Caliburn.Micro.dll @@ -61,11 +61,9 @@ - - ..\packages\Caliburn.Micro.1.4\lib\sl4\System.Windows.Controls.dll - - - ..\packages\Caliburn.Micro.1.4\lib\sl4\System.Windows.Interactivity.dll + + + ..\packages\Caliburn.Micro.1.5.2\lib\sl4\System.Windows.Interactivity.dll diff --git a/src/Caliburn.Micro.Autofac.SL4/packages.config b/src/Caliburn.Micro.Autofac.SL4/packages.config index 9c05850..546dbd9 100644 --- a/src/Caliburn.Micro.Autofac.SL4/packages.config +++ b/src/Caliburn.Micro.Autofac.SL4/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Caliburn.Micro.Autofac.SL5/Caliburn.Micro.Autofac.SL5.csproj b/src/Caliburn.Micro.Autofac.SL5/Caliburn.Micro.Autofac.SL5.csproj index 337d706..70bf0f6 100644 --- a/src/Caliburn.Micro.Autofac.SL5/Caliburn.Micro.Autofac.SL5.csproj +++ b/src/Caliburn.Micro.Autofac.SL5/Caliburn.Micro.Autofac.SL5.csproj @@ -52,7 +52,7 @@ ..\packages\Autofac.2.6.3.862\lib\SL4\Autofac.dll - ..\packages\Caliburn.Micro.1.4\lib\sl5\Caliburn.Micro.dll + ..\packages\Caliburn.Micro.1.5.2\lib\sl5\Caliburn.Micro.dll @@ -62,12 +62,9 @@ $(TargetFrameworkDirectory)System.Core.dll - - ..\packages\Caliburn.Micro.1.4\lib\sl5\System.Windows.Controls.dll - + - False - ..\packages\Caliburn.Micro.1.4\lib\sl5\System.Windows.Interactivity.dll + ..\packages\Caliburn.Micro.1.5.2\lib\sl5\System.Windows.Interactivity.dll diff --git a/src/Caliburn.Micro.Autofac.SL5/packages.config b/src/Caliburn.Micro.Autofac.SL5/packages.config index 1dd30e3..337d9d1 100644 --- a/src/Caliburn.Micro.Autofac.SL5/packages.config +++ b/src/Caliburn.Micro.Autofac.SL5/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Caliburn.Micro.Autofac.WP71/AutofacBootstrapper.cs b/src/Caliburn.Micro.Autofac.WP71/AutofacBootstrapper.cs index 19c8cb7..c9e5be8 100644 --- a/src/Caliburn.Micro.Autofac.WP71/AutofacBootstrapper.cs +++ b/src/Caliburn.Micro.Autofac.WP71/AutofacBootstrapper.cs @@ -11,269 +11,269 @@ namespace Caliburn.Micro.Autofac { - public class AutofacBootstrapper : PhoneBootstrapper - { - #region Properties - protected IContainer Container { get; private set; } - /// - /// Should the namespace convention be enforced for type registration. The default is true. - /// For views, this would require a views namespace to end with Views - /// For view-models, this would require a view models namespace to end with ViewModels - /// Case is important as views would not match. - /// - public bool EnforceNamespaceConvention { get; set; } - - /// - /// Should the view be treated as loaded when registering the INavigationService. - /// - public bool TreatViewAsLoaded { get; set; } - - /// - /// The base type required for a view model - /// - public Type ViewModelBaseType { get; set; } - /// - /// Method for creating the window manager - /// - public Func CreateWindowManager { get; set; } - /// - /// Method for creating the event aggregator - /// - public Func CreateEventAggregator { get; set; } - // Method for creating the frame adapter - public Func CreateFrameAdapter { get; set; } - // Method for creating the phone application service adapter - public Func CreatePhoneApplicationServiceAdapter { get; set; } - // Method for creating the vibrate controller - public Func CreateVibrateController { get; set; } - // Method for creating the sound effect player - public Func CreateSoundEffectPlayer { get; set; } - #endregion + public class AutofacBootstrapper : PhoneBootstrapper + { + #region Properties + protected IContainer Container { get; private set; } + /// + /// Should the namespace convention be enforced for type registration. The default is true. + /// For views, this would require a views namespace to end with Views + /// For view-models, this would require a view models namespace to end with ViewModels + /// Case is important as views would not match. + /// + public bool EnforceNamespaceConvention { get; set; } - /// - /// Do not override this method. This is where the IoC container is configured. - /// - /// Will throw is either CreateWindowManager - /// or CreateEventAggregator is null. - /// - /// - protected override void Configure() - { // allow base classes to change bootstrapper settings - ConfigureBootstrapper(); + /// + /// Should the view be treated as loaded when registering the INavigationService. + /// + public bool TreatViewAsLoaded { get; set; } - // validate settings - if (CreateFrameAdapter == null) - throw new ArgumentNullException("CreateFrameAdapter"); - if (CreateWindowManager == null) - throw new ArgumentNullException("CreateWindowManager"); - if (CreateEventAggregator == null) - throw new ArgumentNullException("CreateEventAggregator"); - if (CreatePhoneApplicationServiceAdapter == null) - throw new ArgumentNullException("CreatePhoneApplicationServiceAdapter"); - if (CreateVibrateController == null) - throw new ArgumentNullException("CreateVibrateController"); - if (CreateSoundEffectPlayer == null) - throw new ArgumentNullException("CreateSoundEffectPlayer"); + /// + /// The base type required for a view model + /// + public Type ViewModelBaseType { get; set; } + /// + /// Method for creating the window manager + /// + public Func CreateWindowManager { get; set; } + /// + /// Method for creating the event aggregator + /// + public Func CreateEventAggregator { get; set; } + // Method for creating the frame adapter + public Func CreateFrameAdapter { get; set; } + // Method for creating the phone application service adapter + public Func CreatePhoneApplicationServiceAdapter { get; set; } + // Method for creating the vibrate controller + public Func CreateVibrateController { get; set; } + // Method for creating the sound effect player + public Func CreateSoundEffectPlayer { get; set; } + #endregion - // configure container - var builder = new ContainerBuilder(); + /// + /// Do not override this method. This is where the IoC container is configured. + /// + /// Will throw is either CreateWindowManager + /// or CreateEventAggregator is null. + /// + /// + protected override void Configure() + { // allow base classes to change bootstrapper settings + ConfigureBootstrapper(); - // register phone services - var caliburnAssembly = typeof(IStorageMechanism).Assembly; - // register IStorageMechanism implementors - builder.RegisterAssemblyTypes(caliburnAssembly) - .Where(type => typeof(IStorageMechanism).IsAssignableFrom(type) - && !type.IsAbstract - && !type.IsInterface) - .As() - .InstancePerLifetimeScope(); + // validate settings + if (CreateFrameAdapter == null) + throw new ArgumentNullException("CreateFrameAdapter"); + if (CreateWindowManager == null) + throw new ArgumentNullException("CreateWindowManager"); + if (CreateEventAggregator == null) + throw new ArgumentNullException("CreateEventAggregator"); + if (CreatePhoneApplicationServiceAdapter == null) + throw new ArgumentNullException("CreatePhoneApplicationServiceAdapter"); + if (CreateVibrateController == null) + throw new ArgumentNullException("CreateVibrateController"); + if (CreateSoundEffectPlayer == null) + throw new ArgumentNullException("CreateSoundEffectPlayer"); - // register IStorageHandler implementors - builder.RegisterAssemblyTypes(caliburnAssembly) - .Where(type => typeof(IStorageHandler).IsAssignableFrom(type) - && !type.IsAbstract - && !type.IsInterface) - .As() - .InstancePerLifetimeScope(); + // configure container + var builder = new ContainerBuilder(); - // register view models - builder.RegisterAssemblyTypes(AssemblySource.Instance.ToArray()) - // must be a type with a name that ends with ViewModel - .Where(type => type.Name.EndsWith("ViewModel")) - // must be in a namespace ending with ViewModels - .Where(type => EnforceNamespaceConvention ? (!(string.IsNullOrEmpty(type.Namespace)) && type.Namespace.EndsWith("ViewModels")) : true) - // must implement INotifyPropertyChanged (deriving from PropertyChangedBase will statisfy this) - .Where(type => type.GetInterface(ViewModelBaseType.Name, false) != null) - // registered as self - .AsSelf() - // always create a new one - .InstancePerDependency(); + // register phone services + var caliburnAssembly = typeof(IStorageMechanism).Assembly; + // register IStorageMechanism implementors + builder.RegisterAssemblyTypes(caliburnAssembly) + .Where(type => typeof(IStorageMechanism).IsAssignableFrom(type) + && !type.IsAbstract + && !type.IsInterface) + .As() + .InstancePerLifetimeScope(); - // register views - builder.RegisterAssemblyTypes(AssemblySource.Instance.ToArray()) - // must be a type with a name that ends with View - .Where(type => type.Name.EndsWith("View")) - // must be in a namespace that ends in Views - .Where(type => EnforceNamespaceConvention ? (!(string.IsNullOrEmpty(type.Namespace)) && type.Namespace.EndsWith("Views")) : true) - // registered as self - .AsSelf() - // always create a new one - .InstancePerDependency(); + // register IStorageHandler implementors + builder.RegisterAssemblyTypes(caliburnAssembly) + .Where(type => typeof(IStorageHandler).IsAssignableFrom(type) + && !type.IsAbstract + && !type.IsInterface) + .As() + .InstancePerLifetimeScope(); - // register as CM container - //builder.RegisterInstance(this).InstancePerLifetimeScope(); - //builder.RegisterInstance(this).InstancePerLifetimeScope(); - //builder.RegisterInstance(this).InstancePerLifetimeScope(); + // register view models + builder.RegisterAssemblyTypes(AssemblySource.Instance.ToArray()) + // must be a type with a name that ends with ViewModel + .Where(type => type.Name.EndsWith("ViewModel")) + // must be in a namespace ending with ViewModels + .Where(type => EnforceNamespaceConvention ? (!(string.IsNullOrEmpty(type.Namespace)) && type.Namespace.EndsWith("ViewModels")) : true) + // must implement INotifyPropertyChanged (deriving from PropertyChangedBase will statisfy this) + .Where(type => type.GetInterface(ViewModelBaseType.Name, false) != null) + // registered as self + .AsSelf() + // always create a new one + .InstancePerDependency(); - // The constructor of these services must be called - // to attach to the framework properly. - var phoneService = CreatePhoneApplicationServiceAdapter(); - var navigationService = CreateFrameAdapter(); + // register views + builder.RegisterAssemblyTypes(AssemblySource.Instance.ToArray()) + // must be a type with a name that ends with View + .Where(type => type.Name.EndsWith("View")) + // must be in a namespace that ends in Views + .Where(type => EnforceNamespaceConvention ? (!(string.IsNullOrEmpty(type.Namespace)) && type.Namespace.EndsWith("Views")) : true) + // registered as self + .AsSelf() + // always create a new one + .InstancePerDependency(); - // register the singletons - builder.Register(c => new AutofacPhoneContainer(c)).InstancePerLifetimeScope(); - builder.RegisterInstance(navigationService).SingleInstance(); - builder.RegisterInstance(phoneService).SingleInstance(); - builder.Register(c => CreateEventAggregator()).InstancePerLifetimeScope(); - builder.Register(c => CreateWindowManager()).InstancePerLifetimeScope(); - builder.Register(c => CreateVibrateController()).InstancePerLifetimeScope(); - builder.Register(c => CreateSoundEffectPlayer()).InstancePerLifetimeScope(); - builder.RegisterType().AsSelf().InstancePerLifetimeScope(); - builder.RegisterType().AsSelf().InstancePerLifetimeScope(); + // register as CM container + //builder.RegisterInstance(this).InstancePerLifetimeScope(); + //builder.RegisterInstance(this).InstancePerLifetimeScope(); + //builder.RegisterInstance(this).InstancePerLifetimeScope(); - // allow derived classes to add to the container - ConfigureContainer(builder); + // The constructor of these services must be called + // to attach to the framework properly. + var phoneService = CreatePhoneApplicationServiceAdapter(); + var navigationService = CreateFrameAdapter(); - // build the container - Container = builder.Build(); + // register the singletons + builder.Register(c => new AutofacPhoneContainer(c)).InstancePerLifetimeScope(); + builder.RegisterInstance(navigationService).SingleInstance(); + builder.RegisterInstance(phoneService).SingleInstance(); + builder.Register(c => CreateEventAggregator()).InstancePerLifetimeScope(); + builder.Register(c => CreateWindowManager()).InstancePerLifetimeScope(); + builder.Register(c => CreateVibrateController()).InstancePerLifetimeScope(); + builder.Register(c => CreateSoundEffectPlayer()).InstancePerLifetimeScope(); + builder.RegisterType().AsSelf().InstancePerLifetimeScope(); + builder.RegisterType().AsSelf().InstancePerLifetimeScope(); - // start services - Container.Resolve().Start(); - Container.Resolve().Start(); + // allow derived classes to add to the container + ConfigureContainer(builder); - // add custom conventions for the phone - AddCustomConventions(); - } - /// - /// Do not override unless you plan to full replace the logic. This is how the framework - /// retrieves services from the Autofac container. - /// - /// The service to locate. - /// The key to locate. - /// The located service. - protected override object GetInstance(System.Type service, string key) - { - object instance; - if (string.IsNullOrEmpty(key)) - { - if (Container.TryResolve(service, out instance)) - return instance; - } - else - { - if (Container.TryResolveNamed(key, service, out instance)) - return instance; - } - throw new Exception(string.Format("Could not locate any instances of contract {0}.", key ?? service.Name)); - } - /// - /// Do not override unless you plan to full replace the logic. This is how the framework - /// retrieves services from the Autofac container. - /// - /// The service to locate. - /// The located services. - protected override System.Collections.Generic.IEnumerable GetAllInstances(System.Type service) - { - return Container.Resolve(typeof(IEnumerable<>).MakeGenericType(service)) as IEnumerable; - } - /// - /// Do not override unless you plan to full replace the logic. This is how the framework - /// retrieves services from the Autofac container. - /// - /// The instance to perform injection on. - protected override void BuildUp(object instance) - { - Container.InjectProperties(instance); - } - /// - /// Override to provide configuration prior to the Autofac configuration. You must call the base version BEFORE any - /// other statement or the behaviour is undefined. - /// Current Defaults: - /// EnforceNamespaceConvention = true - /// TreatViewAsLoaded = false - /// ViewModelBaseType = - /// CreateWindowManager = - /// CreateEventAggregator = - /// CreateFrameAdapter = - /// CreatePhoneApplicationServiceAdapter = - /// CreateVibrateController = - /// CreateSoundEffectPlayer = - /// - protected virtual void ConfigureBootstrapper() - { // by default, enforce the namespace convention - EnforceNamespaceConvention = true; - // by default, do not treat the view as loaded - TreatViewAsLoaded = false; + // build the container + Container = builder.Build(); - // the default view model base type - ViewModelBaseType = typeof(System.ComponentModel.INotifyPropertyChanged); - // default window manager - CreateWindowManager = () => new WindowManager(); - // default event aggregator - CreateEventAggregator = () => new EventAggregator(); - // default frame adapter - CreateFrameAdapter = () => new FrameAdapter(RootFrame, TreatViewAsLoaded); - // default phone application service adapter - CreatePhoneApplicationServiceAdapter = () => new PhoneApplicationServiceAdapter(RootFrame); - // default vibrate controller - CreateVibrateController = () => new SystemVibrateController(); - // default sound effect player - CreateSoundEffectPlayer = () => new XnaSoundEffectPlayer(); - } - /// - /// Override to include your own Autofac configuration after the framework has finished its configuration, but - /// before the container is created. - /// - /// The Autofac configuration builder. - protected virtual void ConfigureContainer(ContainerBuilder builder) - { - } + // start services + Container.Resolve().Start(); + Container.Resolve().Start(); - static void AddCustomConventions() - { - ConventionManager.AddElementConvention(Pivot.ItemsSourceProperty, "SelectedItem", "SelectionChanged").ApplyBinding = - (viewModelType, path, property, element, convention) => - { - if (ConventionManager - .GetElementConvention(typeof(ItemsControl)) - .ApplyBinding(viewModelType, path, property, element, convention)) + // add custom conventions for the phone + AddCustomConventions(); + } + /// + /// Do not override unless you plan to full replace the logic. This is how the framework + /// retrieves services from the Autofac container. + /// + /// The service to locate. + /// The key to locate. + /// The located service. + protected override object GetInstance(System.Type service, string key) + { + object instance; + if (string.IsNullOrEmpty(key)) { - ConventionManager - .ConfigureSelectedItem(element, Pivot.SelectedItemProperty, viewModelType, path); - ConventionManager - .ApplyHeaderTemplate(element, Pivot.HeaderTemplateProperty, null, viewModelType); - return true; + if (Container.TryResolve(service, out instance)) + return instance; } - - return false; - }; - - ConventionManager.AddElementConvention(Panorama.ItemsSourceProperty, "SelectedItem", "SelectionChanged").ApplyBinding = - (viewModelType, path, property, element, convention) => - { - if (ConventionManager - .GetElementConvention(typeof(ItemsControl)) - .ApplyBinding(viewModelType, path, property, element, convention)) + else { - ConventionManager - .ConfigureSelectedItem(element, Panorama.SelectedItemProperty, viewModelType, path); - ConventionManager - .ApplyHeaderTemplate(element, Panorama.HeaderTemplateProperty, null, viewModelType); - return true; + if (Container.TryResolveNamed(key, service, out instance)) + return instance; } + throw new Exception(string.Format("Could not locate any instances of contract {0}.", key ?? service.Name)); + } + /// + /// Do not override unless you plan to full replace the logic. This is how the framework + /// retrieves services from the Autofac container. + /// + /// The service to locate. + /// The located services. + protected override System.Collections.Generic.IEnumerable GetAllInstances(System.Type service) + { + return Container.Resolve(typeof(IEnumerable<>).MakeGenericType(service)) as IEnumerable; + } + /// + /// Do not override unless you plan to full replace the logic. This is how the framework + /// retrieves services from the Autofac container. + /// + /// The instance to perform injection on. + protected override void BuildUp(object instance) + { + Container.InjectProperties(instance); + } + /// + /// Override to provide configuration prior to the Autofac configuration. You must call the base version BEFORE any + /// other statement or the behaviour is undefined. + /// Current Defaults: + /// EnforceNamespaceConvention = true + /// TreatViewAsLoaded = false + /// ViewModelBaseType = + /// CreateWindowManager = + /// CreateEventAggregator = + /// CreateFrameAdapter = + /// CreatePhoneApplicationServiceAdapter = + /// CreateVibrateController = + /// CreateSoundEffectPlayer = + /// + protected virtual void ConfigureBootstrapper() + { // by default, enforce the namespace convention + EnforceNamespaceConvention = true; + // by default, do not treat the view as loaded + TreatViewAsLoaded = false; + + // the default view model base type + ViewModelBaseType = typeof(System.ComponentModel.INotifyPropertyChanged); + // default window manager + CreateWindowManager = () => new WindowManager(); + // default event aggregator + CreateEventAggregator = () => new EventAggregator(); + // default frame adapter + CreateFrameAdapter = () => new FrameAdapter(RootFrame, TreatViewAsLoaded); + // default phone application service adapter + CreatePhoneApplicationServiceAdapter = () => new PhoneApplicationServiceAdapter(PhoneService, RootFrame); + // default vibrate controller + CreateVibrateController = () => new SystemVibrateController(); + // default sound effect player + CreateSoundEffectPlayer = () => new XnaSoundEffectPlayer(); + } + /// + /// Override to include your own Autofac configuration after the framework has finished its configuration, but + /// before the container is created. + /// + /// The Autofac configuration builder. + protected virtual void ConfigureContainer(ContainerBuilder builder) + { + } + + static void AddCustomConventions() + { + ConventionManager.AddElementConvention(Pivot.ItemsSourceProperty, "SelectedItem", "SelectionChanged").ApplyBinding = + (viewModelType, path, property, element, convention) => + { + if (ConventionManager + .GetElementConvention(typeof(ItemsControl)) + .ApplyBinding(viewModelType, path, property, element, convention)) + { + ConventionManager + .ConfigureSelectedItem(element, Pivot.SelectedItemProperty, viewModelType, path); + ConventionManager + .ApplyHeaderTemplate(element, Pivot.HeaderTemplateProperty, null, viewModelType); + return true; + } + + return false; + }; + + ConventionManager.AddElementConvention(Panorama.ItemsSourceProperty, "SelectedItem", "SelectionChanged").ApplyBinding = + (viewModelType, path, property, element, convention) => + { + if (ConventionManager + .GetElementConvention(typeof(ItemsControl)) + .ApplyBinding(viewModelType, path, property, element, convention)) + { + ConventionManager + .ConfigureSelectedItem(element, Panorama.SelectedItemProperty, viewModelType, path); + ConventionManager + .ApplyHeaderTemplate(element, Panorama.HeaderTemplateProperty, null, viewModelType); + return true; + } - return false; - }; + return false; + }; + } } - } } diff --git a/src/Caliburn.Micro.Autofac.WP71/Caliburn.Micro.Autofac.WP71.csproj b/src/Caliburn.Micro.Autofac.WP71/Caliburn.Micro.Autofac.WP71.csproj index 07a8f8e..70b5be4 100644 --- a/src/Caliburn.Micro.Autofac.WP71/Caliburn.Micro.Autofac.WP71.csproj +++ b/src/Caliburn.Micro.Autofac.WP71/Caliburn.Micro.Autofac.WP71.csproj @@ -47,10 +47,10 @@ ..\packages\Autofac.2.6.3.862\lib\SL4-WindowsPhone71\Autofac.dll - ..\packages\Caliburn.Micro.1.4\lib\wp71\Caliburn.Micro.dll + ..\packages\Caliburn.Micro.1.5.2\lib\wp71\Caliburn.Micro.dll - ..\packages\Caliburn.Micro.1.4\lib\wp71\Caliburn.Micro.Extensions.dll + ..\packages\Caliburn.Micro.1.5.2\lib\wp71\Caliburn.Micro.Extensions.dll @@ -58,7 +58,7 @@ - ..\packages\Caliburn.Micro.1.4\lib\wp71\System.Windows.Interactivity.dll + ..\packages\Caliburn.Micro.1.5.2\lib\wp71\System.Windows.Interactivity.dll diff --git a/src/Caliburn.Micro.Autofac.WP71/packages.config b/src/Caliburn.Micro.Autofac.WP71/packages.config index ccc85d5..da28c73 100644 --- a/src/Caliburn.Micro.Autofac.WP71/packages.config +++ b/src/Caliburn.Micro.Autofac.WP71/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Caliburn.Micro.Autofac.WP8/Caliburn.Micro.Autofac.WP8.csproj b/src/Caliburn.Micro.Autofac.WP8/Caliburn.Micro.Autofac.WP8.csproj new file mode 100644 index 0000000..a853931 --- /dev/null +++ b/src/Caliburn.Micro.Autofac.WP8/Caliburn.Micro.Autofac.WP8.csproj @@ -0,0 +1,130 @@ + + + + Debug + AnyCPU + 10.0.20506 + 2.0 + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96} + {C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + Caliburn.Micro.Autofac + Caliburn.Micro.Autofac + WindowsPhone + v8.0 + $(TargetFrameworkVersion) + false + true + 11.0 + true + ..\ + true + + + true + full + false + Bin\Debug + DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE + true + true + prompt + 4 + + + pdbonly + true + Bin\Release + TRACE;SILVERLIGHT;WINDOWS_PHONE + true + true + prompt + 4 + + + true + full + false + Bin\x86\Debug + DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE + true + true + prompt + 4 + + + pdbonly + true + Bin\x86\Release + TRACE;SILVERLIGHT;WINDOWS_PHONE + true + true + prompt + 4 + + + true + full + false + Bin\ARM\Debug + DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE + true + true + prompt + 4 + + + pdbonly + true + Bin\ARM\Release + TRACE;SILVERLIGHT;WINDOWS_PHONE + true + true + prompt + 4 + + + + AutofacBootstrapper.cs + + + AutofacPhoneContainer.cs + + + EventAggregationAutoSubscriptionModule.cs + + + + + + ..\packages\Autofac.2.6.3.862\lib\SL4-WindowsPhone\Autofac.dll + + + ..\packages\Caliburn.Micro.1.5.2\lib\wp8\Caliburn.Micro.dll + + + ..\packages\Caliburn.Micro.1.5.2\lib\wp8\Caliburn.Micro.Extensions.dll + + + ..\packages\Caliburn.Micro.1.5.2\lib\wp8\System.Windows.Interactivity.dll + + + + + + + + + + copy $(TargetPath) $(SolutionDir)Caliburn.Micro.Autofac.Packaging\lib\wp8\$(TargetFileName) + + + + \ No newline at end of file diff --git a/src/Caliburn.Micro.Autofac.WP8/Properties/AssemblyInfo.cs b/src/Caliburn.Micro.Autofac.WP8/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..44dece5 --- /dev/null +++ b/src/Caliburn.Micro.Autofac.WP8/Properties/AssemblyInfo.cs @@ -0,0 +1,37 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Resources; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Caliburn.Micro.Autofac.WP8")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Caliburn.Micro.Autofac.WP8")] +[assembly: AssemblyCopyright("Copyright © 2013")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("c7ba73cc-dc2e-4566-8ae9-b4b9b3597c96")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: NeutralResourcesLanguageAttribute("en-US")] diff --git a/src/Caliburn.Micro.Autofac.WP8/packages.config b/src/Caliburn.Micro.Autofac.WP8/packages.config new file mode 100644 index 0000000..39087ca --- /dev/null +++ b/src/Caliburn.Micro.Autofac.WP8/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/Caliburn.Micro.Autofac.WPF/Caliburn.Micro.Autofac.WPF.csproj b/src/Caliburn.Micro.Autofac.WPF/Caliburn.Micro.Autofac.WPF.csproj index 7e90b71..a844d04 100644 --- a/src/Caliburn.Micro.Autofac.WPF/Caliburn.Micro.Autofac.WPF.csproj +++ b/src/Caliburn.Micro.Autofac.WPF/Caliburn.Micro.Autofac.WPF.csproj @@ -40,7 +40,7 @@ ..\..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll - ..\..\packages\Caliburn.Micro.1.4\lib\net40\Caliburn.Micro.dll + ..\packages\Caliburn.Micro.1.5.2\lib\net40\Caliburn.Micro.dll @@ -48,7 +48,7 @@ - ..\..\packages\Caliburn.Micro.1.4\lib\net40\System.Windows.Interactivity.dll + ..\packages\Caliburn.Micro.1.5.2\lib\net40\System.Windows.Interactivity.dll diff --git a/src/Caliburn.Micro.Autofac.WPF/packages.config b/src/Caliburn.Micro.Autofac.WPF/packages.config index 13026cf..b5cad33 100644 --- a/src/Caliburn.Micro.Autofac.WPF/packages.config +++ b/src/Caliburn.Micro.Autofac.WPF/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Caliburn.Micro.Autofac.sln b/src/Caliburn.Micro.Autofac.sln index 2905010..4133a18 100644 --- a/src/Caliburn.Micro.Autofac.sln +++ b/src/Caliburn.Micro.Autofac.sln @@ -31,6 +31,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Autofac.Pack {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}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -81,6 +83,18 @@ Global {0451BAEF-DF2E-4B98-8644-94EE9415E389}.Release|Any CPU.Build.0 = Release|Any CPU {0451BAEF-DF2E-4B98-8644-94EE9415E389}.Release|ARM.ActiveCfg = Release|Any CPU {0451BAEF-DF2E-4B98-8644-94EE9415E389}.Release|x86.ActiveCfg = Release|Any CPU + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Debug|ARM.ActiveCfg = Debug|ARM + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Debug|ARM.Build.0 = Debug|ARM + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Debug|x86.ActiveCfg = Debug|x86 + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Debug|x86.Build.0 = Debug|x86 + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Release|Any CPU.Build.0 = Release|Any CPU + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Release|ARM.ActiveCfg = Release|ARM + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Release|ARM.Build.0 = Release|ARM + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Release|x86.ActiveCfg = Release|x86 + {C7BA73CC-DC2E-4566-8AE9-B4B9B3597C96}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE