React to DI changes

Author: HaoK

src/Microsoft.Framework.WebEncoders/EncoderServices.cs

@@ -2,23 +2,24 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.Framework.WebEncoders
 {
     public static class EncoderServices
     {
-        public static IEnumerable<IServiceDescriptor> GetDefaultServices()
+        public static IServiceCollection GetDefaultServices()
         {
-            var describe = new ServiceDescriber();
+            var services = new ServiceCollection();
 
             // Register the default encoders
             // We want to call the 'Default' property getters lazily since they perform static caching
-            yield return describe.Singleton<IHtmlEncoder>(CreateFactory(() => HtmlEncoder.Default, filter => new HtmlEncoder(filter)));
-            yield return describe.Singleton<IJavaScriptStringEncoder>(CreateFactory(() => JavaScriptStringEncoder.Default, filter => new JavaScriptStringEncoder(filter)));
-            yield return describe.Singleton<IUrlEncoder>(CreateFactory(() => UrlEncoder.Default, filter => new UrlEncoder(filter)));
+            services.AddSingleton<IHtmlEncoder>(CreateFactory(() => HtmlEncoder.Default, filter => new HtmlEncoder(filter)));
+            services.AddSingleton<IJavaScriptStringEncoder>(CreateFactory(() => JavaScriptStringEncoder.Default, filter => new JavaScriptStringEncoder(filter)));
+            services.AddSingleton<IUrlEncoder>(CreateFactory(() => UrlEncoder.Default, filter => new UrlEncoder(filter)));
+
+            return services;
         }
 
         private static Func<IServiceProvider, T> CreateFactory<T>(Func<T> defaultFactory, Func<ICodePointFilter, T> customFilterFactory)

test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs

@@ -2,13 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Xunit;
-using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Fallback;
-using Microsoft.AspNet.Http.Core;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Http.Core;
+using Microsoft.Framework.DependencyInjection;
+using Xunit;
 
 namespace Microsoft.AspNet.Http.Extensions.Tests
 {

test/Microsoft.Framework.WebEncoders.Tests/EncoderServiceCollectionExtensionsTests.cs

@@ -4,7 +4,6 @@
 using System;
 using Xunit;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Fallback;
 
 namespace Microsoft.Framework.WebEncoders
 {