Merge 7a764a5929 into 5aaa0d318a

.github/workflows/cd.yaml

@@ -4,7 +4,10 @@ on:
   push:
     branches:
       - master
-
+  pull_request:
+    branches:
+      - master
+      
 jobs:
 
   build:
@@ -48,13 +51,13 @@ jobs:
     - name: Build SystemExtensions.NetStandard.DependencyInjection project
       run: dotnet build SystemExtensions.NetStandard.DependencyInjection -c $env:Configuration
 
-    - name: Push SystemExtensions.NetStandard nuget package
+    - name: Push nuget package
       uses: brandedoutcast/publish-nuget@v2.5.5
       with:
          PROJECT_FILE_PATH: SystemExtensions.NetStandard\SystemExtensions.NetStandard.csproj
          NUGET_KEY: ${{secrets.NUGET_API_KEY}}
 
-    - name: Push SystemExtensions.NetStandard.DependencyInjection nuget package
+    - name: Push nuget package
       uses: brandedoutcast/publish-nuget@v2.5.5
       with:
          PROJECT_FILE_PATH: SystemExtensions.NetStandard.DependencyInjection\SystemExtensions.NetStandard.DependencyInjection.csproj

SystemExtensions.DependencyInjection.Tests/Configuration/DefaultOptionsManagerTests.cs

@@ -1,6 +1,6 @@
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/LiveOptionsResolverTests.cs

@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/LiveUpdateableOptionsResolverTests.cs

@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/LiveUpdateableOptionsWrapperTests.cs

@@ -1,7 +1,7 @@
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/OptionsResolverTests.cs

@@ -3,7 +3,7 @@ using Microsoft.Extensions.Options;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/UpdateableOptionsResolverTests.cs

@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/UpdateableOptionsWrapperTests.cs

@@ -2,7 +2,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Configuration;
 using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration

SystemExtensions.DependencyInjection.Tests/Logging/LoggerResolverTests.cs

@@ -4,6 +4,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
 using System.Logging;
+using System.Windows.Extensions.Logging;
 
 namespace SystemExtensions.DependencyInjection.Tests.Logging
 {

SystemExtensions.NetStandard.DependencyInjection/Configuration/DefaultOptionsManager.cs

@@ -1,4 +1,4 @@
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class DefaultOptionsManager : IOptionsManager
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/ILiveOptions.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Options;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public interface ILiveOptions<T> : IOptions<T>
         where T : class

SystemExtensions.NetStandard.DependencyInjection/Configuration/ILiveUpdateableOptions.cs

@@ -1,4 +1,4 @@
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public interface ILiveUpdateableOptions<T> : ILiveOptions<T>, IUpdateableOptions<T>
         where T : class

SystemExtensions.NetStandard.DependencyInjection/Configuration/IOptionsManager.cs

@@ -1,4 +1,4 @@
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public interface IOptionsManager
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/IUpdateableOptions.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Options;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public interface IUpdateableOptions<out T> : IOptions<T>
         where T : class

SystemExtensions.NetStandard.DependencyInjection/Configuration/LiveOptionsResolver.cs

@@ -1,6 +1,6 @@
 using Slim.Resolvers;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class LiveOptionsResolver : IDependencyResolver
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/LiveUpdateableOptionsResolver.cs

@@ -1,6 +1,6 @@
 using Slim.Resolvers;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class LiveUpdateableOptionsResolver : IDependencyResolver
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/LiveUpdateableOptionsWrapper.cs

@@ -1,6 +1,6 @@
 using System.Extensions;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class LiveUpdateableOptionsWrapper<T> : ILiveUpdateableOptions<T>
         where T : class

SystemExtensions.NetStandard.DependencyInjection/Configuration/OptionsResolver.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Options;
 using Slim.Resolvers;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class OptionsResolver : IDependencyResolver
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/UpdateableOptionsResolver.cs

@@ -1,7 +1,6 @@
 using Slim.Resolvers;
-using System.Extensions.Configuration;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class UpdateableOptionsResolver : IDependencyResolver
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/UpdateableOptionsWrapper.cs

@@ -1,4 +1,4 @@
-using System.Configuration;
+using System.Extensions;
 
 namespace System.Extensions.Configuration
 {

SystemExtensions.NetStandard.DependencyInjection/Extensions/ServiceManagerExtensions.cs

@@ -1,7 +1,8 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Slim;
-using System.Configuration;
+using System.Extensions;
+using System.Extensions.Configuration;
 using System.Http;
 using System.Logging;
 using System.Net.Http;

SystemExtensions.NetStandard.DependencyInjection/Logging/LoggerResolver.cs

@@ -2,7 +2,7 @@
 using Slim.Resolvers;
 using System.Linq;
 
-namespace System.Logging
+namespace System.Windows.Extensions.Logging
 {
     public sealed class LoggerResolver : IDependencyResolver
     {
@@ -25,7 +25,7 @@ namespace System.Logging
             }
             else if (type == typeof(ILogger))
             {
-                return ResolveLogger(serviceProvider);
+                return ResolveLogger(serviceProvider, type);
             }
             else
             {
@@ -41,7 +41,7 @@ namespace System.Logging
             return createLoggerMethod.MakeGenericMethod(categoryTypes.First()).Invoke(null, new object[] { loggerFactory });
         }
 
-        private static object ResolveLogger(Slim.IServiceProvider serviceProvider)
+        private static object ResolveLogger(Slim.IServiceProvider serviceProvider, Type type)
         {
             var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
             return loggerFactory.CreateLogger(string.Empty);

SystemExtensions.NetStandard.DependencyInjection/SystemExtensions.NetStandard.DependencyInjection.csproj

@@ -6,7 +6,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <LangVersion>latest</LangVersion>
-    <Version>1.1.1</Version>
+    <Version>1.0.0</Version>
     <Authors>Alexandru Macocian</Authors>
     <RepositoryUrl>https://github.com/AlexMacocian/SystemExtensions</RepositoryUrl>
   </PropertyGroup>