diff --git a/build/build.xml b/build/build.xml
index 0989157..cdf667a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/Our.Umbraco.IoC.Autofac/Our.Umbraco.IoC.Autofac.nuspec b/src/Our.Umbraco.IoC.Autofac/Our.Umbraco.IoC.Autofac.nuspec
index 22e3fd2..f357aee 100644
--- a/src/Our.Umbraco.IoC.Autofac/Our.Umbraco.IoC.Autofac.nuspec
+++ b/src/Our.Umbraco.IoC.Autofac/Our.Umbraco.IoC.Autofac.nuspec
@@ -13,7 +13,7 @@
$copyright$
Umbraco IoC DependencyInjection DI Autofac
-
+
diff --git a/src/Our.Umbraco.IoC.Autofac/Properties/AssemblyInfo.cs b/src/Our.Umbraco.IoC.Autofac/Properties/AssemblyInfo.cs
index 4b1def6..dd457c1 100644
--- a/src/Our.Umbraco.IoC.Autofac/Properties/AssemblyInfo.cs
+++ b/src/Our.Umbraco.IoC.Autofac/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0-beta")]
+[assembly: AssemblyInformationalVersion("1.0.0")]
diff --git a/src/Our.Umbraco.IoC.LightInject/Our.Umbraco.IoC.LightInject.nuspec b/src/Our.Umbraco.IoC.LightInject/Our.Umbraco.IoC.LightInject.nuspec
index 572d9b3..09e1add 100644
--- a/src/Our.Umbraco.IoC.LightInject/Our.Umbraco.IoC.LightInject.nuspec
+++ b/src/Our.Umbraco.IoC.LightInject/Our.Umbraco.IoC.LightInject.nuspec
@@ -13,7 +13,7 @@
$copyright$
Umbraco IoC DependencyInjection DI LightInject
-
+
diff --git a/src/Our.Umbraco.IoC.LightInject/Properties/AssemblyInfo.cs b/src/Our.Umbraco.IoC.LightInject/Properties/AssemblyInfo.cs
index 65dba66..f5e96d2 100644
--- a/src/Our.Umbraco.IoC.LightInject/Properties/AssemblyInfo.cs
+++ b/src/Our.Umbraco.IoC.LightInject/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0-beta")]
+[assembly: AssemblyInformationalVersion("1.0.0")]
diff --git a/src/Our.Umbraco.IoC/Properties/AssemblyInfo.cs b/src/Our.Umbraco.IoC/Properties/AssemblyInfo.cs
index df5a5f0..d5578bd 100644
--- a/src/Our.Umbraco.IoC/Properties/AssemblyInfo.cs
+++ b/src/Our.Umbraco.IoC/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0-beta")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyInformationalVersion("1.1.0")]
diff --git a/src/Our.Umbraco.IoC/UmbracoServices.cs b/src/Our.Umbraco.IoC/UmbracoServices.cs
index 21231e6..a026b37 100644
--- a/src/Our.Umbraco.IoC/UmbracoServices.cs
+++ b/src/Our.Umbraco.IoC/UmbracoServices.cs
@@ -51,45 +51,45 @@ public static IEnumerable GetCoreRegistrations()
new ContainerRegistration(x => UmbracoConfig.For.HealthCheck()),
};
- defs.AddRange(GetGranularUmbracoServiceRegistrations());
+ defs.AddRange(GetUmbracoServiceRegistrations());
return defs;
}
- private static IEnumerable GetGranularUmbracoServiceRegistrations()
+ private static IEnumerable GetUmbracoServiceRegistrations()
{
var defs = new List
{
- new ContainerRegistration(x => x.Resolve().MigrationEntryService),
- new ContainerRegistration(x => x.Resolve().PublicAccessService),
- new ContainerRegistration(x => x.Resolve().TaskService),
- new ContainerRegistration(x => x.Resolve().DomainService),
- new ContainerRegistration(x => x.Resolve().AuditService),
- new ContainerRegistration(x => x.Resolve().TextService),
- new ContainerRegistration(x => x.Resolve().TagService),
- new ContainerRegistration(x => x.Resolve().ContentService),
- new ContainerRegistration(x => x.Resolve().UserService),
- new ContainerRegistration(x => x.Resolve().MemberService),
- new ContainerRegistration(x => x.Resolve().MediaService),
- new ContainerRegistration(x => x.Resolve().ContentTypeService),
- new ContainerRegistration(x => x.Resolve().DataTypeService),
- new ContainerRegistration(x => x.Resolve().FileService),
- new ContainerRegistration(x => x.Resolve().LocalizationService),
- new ContainerRegistration(x => x.Resolve().PackagingService),
- new ContainerRegistration(x => x.Resolve().ServerRegistrationService),
- new ContainerRegistration(x => x.Resolve().EntityService),
- new ContainerRegistration(x => x.Resolve().RelationService),
- new ContainerRegistration(x => x.Resolve().ApplicationTreeService),
- new ContainerRegistration(x => x.Resolve().SectionService),
- new ContainerRegistration(x => x.Resolve().MacroService),
- new ContainerRegistration(x => x.Resolve().MemberTypeService),
- new ContainerRegistration(x => x.Resolve().MemberGroupService),
- new ContainerRegistration(x => x.Resolve().NotificationService),
- new ContainerRegistration(x => x.Resolve().ExternalLoginService),
- new ContainerRegistration(x => x.Resolve().RedirectUrlService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.MigrationEntryService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.PublicAccessService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.TaskService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.DomainService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.AuditService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.TextService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.TagService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.ContentService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.UserService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.MemberService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.MediaService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.ContentTypeService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.DataTypeService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.FileService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.LocalizationService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.PackagingService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.ServerRegistrationService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.EntityService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.RelationService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.ApplicationTreeService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.SectionService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.MacroService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.MemberTypeService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.MemberGroupService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.NotificationService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.ExternalLoginService),
+ new ContainerRegistration(x => ApplicationContext.Current.Services.RedirectUrlService),
// TODO: Uncomment when Umbraco.Core updated
- //new ContainerRegistration(x => x.Resolve().ConsentService),
+ //new ContainerRegistration(x => ApplicationContext.Current.Services.ConsentService),
};
return defs;
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index bb57312..c4c973c 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -3,6 +3,6 @@
using System.Runtime.InteropServices;
[assembly: AssemblyCompany("")]
-[assembly: AssemblyCopyright("Copyright © Shannon Deminick 2017")]
+[assembly: AssemblyCopyright("Copyright © Shannon Deminick 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]