Update sample per tool version update (#214)
This commit is contained in:
Tyler Whitney
GitHub
Родитель
972465389b
Коммит
73ca9cb49a
|
|
@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio 15
|
# Visual Studio 15
|
||||||
VisualStudioVersion = 15.0.27703.2018
|
VisualStudioVersion = 15.0.27703.2018
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
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
|
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
|
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
|
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
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
|
@ -17,27 +17,27 @@ Global
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{C89B0C1C-B14D-4F59-A6F8-D19AE5C3717A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{D84A8F1C-9833-46C1-AC7A-EA51B636279D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{C89B0C1C-B14D-4F59-A6F8-D19AE5C3717A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{D84A8F1C-9833-46C1-AC7A-EA51B636279D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{C89B0C1C-B14D-4F59-A6F8-D19AE5C3717A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{D84A8F1C-9833-46C1-AC7A-EA51B636279D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{C89B0C1C-B14D-4F59-A6F8-D19AE5C3717A}.Release|Any CPU.Build.0 = Release|Any CPU
|
{D84A8F1C-9833-46C1-AC7A-EA51B636279D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{619D32B7-54A9-4B8B-9207-FBA4DDEDA82F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{208EEB49-A8FA-4E55-B3FC-52B42C37BC7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{619D32B7-54A9-4B8B-9207-FBA4DDEDA82F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{208EEB49-A8FA-4E55-B3FC-52B42C37BC7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{619D32B7-54A9-4B8B-9207-FBA4DDEDA82F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{208EEB49-A8FA-4E55-B3FC-52B42C37BC7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{619D32B7-54A9-4B8B-9207-FBA4DDEDA82F}.Release|Any CPU.Build.0 = Release|Any CPU
|
{208EEB49-A8FA-4E55-B3FC-52B42C37BC7F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{D4AC5D3D-52B6-487C-806C-B313A894CA18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{28ED7C69-2FA2-4310-81AE-CB0D4B859923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{D4AC5D3D-52B6-487C-806C-B313A894CA18}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{28ED7C69-2FA2-4310-81AE-CB0D4B859923}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{D4AC5D3D-52B6-487C-806C-B313A894CA18}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{28ED7C69-2FA2-4310-81AE-CB0D4B859923}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{D4AC5D3D-52B6-487C-806C-B313A894CA18}.Release|Any CPU.Build.0 = Release|Any CPU
|
{28ED7C69-2FA2-4310-81AE-CB0D4B859923}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{0FA09489-A555-4F10-8EE0-D3D8996EC2DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{348ACB7B-5500-44F1-BAB8-5719D523C3DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{0FA09489-A555-4F10-8EE0-D3D8996EC2DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{348ACB7B-5500-44F1-BAB8-5719D523C3DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{0FA09489-A555-4F10-8EE0-D3D8996EC2DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{348ACB7B-5500-44F1-BAB8-5719D523C3DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{0FA09489-A555-4F10-8EE0-D3D8996EC2DE}.Release|Any CPU.Build.0 = Release|Any CPU
|
{348ACB7B-5500-44F1-BAB8-5719D523C3DF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {56DAD6D8-45B9-4299-B83B-BA6B0AA66D53}
|
SolutionGuid = {A2E0D617-9D10-4EF6-90A1-8D4C179343D8}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
application:
|
application:
|
||||||
schemaVersion: 0.0.1
|
schemaVersion: 1.0.0-preview1
|
||||||
name: ServiceFabricMeshApp
|
name: ServiceFabricMeshApp
|
||||||
description: ServiceFabricMeshApp description.
|
properties:
|
||||||
|
description: ServiceFabricMeshApp description.
|
||||||
|
|
@ -1,13 +1,14 @@
|
||||||
## Network definition ##
|
## Network definition ##
|
||||||
network:
|
network:
|
||||||
schemaVersion: 0.0.1
|
schemaVersion: 1.0.0-preview1
|
||||||
name: ServiceFabricMeshAppNetwork
|
name: ServiceFabricMeshAppNetwork
|
||||||
description: ServiceFabricMeshAppNetwork description.
|
properties:
|
||||||
addressPrefix: 10.0.0.4/22
|
description: ServiceFabricMeshAppNetwork description.
|
||||||
ingressConfig:
|
addressPrefix: 10.0.0.4/22
|
||||||
layer4:
|
ingressConfig:
|
||||||
- name: WebFrontEndIngress
|
layer4:
|
||||||
publicPort: 20002
|
- name: WebFrontEndIngress
|
||||||
applicationName: ServiceFabricMeshApp
|
publicPort: 20009
|
||||||
serviceName: WebFrontEnd
|
applicationName: ServiceFabricMeshApp
|
||||||
endpointName: WebFrontEndListener
|
serviceName: WebFrontEnd
|
||||||
|
endpointName: WebFrontEndListener
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
## Visual Studio SFApp Publish Profile ##
|
## Visual Studio SFApp Publish Profile ##
|
||||||
vsSFAppPublishProfile:
|
vsSFAppPublishProfile:
|
||||||
schemaVersion: 0.0.1
|
schemaVersion: 1.0.0-preview1
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<Project Sdk="Microsoft.SFApp.Sdk">
|
<Project Sdk="Microsoft.SFApp.Sdk">
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>c89b0c1c-b14d-4f59-a6f8-d19ae5c3717a</ProjectGuid>
|
<ProjectGuid>d84a8f1c-9833-46c1-ac7a-ea51b636279d</ProjectGuid>
|
||||||
<SFApplicationProjectVersion>0.7</SFApplicationProjectVersion>
|
<SFApplicationProjectVersion>1.0</SFApplicationProjectVersion>
|
||||||
<SFApplicationTargetsVersion>0.7</SFApplicationTargetsVersion>
|
<SFApplicationTargetsVersion>1.0.0-preview.4.0</SFApplicationTargetsVersion>
|
||||||
<SFApplicationToolingVersion>0.7.0.0</SFApplicationToolingVersion>
|
<SFApplicationToolingVersion>0.8.0.0</SFApplicationToolingVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="App Resources\app.yaml" />
|
<None Include="App Resources\app.yaml" />
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
FROM microsoft/aspnetcore:2.0 AS base
|
FROM microsoft/aspnetcore:2.0-nanoserver-1709 AS base
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
EXPOSE 20001
|
EXPOSE 20003
|
||||||
|
|
||||||
FROM microsoft/aspnetcore-build:2.0 AS build
|
FROM microsoft/aspnetcore-build:2.0 AS build
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
"windowsAuthentication": false,
|
"windowsAuthentication": false,
|
||||||
"anonymousAuthentication": true,
|
"anonymousAuthentication": true,
|
||||||
"iisExpress": {
|
"iisExpress": {
|
||||||
"applicationUrl": "http://localhost:2980/",
|
"applicationUrl": "http://localhost:1702/",
|
||||||
"sslPort": 0
|
"sslPort": 0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
"environmentVariables": {
|
"environmentVariables": {
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
},
|
},
|
||||||
"applicationUrl": "http://localhost:2981/"
|
"applicationUrl": "http://localhost:1703/"
|
||||||
},
|
},
|
||||||
"Service Fabric Local Cluster": {
|
"Service Fabric Local Cluster": {
|
||||||
"commandName": "SFApp",
|
"commandName": "SFApp",
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,28 @@
|
||||||
## Service definition ##
|
## Service definition ##
|
||||||
application:
|
application:
|
||||||
schemaVersion: 0.0.1
|
schemaVersion: 1.0.0-preview1
|
||||||
name: ServiceFabricMeshApp
|
name: ServiceFabricMeshApp
|
||||||
services:
|
properties:
|
||||||
- name: ToDoService
|
services:
|
||||||
description: ToDoService description.
|
- name: ToDoService
|
||||||
osType: Windows
|
properties:
|
||||||
codePackages:
|
description: ToDoService description.
|
||||||
- name: ToDoService
|
osType: Windows
|
||||||
image: todoservice:dev
|
codePackages:
|
||||||
endpoints:
|
- name: ToDoService
|
||||||
- name: ToDoServiceListener
|
image: todoservice:dev
|
||||||
port: 20001
|
endpoints:
|
||||||
environmentVariables:
|
- name: ToDoServiceListener
|
||||||
- name: ASPNETCORE_URLS
|
port: 20003
|
||||||
value: http://+:20001
|
environmentVariables:
|
||||||
# - name: ApplicationInsights:InstrumentationKey
|
- name: ASPNETCORE_URLS
|
||||||
# value: "<Place AppInsights key here, or reference it via a secret>"
|
value: http://+:20003
|
||||||
resources:
|
# - name: ApplicationInsights:InstrumentationKey
|
||||||
requests:
|
# value: "<Place AppInsights key here, or reference it via a secret>"
|
||||||
cpu: 0.5
|
resources:
|
||||||
memoryInGB: 1
|
requests:
|
||||||
replicaCount: 1
|
cpu: 0.5
|
||||||
networkRefs:
|
memoryInGB: 1
|
||||||
- name: ServiceFabricMeshAppNetwork
|
replicaCount: 1
|
||||||
|
networkRefs:
|
||||||
|
- name: ServiceFabricMeshAppNetwork
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
|
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
|
||||||
<PackageReference Include="Microsoft.VisualStudio.Azure.SFApp.Targets" Version="1.0.0-preview.1.0" />
|
<PackageReference Include="Microsoft.VisualStudio.Azure.SFApp.Targets" Version="1.0.0-preview.4.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
FROM microsoft/aspnetcore:2.0 AS base
|
FROM microsoft/aspnetcore:2.0-nanoserver-1709 AS base
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
EXPOSE 20002
|
EXPOSE 20009
|
||||||
|
|
||||||
FROM microsoft/aspnetcore-build:2.0 AS build
|
FROM microsoft/aspnetcore-build:2.0 AS build
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net.Http;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||||
|
using System.Net.Http;
|
||||||
|
|
||||||
namespace WebFrontEnd.Pages
|
namespace WebFrontEnd.Pages
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
"windowsAuthentication": false,
|
"windowsAuthentication": false,
|
||||||
"anonymousAuthentication": true,
|
"anonymousAuthentication": true,
|
||||||
"iisExpress": {
|
"iisExpress": {
|
||||||
"applicationUrl": "http://localhost:2897/",
|
"applicationUrl": "http://localhost:1175/",
|
||||||
"sslPort": 0
|
"sslPort": 0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
"environmentVariables": {
|
"environmentVariables": {
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
},
|
},
|
||||||
"applicationUrl": "http://localhost:2898/"
|
"applicationUrl": "http://localhost:1176/"
|
||||||
},
|
},
|
||||||
"Service Fabric Local Cluster": {
|
"Service Fabric Local Cluster": {
|
||||||
"commandName": "SFApp",
|
"commandName": "SFApp",
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,34 @@
|
||||||
## Service definition ##
|
## Service definition ##
|
||||||
application:
|
application:
|
||||||
schemaVersion: 0.0.1
|
schemaVersion: 1.0.0-preview1
|
||||||
name: ServiceFabricMeshApp
|
name: ServiceFabricMeshApp
|
||||||
services:
|
properties:
|
||||||
- name: WebFrontEnd
|
services:
|
||||||
description: WebFrontEnd description.
|
- name: WebFrontEnd
|
||||||
osType: Windows
|
properties:
|
||||||
codePackages:
|
description: WebFrontEnd description.
|
||||||
- name: WebFrontEnd
|
osType: Windows
|
||||||
image: webfrontend:dev
|
codePackages:
|
||||||
endpoints:
|
- name: WebFrontEnd
|
||||||
- name: WebFrontEndListener
|
image: webfrontend:dev
|
||||||
port: 20002
|
endpoints:
|
||||||
environmentVariables:
|
- name: WebFrontEndListener
|
||||||
- name: ASPNETCORE_URLS
|
port: 20009
|
||||||
value: http://+:20002
|
environmentVariables:
|
||||||
# - name: ApplicationInsights:InstrumentationKey
|
- name: ASPNETCORE_URLS
|
||||||
# value: "<Place AppInsights key here, or reference it via a secret>"
|
value: http://+:20009
|
||||||
- name: AppName
|
- name: AppName
|
||||||
value: ServiceFabricMeshApp
|
value: ServiceFabricMeshApp
|
||||||
- name: ApiHostPort
|
- name: ApiHostPort
|
||||||
value: 20001
|
value: 20003
|
||||||
- name: ServiceName
|
- name: ServiceName
|
||||||
value: ToDoService
|
value: ToDoService
|
||||||
resources:
|
# - name: ApplicationInsights:InstrumentationKey
|
||||||
requests:
|
# value: "<Place AppInsights key here, or reference it via a secret>"
|
||||||
cpu: 0.5
|
resources:
|
||||||
memoryInGB: 1
|
requests:
|
||||||
replicaCount: 1
|
cpu: 0.5
|
||||||
networkRefs:
|
memoryInGB: 1
|
||||||
- name: ServiceFabricMeshAppNetwork
|
replicaCount: 1
|
||||||
|
networkRefs:
|
||||||
|
- name: ServiceFabricMeshAppNetwork
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
|
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
|
||||||
<PackageReference Include="Microsoft.VisualStudio.Azure.SFApp.Targets" Version="1.0.0-preview.1.0" />
|
<PackageReference Include="Microsoft.VisualStudio.Azure.SFApp.Targets" Version="1.0.0-preview.4.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
|
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче