weidazhao · dazhao-msft · Jan 23, 2017 · Jan 23, 2017 · Jan 23, 2017 · Jan 23, 2017
diff --git a/Counter/Counter.csproj b/Counter/Counter.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
+  </PropertyGroup>
+  <PropertyGroup>
+    <IsServiceFabricServiceProject>True</IsServiceFabricServiceProject>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.ServiceFabric.AspNetCore.Hosting\Microsoft.ServiceFabric.AspNetCore.Hosting.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
+  </ItemGroup>
+</Project>
diff --git a/Counter/Counter.xproj b/Counter/Counter.xproj
diff --git a/Counter/Program.cs b/Counter/Program.cs
@@ -2,23 +2,31 @@
 using Microsoft.ServiceFabric.AspNetCore.Hosting;
 using Microsoft.ServiceFabric.Services.Runtime;
 using System.IO;
+using System.Threading.Tasks;
 
 namespace Counter
 {
     public static class Program
     {
         public static void Main(string[] args)
+        {
+            MainAsync(args).GetAwaiter().GetResult();
+        }
+
+        private static async Task MainAsync(string[] args)
         {
             var communicationContext = CreateAspNetCoreCommunicationContext();
 
-            ServiceRuntime.RegisterServiceAsync("CounterType", serviceContext => new CounterService(serviceContext, communicationContext)).GetAwaiter().GetResult();
+            await communicationContext.WebHost.StartAsync();
+
+            await ServiceRuntime.RegisterServiceAsync("CounterType", serviceContext => new CounterService(serviceContext, communicationContext));
 
-            communicationContext.WebHost.Run();
+            await communicationContext.WebHost.WaitForShutdownAsync();
         }
 
         private static AspNetCoreCommunicationContext CreateAspNetCoreCommunicationContext()
         {
-            var webHost = new WebHostBuilder().UseWebListener()
+            var webHost = new WebHostBuilder().UseKestrel()
                                               .UseContentRoot(Directory.GetCurrentDirectory())
                                               .UseStartup<Startup>()
                                               .UseServiceFabricEndpoint("CounterTypeEndpoint")

diff --git a/Counter/Properties/launchSettings.json b/Counter/Properties/launchSettings.json
@@ -1,19 +1,29 @@
-{
+{
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:4003/",
+      "applicationUrl": "http://localhost:62539/",
       "sslPort": 0
     }
   },
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+      "launchUrl": "api/values",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
+    },
+    "Counter": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "api/values",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:62540"
     }
   }
-}
+}
diff --git a/Counter/app.config b/Counter/app.config
@@ -1,5 +1,5 @@
 <configuration>
-  <runtime>
-    <gcServer enabled="true"/>
-  </runtime>
+   <runtime>
+      <gcServer enabled="true"/>
+   </runtime>
 </configuration>
diff --git a/Counter/appsettings.Development.json b/Counter/appsettings.Development.json
@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
diff --git a/Counter/appsettings.json b/Counter/appsettings.json
@@ -2,9 +2,7 @@
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
-      "Default": "Verbose",
-      "System": "Information",
-      "Microsoft": "Information"
+      "Default": "Warning"
     }
   }
 }
diff --git a/Counter/project.json b/Counter/project.json
diff --git a/Gateway/Gateway.csproj b/Gateway/Gateway.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
+  </PropertyGroup>
+  <PropertyGroup>
+    <IsServiceFabricServiceProject>True</IsServiceFabricServiceProject>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.ServiceFabric.AspNetCore.Gateway\Microsoft.ServiceFabric.AspNetCore.Gateway.csproj" />
+    <ProjectReference Include="..\Microsoft.ServiceFabric.AspNetCore.Hosting\Microsoft.ServiceFabric.AspNetCore.Hosting.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
+  </ItemGroup>
+</Project>
diff --git a/Gateway/Gateway.xproj b/Gateway/Gateway.xproj
diff --git a/Gateway/Program.cs b/Gateway/Program.cs
@@ -2,18 +2,26 @@
 using Microsoft.ServiceFabric.AspNetCore.Hosting;
 using Microsoft.ServiceFabric.Services.Runtime;
 using System.IO;
+using System.Threading.Tasks;
 
 namespace Gateway
 {
     public static class Program
     {
         public static void Main(string[] args)
+        {
+            MainAsync(args).GetAwaiter().GetResult();
+        }
+
+        private static async Task MainAsync(string[] args)
         {
             var communicationContext = CreateAspNetCoreCommunicationContext();
 
-            ServiceRuntime.RegisterServiceAsync("GatewayType", serviceContext => new GatewayService(serviceContext, communicationContext)).GetAwaiter().GetResult();
+            await communicationContext.WebHost.StartAsync();
+
+            await ServiceRuntime.RegisterServiceAsync("GatewayType", serviceContext => new GatewayService(serviceContext, communicationContext));
 
-            communicationContext.WebHost.Run();
+            await communicationContext.WebHost.WaitForShutdownAsync();
         }
 
         private static AspNetCoreCommunicationContext CreateAspNetCoreCommunicationContext()

diff --git a/Gateway/Properties/launchSettings.json b/Gateway/Properties/launchSettings.json
@@ -1,19 +1,29 @@
-{
+{
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:12172/",
+      "applicationUrl": "http://localhost:62213/",
       "sslPort": 0
     }
   },
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+      "launchUrl": "api/values",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
+    },
+    "Gateway": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "api/values",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:62214"
     }
   }
-}
+}
diff --git a/Gateway/Startup.cs b/Gateway/Startup.cs
@@ -95,9 +95,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             app.MapWhen(
                 context =>
                 {
-                    StringValues serviceUri;
-
-                    return context.Request.Headers.TryGetValue("SF-ServiceUri", out serviceUri) &&
+                    return context.Request.Headers.TryGetValue("SF-ServiceUri", out StringValues serviceUri) &&
                            serviceUri.Count == 1 &&
                            serviceUri[0] == "fabric:/Hosting/CounterService";
                 },

diff --git a/Gateway/app.config b/Gateway/app.config
@@ -1,5 +1,5 @@
 <configuration>
-  <runtime>
-    <gcServer enabled="true"/>
-  </runtime>
+   <runtime>
+      <gcServer enabled="true"/>
+   </runtime>
 </configuration>
diff --git a/Gateway/appsettings.Development.json b/Gateway/appsettings.Development.json
@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
diff --git a/Gateway/appsettings.json b/Gateway/appsettings.json
@@ -2,9 +2,7 @@
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
-      "Default": "Verbose",
-      "System": "Information",
-      "Microsoft": "Information"
+      "Default": "Warning"
     }
   }
 }
diff --git a/Gateway/project.json b/Gateway/project.json
diff --git a/Hosting.TestClient/Hosting.TestClient.csproj b/Hosting.TestClient/Hosting.TestClient.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/Hosting.TestClient/Hosting.TestClient.xproj b/Hosting.TestClient/Hosting.TestClient.xproj