From 73ca9cb49a045edf60d70ddc8dbd72423318242d Mon Sep 17 00:00:00 2001 From: Tyler Whitney Date: Tue, 10 Jul 2018 14:21:12 -0700 Subject: [PATCH] Update sample per tool version update (#214) --- .../ServiceFabricMeshApp.sln | 42 ++++++------- .../App Resources/app.yaml | 5 +- .../App Resources/network.yaml | 21 +++---- .../Publish Profiles/cloud.yaml | 2 +- .../ServiceFabricMeshApp.sfaproj | 8 +-- .../ToDoService/Dockerfile | 4 +- .../Properties/launchSettings.json | 4 +- .../Service Resources/service.yaml | 48 ++++++++------- .../ToDoService/ToDoService.csproj | 2 +- .../WebFrontEnd/Dockerfile | 4 +- .../WebFrontEnd/Pages/Index.cshtml.cs | 2 +- .../Properties/launchSettings.json | 4 +- .../Service Resources/service.yaml | 60 ++++++++++--------- .../WebFrontEnd/WebFrontEnd.csproj | 2 +- 14 files changed, 107 insertions(+), 101 deletions(-) diff --git a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp.sln b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp.sln index eaabf3e..54de5e4 100644 --- a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp.sln +++ b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27703.2018 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9B56FCB0-63B4-404F-8A09-42EF52B53347}") = "ServiceFabricMeshApp", "ServiceFabricMeshApp\ServiceFabricMeshApp.sfaproj", "{C89B0C1C-B14D-4F59-A6F8-D19AE5C3717A}" +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", "{619D32B7-54A9-4B8B-9207-FBA4DDEDA82F}" +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", "{D4AC5D3D-52B6-487C-806C-B313A894CA18}" +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", "{0FA09489-A555-4F10-8EE0-D3D8996EC2DE}" +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 - {C89B0C1C-B14D-4F59-A6F8-D19AE5C3717A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C89B0C1C-B14D-4F59-A6F8-D19AE5C3717A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C89B0C1C-B14D-4F59-A6F8-D19AE5C3717A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C89B0C1C-B14D-4F59-A6F8-D19AE5C3717A}.Release|Any CPU.Build.0 = Release|Any CPU - {619D32B7-54A9-4B8B-9207-FBA4DDEDA82F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {619D32B7-54A9-4B8B-9207-FBA4DDEDA82F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {619D32B7-54A9-4B8B-9207-FBA4DDEDA82F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {619D32B7-54A9-4B8B-9207-FBA4DDEDA82F}.Release|Any CPU.Build.0 = Release|Any CPU - {D4AC5D3D-52B6-487C-806C-B313A894CA18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4AC5D3D-52B6-487C-806C-B313A894CA18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4AC5D3D-52B6-487C-806C-B313A894CA18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4AC5D3D-52B6-487C-806C-B313A894CA18}.Release|Any CPU.Build.0 = Release|Any CPU - {0FA09489-A555-4F10-8EE0-D3D8996EC2DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FA09489-A555-4F10-8EE0-D3D8996EC2DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FA09489-A555-4F10-8EE0-D3D8996EC2DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FA09489-A555-4F10-8EE0-D3D8996EC2DE}.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 = {56DAD6D8-45B9-4299-B83B-BA6B0AA66D53} + SolutionGuid = {A2E0D617-9D10-4EF6-90A1-8D4C179343D8} EndGlobalSection EndGlobal diff --git a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App Resources/app.yaml b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App Resources/app.yaml index c7c4a28..d22a6e1 100644 --- a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App Resources/app.yaml +++ b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App Resources/app.yaml @@ -1,4 +1,5 @@ application: - schemaVersion: 0.0.1 + schemaVersion: 1.0.0-preview1 name: ServiceFabricMeshApp - description: ServiceFabricMeshApp description. \ No newline at end of file + properties: + description: ServiceFabricMeshApp description. \ No newline at end of file diff --git a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App Resources/network.yaml b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App Resources/network.yaml index eece75f..591f9dd 100644 --- a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App Resources/network.yaml +++ b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/App Resources/network.yaml @@ -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: 20002 - applicationName: ServiceFabricMeshApp - serviceName: WebFrontEnd - endpointName: WebFrontEndListener \ No newline at end of file + properties: + description: ServiceFabricMeshAppNetwork description. + addressPrefix: 10.0.0.4/22 + ingressConfig: + layer4: + - name: WebFrontEndIngress + publicPort: 20009 + applicationName: ServiceFabricMeshApp + serviceName: WebFrontEnd + endpointName: WebFrontEndListener \ No newline at end of file diff --git a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/Publish Profiles/cloud.yaml b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/Publish Profiles/cloud.yaml index d52100c..8ee80e3 100644 --- a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/Publish Profiles/cloud.yaml +++ b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/Publish Profiles/cloud.yaml @@ -1,3 +1,3 @@ ## Visual Studio SFApp Publish Profile ## vsSFAppPublishProfile: - schemaVersion: 0.0.1 \ No newline at end of file + schemaVersion: 1.0.0-preview1 \ No newline at end of file diff --git a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/ServiceFabricMeshApp.sfaproj b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/ServiceFabricMeshApp.sfaproj index 63c73ad..66e7ffc 100644 --- a/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/ServiceFabricMeshApp.sfaproj +++ b/samples/src/basicservicefabricmeshapp/ServiceFabricMeshApp/ServiceFabricMeshApp.sfaproj @@ -1,9 +1,9 @@  - c89b0c1c-b14d-4f59-a6f8-d19ae5c3717a - 0.7 - 0.7 - 0.7.0.0 + d84a8f1c-9833-46c1-ac7a-ea51b636279d + 1.0 + 1.0.0-preview.4.0 + 0.8.0.0 diff --git a/samples/src/basicservicefabricmeshapp/ToDoService/Dockerfile b/samples/src/basicservicefabricmeshapp/ToDoService/Dockerfile index 88b80b5..cfc1278 100644 --- 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 20001 +EXPOSE 20003 FROM microsoft/aspnetcore-build:2.0 AS build WORKDIR /src diff --git a/samples/src/basicservicefabricmeshapp/ToDoService/Properties/launchSettings.json b/samples/src/basicservicefabricmeshapp/ToDoService/Properties/launchSettings.json index bcc69af..ce83d06 100644 --- a/samples/src/basicservicefabricmeshapp/ToDoService/Properties/launchSettings.json +++ b/samples/src/basicservicefabricmeshapp/ToDoService/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:2980/", + "applicationUrl": "http://localhost:1702/", "sslPort": 0 } }, @@ -23,7 +23,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://localhost:2981/" + "applicationUrl": "http://localhost:1703/" }, "Service Fabric Local Cluster": { "commandName": "SFApp", diff --git a/samples/src/basicservicefabricmeshapp/ToDoService/Service Resources/service.yaml b/samples/src/basicservicefabricmeshapp/ToDoService/Service Resources/service.yaml index edb4559..fdac883 100644 --- a/samples/src/basicservicefabricmeshapp/ToDoService/Service Resources/service.yaml +++ b/samples/src/basicservicefabricmeshapp/ToDoService/Service Resources/service.yaml @@ -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: 20001 - environmentVariables: - - name: ASPNETCORE_URLS - value: http://+:20001 -# - name: ApplicationInsights:InstrumentationKey -# value: "" - resources: - requests: - cpu: 0.5 - memoryInGB: 1 - replicaCount: 1 - networkRefs: - - name: ServiceFabricMeshAppNetwork \ No newline at end of file + 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: "" + resources: + requests: + cpu: 0.5 + memoryInGB: 1 + replicaCount: 1 + networkRefs: + - name: ServiceFabricMeshAppNetwork \ No newline at end of file diff --git a/samples/src/basicservicefabricmeshapp/ToDoService/ToDoService.csproj b/samples/src/basicservicefabricmeshapp/ToDoService/ToDoService.csproj index aae0bed..2e95bff 100644 --- a/samples/src/basicservicefabricmeshapp/ToDoService/ToDoService.csproj +++ b/samples/src/basicservicefabricmeshapp/ToDoService/ToDoService.csproj @@ -11,7 +11,7 @@ - + diff --git a/samples/src/basicservicefabricmeshapp/WebFrontEnd/Dockerfile b/samples/src/basicservicefabricmeshapp/WebFrontEnd/Dockerfile index 76269f8..038d630 100644 --- 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 20002 +EXPOSE 20009 FROM microsoft/aspnetcore-build:2.0 AS build WORKDIR /src diff --git a/samples/src/basicservicefabricmeshapp/WebFrontEnd/Pages/Index.cshtml.cs b/samples/src/basicservicefabricmeshapp/WebFrontEnd/Pages/Index.cshtml.cs index e5c16e9..9871899 100644 --- a/samples/src/basicservicefabricmeshapp/WebFrontEnd/Pages/Index.cshtml.cs +++ b/samples/src/basicservicefabricmeshapp/WebFrontEnd/Pages/Index.cshtml.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using System.Net.Http; namespace WebFrontEnd.Pages { diff --git a/samples/src/basicservicefabricmeshapp/WebFrontEnd/Properties/launchSettings.json b/samples/src/basicservicefabricmeshapp/WebFrontEnd/Properties/launchSettings.json index 1538771..bd06714 100644 --- a/samples/src/basicservicefabricmeshapp/WebFrontEnd/Properties/launchSettings.json +++ b/samples/src/basicservicefabricmeshapp/WebFrontEnd/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:2897/", + "applicationUrl": "http://localhost:1175/", "sslPort": 0 } }, @@ -21,7 +21,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://localhost:2898/" + "applicationUrl": "http://localhost:1176/" }, "Service Fabric Local Cluster": { "commandName": "SFApp", diff --git a/samples/src/basicservicefabricmeshapp/WebFrontEnd/Service Resources/service.yaml b/samples/src/basicservicefabricmeshapp/WebFrontEnd/Service Resources/service.yaml index 7d6cb2c..13460e4 100644 --- a/samples/src/basicservicefabricmeshapp/WebFrontEnd/Service Resources/service.yaml +++ b/samples/src/basicservicefabricmeshapp/WebFrontEnd/Service Resources/service.yaml @@ -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: 20002 - environmentVariables: - - name: ASPNETCORE_URLS - value: http://+:20002 -# - name: ApplicationInsights:InstrumentationKey -# value: "" - - name: AppName - value: ServiceFabricMeshApp - - name: ApiHostPort - value: 20001 - - name: ServiceName - value: ToDoService - resources: - requests: - cpu: 0.5 - memoryInGB: 1 - replicaCount: 1 - networkRefs: - - name: ServiceFabricMeshAppNetwork \ No newline at end of file + 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: "" + resources: + requests: + cpu: 0.5 + memoryInGB: 1 + replicaCount: 1 + networkRefs: + - name: ServiceFabricMeshAppNetwork \ No newline at end of file diff --git a/samples/src/basicservicefabricmeshapp/WebFrontEnd/WebFrontEnd.csproj b/samples/src/basicservicefabricmeshapp/WebFrontEnd/WebFrontEnd.csproj index 52cd9a3..d773780 100644 --- a/samples/src/basicservicefabricmeshapp/WebFrontEnd/WebFrontEnd.csproj +++ b/samples/src/basicservicefabricmeshapp/WebFrontEnd/WebFrontEnd.csproj @@ -5,7 +5,7 @@ - +