update per tool upgrade changes

2018-07-09 16:49:04 -07:00 · 2018-07-09 16:49:04 -07:00 · 5ae7b6f804
--- a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp.sln
+++ b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp.sln
@ -1,15 +1,15 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27428.2043
+VisualStudioVersion = 15.0.27703.2018
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9B56FCB0-63B4-404F-8A09-42EF52B53347}") = "ServiceFabricMeshApp", "ServiceFabricMeshApp\ServiceFabricMeshApp.sfaproj", "{715A44F3-6534-4BEF-B4A8-E41668C4F0BF}"
+Project("{9B56FCB0-63B4-404F-8A09-42EF52B53347}") = "ServiceFabricMeshApp", "ServiceFabricMeshApp\ServiceFabricMeshApp.sfaproj", "{D84A8F1C-9833-46C1-AC7A-EA51B636279D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebFrontEnd", "WebFrontEnd\WebFrontEnd.csproj", "{E73BAE6F-5568-4D7E-994E-712FC9292C7D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebFrontEnd", "WebFrontEnd\WebFrontEnd.csproj", "{208EEB49-A8FA-4E55-B3FC-52B42C37BC7F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Model\Model.csproj", "{3D014384-D167-46C7-957E-A87340292FF2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Model\Model.csproj", "{28ED7C69-2FA2-4310-81AE-CB0D4B859923}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDoService", "ToDoService\ToDoService.csproj", "{DA3AED09-E0C3-4899-ABDA-00CCD6154423}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToDoService", "ToDoService\ToDoService.csproj", "{348ACB7B-5500-44F1-BAB8-5719D523C3DF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -17,27 +17,27 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{715A44F3-6534-4BEF-B4A8-E41668C4F0BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{715A44F3-6534-4BEF-B4A8-E41668C4F0BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{715A44F3-6534-4BEF-B4A8-E41668C4F0BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{715A44F3-6534-4BEF-B4A8-E41668C4F0BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E73BAE6F-5568-4D7E-994E-712FC9292C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E73BAE6F-5568-4D7E-994E-712FC9292C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E73BAE6F-5568-4D7E-994E-712FC9292C7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E73BAE6F-5568-4D7E-994E-712FC9292C7D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D014384-D167-46C7-957E-A87340292FF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D014384-D167-46C7-957E-A87340292FF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D014384-D167-46C7-957E-A87340292FF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D014384-D167-46C7-957E-A87340292FF2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA3AED09-E0C3-4899-ABDA-00CCD6154423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA3AED09-E0C3-4899-ABDA-00CCD6154423}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA3AED09-E0C3-4899-ABDA-00CCD6154423}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA3AED09-E0C3-4899-ABDA-00CCD6154423}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D84A8F1C-9833-46C1-AC7A-EA51B636279D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D84A8F1C-9833-46C1-AC7A-EA51B636279D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D84A8F1C-9833-46C1-AC7A-EA51B636279D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D84A8F1C-9833-46C1-AC7A-EA51B636279D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{208EEB49-A8FA-4E55-B3FC-52B42C37BC7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{208EEB49-A8FA-4E55-B3FC-52B42C37BC7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{208EEB49-A8FA-4E55-B3FC-52B42C37BC7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{208EEB49-A8FA-4E55-B3FC-52B42C37BC7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28ED7C69-2FA2-4310-81AE-CB0D4B859923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28ED7C69-2FA2-4310-81AE-CB0D4B859923}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28ED7C69-2FA2-4310-81AE-CB0D4B859923}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28ED7C69-2FA2-4310-81AE-CB0D4B859923}.Release|Any CPU.Build.0 = Release|Any CPU
+		{348ACB7B-5500-44F1-BAB8-5719D523C3DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{348ACB7B-5500-44F1-BAB8-5719D523C3DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{348ACB7B-5500-44F1-BAB8-5719D523C3DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{348ACB7B-5500-44F1-BAB8-5719D523C3DF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {78D5E43F-A96B-4AE3-ADD5-607D08941D3A}
+		SolutionGuid = {A2E0D617-9D10-4EF6-90A1-8D4C179343D8}
 	EndGlobalSection
 EndGlobal
--- a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App
+++ b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App
@ -1,4 +1,5 @@
 application:
-  schemaVersion: 0.0.1
+  schemaVersion: 1.0.0-preview1
  name: ServiceFabricMeshApp
-  description: ServiceFabricMeshApp description.
+  properties:
+    description: ServiceFabricMeshApp description.
--- a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App
+++ b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App
@ -1,13 +1,14 @@
 ## Network definition ##
 network:
-  schemaVersion: 0.0.1
+  schemaVersion: 1.0.0-preview1
  name: ServiceFabricMeshAppNetwork
-  description: ServiceFabricMeshAppNetwork description.
-  addressPrefix: 10.0.0.4/22
-  ingressConfig:
-    layer4:
-      - name: WebFrontEndIngress
-        publicPort: 20001
-        applicationName: ServiceFabricMeshApp
-        serviceName: WebFrontEnd
-        endpointName: WebFrontEndListener
+  properties:
+    description: ServiceFabricMeshAppNetwork description.
+    addressPrefix: 10.0.0.4/22
+    ingressConfig:
+      layer4:
+        - name: WebFrontEndIngress
+          publicPort: 20009
+          applicationName: ServiceFabricMeshApp
+          serviceName: WebFrontEnd
+          endpointName: WebFrontEndListener
--- a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/Publish
+++ b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/Publish
@ -1,3 +1,3 @@
 ## Visual Studio SFApp Publish Profile ##
 vsSFAppPublishProfile:
-  schemaVersion: 0.0.1
+  schemaVersion: 1.0.0-preview1
--- a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/ServiceFabricMeshApp.sfaproj
+++ b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/ServiceFabricMeshApp.sfaproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.SFApp.Sdk">
  <PropertyGroup Label="Globals">
-    <ProjectGuid>715a44f3-6534-4bef-b4a8-e41668c4f0bf</ProjectGuid>
-    <SFApplicationProjectVersion>0.7</SFApplicationProjectVersion>
-    <SFApplicationTargetsVersion>0.7</SFApplicationTargetsVersion>
-    <SFApplicationToolingVersion>0.7.0.0</SFApplicationToolingVersion>
+    <ProjectGuid>d84a8f1c-9833-46c1-ac7a-ea51b636279d</ProjectGuid>
+    <SFApplicationProjectVersion>1.0</SFApplicationProjectVersion>
+    <SFApplicationTargetsVersion>1.0.0-preview.4.0</SFApplicationTargetsVersion>
+    <SFApplicationToolingVersion>0.8.0.0</SFApplicationToolingVersion>
  </PropertyGroup>
  <ItemGroup>
    <None Include="App Resources\app.yaml" />
--- a/samples/src/basicservicefabricmeshapp/ToDoService/Dockerfile
+++ b/samples/src/basicservicefabricmeshapp/ToDoService/Dockerfile
@ -1,6 +1,6 @@
-FROM microsoft/aspnetcore:2.0 AS base
+FROM microsoft/aspnetcore:2.0-nanoserver-1709 AS base
 WORKDIR /app
-EXPOSE 20006
+EXPOSE 20003

 FROM microsoft/aspnetcore-build:2.0 AS build
 WORKDIR /src
--- a/samples/src/basicservicefabricmeshapp/ToDoService/Service
+++ b/samples/src/basicservicefabricmeshapp/ToDoService/Service
@ -1,26 +1,28 @@
 ## Service definition ##
 application:
-  schemaVersion: 0.0.1
+  schemaVersion: 1.0.0-preview1
  name: ServiceFabricMeshApp
-  services:
-    - name: ToDoService
-      description: ToDoService description.
-      osType: Windows
-      codePackages:
-        - name: ToDoService
-          image: todoservice:dev
-          endpoints:
-            - name: ToDoServiceListener
-              port: 20006
-          environmentVariables:
-            - name: ASPNETCORE_URLS
-              value: http://+:20006
-#            - name: ApplicationInsights:InstrumentationKey
-#              value: "<Place AppInsights key here, or reference it via a secret>"
-          resources:
-            requests:
-              cpu: 0.5
-              memoryInGB: 1
-      replicaCount: 1
-      networkRefs:
-        - name: ServiceFabricMeshAppNetwork
+  properties:
+    services:
+      - name: ToDoService
+        properties:
+          description: ToDoService description.
+          osType: Windows
+          codePackages:
+            - name: ToDoService
+              image: todoservice:dev
+              endpoints:
+                - name: ToDoServiceListener
+                  port: 20003
+              environmentVariables:
+                - name: ASPNETCORE_URLS
+                  value: http://+:20003
+#                - name: ApplicationInsights:InstrumentationKey
+#                  value: "<Place AppInsights key here, or reference it via a secret>"
+              resources:
+                requests:
+                  cpu: 0.5
+                  memoryInGB: 1
+          replicaCount: 1
+          networkRefs:
+            - name: ServiceFabricMeshAppNetwork
--- a/samples/src/basicservicefabricmeshapp/ToDoService/ToDoService.csproj
+++ b/samples/src/basicservicefabricmeshapp/ToDoService/ToDoService.csproj
@ -10,12 +10,12 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.7" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.SFApp.Targets" Version="1.0.0-preview.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.SFApp.Targets" Version="1.0.0-preview.4.0" />
  </ItemGroup>

  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
  </ItemGroup>

  <ItemGroup>
--- a/samples/src/basicservicefabricmeshapp/WebFrontEnd/Dockerfile
+++ b/samples/src/basicservicefabricmeshapp/WebFrontEnd/Dockerfile
@ -1,6 +1,6 @@
-FROM microsoft/aspnetcore:2.0 AS base
+FROM microsoft/aspnetcore:2.0-nanoserver-1709 AS base
 WORKDIR /app
-EXPOSE 20001
+EXPOSE 20009

 FROM microsoft/aspnetcore-build:2.0 AS build
 WORKDIR /src
--- a/samples/src/basicservicefabricmeshapp/WebFrontEnd/Pages/Index.cshtml.cs
+++ b/samples/src/basicservicefabricmeshapp/WebFrontEnd/Pages/Index.cshtml.cs
@ -1,10 +1,10 @@
-using System.Net.Http;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using System.Net.Http;

 namespace WebFrontEnd.Pages
 {
--- a/samples/src/basicservicefabricmeshapp/WebFrontEnd/Service
+++ b/samples/src/basicservicefabricmeshapp/WebFrontEnd/Service
@ -1,32 +1,34 @@
 ## Service definition ##
 application:
-  schemaVersion: 0.0.1
+  schemaVersion: 1.0.0-preview1
  name: ServiceFabricMeshApp
-  services:
-    - name: WebFrontEnd
-      description: WebFrontEnd description.
-      osType: Windows
-      codePackages:
-        - name: WebFrontEnd
-          image: webfrontend:dev
-          endpoints:
-            - name: WebFrontEndListener
-              port: 20001
-          environmentVariables:
-            - name: ASPNETCORE_URLS
-              value: http://+:20001
-            - name: AppName
-              value: ServiceFabricMeshApp
-            - name: ApiHostPort
-              value: 20006
-            - name: ServiceName
-              value: ToDoService
-#            - name: ApplicationInsights:InstrumentationKey
-#              value: "<Place AppInsights key here, or reference it via a secret>"
-          resources:
-            requests:
-              cpu: 0.5
-              memoryInGB: 1
-      replicaCount: 1
-      networkRefs:
-        - name: ServiceFabricMeshAppNetwork
+  properties:
+    services:
+      - name: WebFrontEnd
+        properties:
+          description: WebFrontEnd description.
+          osType: Windows
+          codePackages:
+            - name: WebFrontEnd
+              image: webfrontend:dev
+              endpoints:
+                - name: WebFrontEndListener
+                  port: 20009
+              environmentVariables:
+                - name: ASPNETCORE_URLS
+                  value: http://+:20009
+                - name: AppName
+                  value: ServiceFabricMeshApp
+                - name: ApiHostPort
+                  value: 20003
+                - name: ServiceName
+                  value: ToDoService
+#                - name: ApplicationInsights:InstrumentationKey
+#                  value: "<Place AppInsights key here, or reference it via a secret>"
+              resources:
+                requests:
+                  cpu: 0.5
+                  memoryInGB: 1
+          replicaCount: 1
+          networkRefs:
+            - name: ServiceFabricMeshAppNetwork
--- a/samples/src/basicservicefabricmeshapp/WebFrontEnd/WebFrontEnd.csproj
+++ b/samples/src/basicservicefabricmeshapp/WebFrontEnd/WebFrontEnd.csproj
@ -4,11 +4,11 @@
    <IsSFAppServiceProject>true</IsSFAppServiceProject>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.7" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.SFApp.Targets" Version="1.0.0-preview.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.SFApp.Targets" Version="1.0.0-preview.4.0" />
  </ItemGroup>
  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Model\Model.csproj" />