Upgrade to rc1-final.

Author: Erez Testiler

AspNetWindowsService.sln

@@ -7,9 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{58DCF7A9-2DB
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4AEF0F43-655C-4AE2-ADB1-3993A0895B6F}"
 	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
 		src\AspNetWindowsService\global.json = src\AspNetWindowsService\global.json
-		NuGet.Config = NuGet.Config
 	EndProjectSection
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspNetWindowsService", "src\AspNetWindowsService\AspNetWindowsService.xproj", "{26950A60-193A-46B6-8430-21E2B59C5214}"

src/AspNetWindowsService/Program.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Hosting.Internal;
-using Microsoft.Framework.Configuration;
-using Microsoft.Framework.Configuration.Memory;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Memory;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -13,14 +13,7 @@ namespace MyDnxService
 {
     public class Program : ServiceBase
     {
-        private readonly IServiceProvider _serviceProvider;
-        private IHostingEngine _hostingEngine;
-        private IDisposable _shutdownServerDisposable;
-
-        public Program(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
+        private IApplication _application;
 
         public void Main(string[] args)
         {
@@ -48,13 +41,14 @@ protected override void OnStart(string[] args)
         {
             try
             {
-                Microsoft.Dnx.Runtime.Infrastructure.CallContextServiceLocator.Locator.ServiceProvider = _serviceProvider;
-
                 var configProvider = new MemoryConfigurationProvider();
                 configProvider.Add("server.urls", "http://localhost:5000");
 
-                var config = new ConfigurationBuilder(configProvider).Build();
-                var builder = new WebHostBuilder(_serviceProvider, config);
+                var config = new ConfigurationBuilder()
+                    .Add(configProvider)
+                    .Build();
+
+                var builder = new WebHostBuilder(config);
                 builder.UseServer("Microsoft.AspNet.Server.Kestrel");
                 builder.UseServices(services => services.AddMvc());
                 builder.UseStartup(appBuilder =>
@@ -64,8 +58,8 @@ protected override void OnStart(string[] args)
                     appBuilder.UseMvc();
                 });
 
-                _hostingEngine = builder.Build();
-                _shutdownServerDisposable = _hostingEngine.Start();
+                var hostingEngine = builder.Build();
+                _application = hostingEngine.Start();
             }
             catch (Exception ex)
             {
@@ -76,8 +70,7 @@ protected override void OnStart(string[] args)
 
         protected override void OnStop()
         {
-            if (_shutdownServerDisposable != null)
-                _shutdownServerDisposable.Dispose();
+            _application?.Dispose();
         }
     }
 }

src/AspNetWindowsService/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "run": {
       "commandName": "run",
-      "sdkVersion": "dnx-clr-win-x86.1.0.0-beta8"
+      "sdkVersion": "dnx-clr-win-x86.1.0.0-rc1-final"
     }
   }
 }

src/AspNetWindowsService/global.json

@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "1.0.0-rc1-final"
+  }
+}

src/AspNetWindowsService/project.json

@@ -12,9 +12,9 @@
         }
     },
     "dependencies": {
-        "Microsoft.AspNet.Hosting": "1.0.0-beta8",
-        "Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8",
-        "Microsoft.AspNet.StaticFiles": "1.0.0-beta8",
-        "Microsoft.AspNet.Mvc": "6.0.0-beta8"
+        "Microsoft.AspNet.Hosting": "1.0.0-rc1-final",
+        "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
+        "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
+        "Microsoft.AspNet.Mvc": "6.0.0-rc1-final"
     }
 }