Merge pull request #196 from Azure/twhitney-fixsample
Twhitney fixsample
This commit is contained in:
Tyler Whitney
GitHub
Коммит
4e550028b7
|
|
@ -46,7 +46,7 @@ dlldata.c
|
|||
project.lock.json
|
||||
project.fragment.lock.json
|
||||
artifacts/
|
||||
**/Properties/launchSettings.json
|
||||
# **/Properties/launchSettings.json
|
||||
|
||||
*_i.c
|
||||
*_p.c
|
||||
|
|
|
|||
|
|
@ -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", "{C89B0C1C-B14D-4F59-A6F8-D19AE5C3717A}"
|
||||
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", "{619D32B7-54A9-4B8B-9207-FBA4DDEDA82F}"
|
||||
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", "{D4AC5D3D-52B6-487C-806C-B313A894CA18}"
|
||||
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", "{0FA09489-A555-4F10-8EE0-D3D8996EC2DE}"
|
||||
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
|
||||
{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
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {78D5E43F-A96B-4AE3-ADD5-607D08941D3A}
|
||||
SolutionGuid = {56DAD6D8-45B9-4299-B83B-BA6B0AA66D53}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ network:
|
|||
ingressConfig:
|
||||
layer4:
|
||||
- name: WebFrontEndIngress
|
||||
publicPort: 20001
|
||||
publicPort: 20002
|
||||
applicationName: ServiceFabricMeshApp
|
||||
serviceName: WebFrontEnd
|
||||
endpointName: WebFrontEndListener
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<Project Sdk="Microsoft.SFApp.Sdk">
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>715a44f3-6534-4bef-b4a8-e41668c4f0bf</ProjectGuid>
|
||||
<ProjectGuid>c89b0c1c-b14d-4f59-a6f8-d19ae5c3717a</ProjectGuid>
|
||||
<SFApplicationProjectVersion>0.7</SFApplicationProjectVersion>
|
||||
<SFApplicationTargetsVersion>0.7</SFApplicationTargetsVersion>
|
||||
<SFApplicationToolingVersion>0.7.0.0</SFApplicationToolingVersion>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
FROM microsoft/aspnetcore:2.0 AS base
|
||||
WORKDIR /app
|
||||
EXPOSE 20006
|
||||
EXPOSE 20001
|
||||
|
||||
FROM microsoft/aspnetcore-build:2.0 AS build
|
||||
WORKDIR /src
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
{
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:2980/",
|
||||
"sslPort": 0
|
||||
}
|
||||
},
|
||||
"profiles": {
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "api/values",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"ToDoService": {
|
||||
"commandName": "Project",
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "api/values",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
},
|
||||
"applicationUrl": "http://localhost:2981/"
|
||||
},
|
||||
"Service Fabric Local Cluster": {
|
||||
"commandName": "SFApp",
|
||||
"launchUrl": "http://{ServiceIpAddress}:{ServicePort}/api/values"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -11,10 +11,10 @@ application:
|
|||
image: todoservice:dev
|
||||
endpoints:
|
||||
- name: ToDoServiceListener
|
||||
port: 20006
|
||||
port: 20001
|
||||
environmentVariables:
|
||||
- name: ASPNETCORE_URLS
|
||||
value: http://+:20006
|
||||
value: http://+:20001
|
||||
# - name: ApplicationInsights:InstrumentationKey
|
||||
# value: "<Place AppInsights key here, or reference it via a secret>"
|
||||
resources:
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.7" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Azure.SFApp.Targets" Version="1.0.0-preview.1.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>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
FROM microsoft/aspnetcore:2.0 AS base
|
||||
WORKDIR /app
|
||||
EXPOSE 20001
|
||||
EXPOSE 20002
|
||||
|
||||
FROM microsoft/aspnetcore-build:2.0 AS build
|
||||
WORKDIR /src
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
using System.Net.Http;
|
||||
using System;
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:2897/",
|
||||
"sslPort": 0
|
||||
}
|
||||
},
|
||||
"profiles": {
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"WebFrontEnd": {
|
||||
"commandName": "Project",
|
||||
"launchBrowser": true,
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
},
|
||||
"applicationUrl": "http://localhost:2898/"
|
||||
},
|
||||
"Service Fabric Local Cluster": {
|
||||
"commandName": "SFApp",
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "http://{ServiceIpAddress}:{ServicePort}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -11,18 +11,18 @@ application:
|
|||
image: webfrontend:dev
|
||||
endpoints:
|
||||
- name: WebFrontEndListener
|
||||
port: 20001
|
||||
port: 20002
|
||||
environmentVariables:
|
||||
- name: ASPNETCORE_URLS
|
||||
value: http://+:20001
|
||||
value: http://+:20002
|
||||
# - name: ApplicationInsights:InstrumentationKey
|
||||
# value: "<Place AppInsights key here, or reference it via a secret>"
|
||||
- name: AppName
|
||||
value: ServiceFabricMeshApp
|
||||
- name: ApiHostPort
|
||||
value: 20006
|
||||
value: 20001
|
||||
- name: ServiceName
|
||||
value: ToDoService
|
||||
# - name: ApplicationInsights:InstrumentationKey
|
||||
# value: "<Place AppInsights key here, or reference it via a secret>"
|
||||
resources:
|
||||
requests:
|
||||
cpu: 0.5
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
<IsSFAppServiceProject>true</IsSFAppServiceProject>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.7" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Azure.SFApp.Targets" Version="1.0.0-preview.1.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" />
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче