Created WebMVC, WebSPA and Webstatus SF application project.

Created IdentityServer SF application project

ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml

@@ -16,7 +16,6 @@
     <Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
     <Parameter Name="WebMVC_InstanceCount" DefaultValue="-1" />
     <Parameter Name="OrderingApi_InstanceCount" DefaultValue="-1" />
-    <Parameter Name="IdentityApi_InstanceCount" DefaultValue="1" />
     <Parameter Name="CatalogApi_InstanceCount" DefaultValue="-1" />
     <Parameter Name="BasketApi_InstanceCount" DefaultValue="-1" />
   </Parameters>
@@ -86,33 +85,6 @@
       </ContainerHostPolicies>
     </Policies>
   </ServiceManifestImport>
-  <ServiceManifestImport>
-    <ServiceManifestRef ServiceManifestName="WebStatusPkg" ServiceManifestVersion="1.0.0" />
-    <ConfigOverrides />
-    <Policies>
-      <ContainerHostPolicies CodePackageRef="Code">
-        <PortBinding ContainerPort="80" EndpointRef="WebStatusTypeEndpoint"/>
-      </ContainerHostPolicies>
-    </Policies>
-  </ServiceManifestImport>
-  <ServiceManifestImport>
-    <ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" />
-    <ConfigOverrides />
-    <Policies>
-      <ContainerHostPolicies CodePackageRef="Code">
-        <PortBinding ContainerPort="80" EndpointRef="WebSPATypeEndpoint"/>
-      </ContainerHostPolicies>
-    </Policies>
-  </ServiceManifestImport>
-  <ServiceManifestImport>
-    <ServiceManifestRef ServiceManifestName="WebMVCPkg" ServiceManifestVersion="1.0.0" />
-    <ConfigOverrides />
-    <Policies>
-      <ContainerHostPolicies CodePackageRef="Code">
-        <PortBinding ContainerPort="80" EndpointRef="WebMVCTypeEndpoint"/>
-      </ContainerHostPolicies>
-    </Policies>
-  </ServiceManifestImport>
   <ServiceManifestImport>
     <ServiceManifestRef ServiceManifestName="OrderingApiPkg" ServiceManifestVersion="1.0.0" />
     <ConfigOverrides />
@@ -122,15 +94,6 @@
       </ContainerHostPolicies>
     </Policies>
   </ServiceManifestImport>
-  <ServiceManifestImport>
-    <ServiceManifestRef ServiceManifestName="IdentityApiPkg" ServiceManifestVersion="1.0.0" />
-    <ConfigOverrides />
-    <Policies>
-      <ContainerHostPolicies CodePackageRef="Code">
-        <PortBinding ContainerPort="80" EndpointRef="IdentityApiTypeEndpoint"/>
-      </ContainerHostPolicies>
-    </Policies>
-  </ServiceManifestImport>
   <ServiceManifestImport>
     <ServiceManifestRef ServiceManifestName="CatalogApiPkg" ServiceManifestVersion="1.0.0" />
     <ConfigOverrides />
@@ -190,32 +153,11 @@
         <SingletonPartition />
       </StatelessService>
     </Service>
-   
-    <Service Name="WebStatus" ServiceDnsName="webstatus.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
-      <StatelessService ServiceTypeName="WebStatusType" InstanceCount="[WebStatus_InstanceCount]">
-        <SingletonPartition />
-      </StatelessService>
-    </Service>
-    <Service Name="WebSPA" ServiceDnsName="webspa.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
-      <StatelessService ServiceTypeName="WebSPAType" InstanceCount="[WebSPA_InstanceCount]">
-        <SingletonPartition />
-      </StatelessService>
-    </Service>
-    <Service Name="WebMVC" ServiceDnsName="webmvc.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
-      <StatelessService ServiceTypeName="WebMVCType" InstanceCount="[WebMVC_InstanceCount]">
-        <SingletonPartition />
-      </StatelessService>
-    </Service>
     <Service Name="OrderingApi" ServiceDnsName="orderingapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
       <StatelessService ServiceTypeName="OrderingApiType" InstanceCount="[OrderingApi_InstanceCount]">
         <SingletonPartition />
       </StatelessService>
     </Service>
-    <Service Name="IdentityApi" ServiceDnsName="identityapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
-      <StatelessService ServiceTypeName="IdentityApiType" InstanceCount="[IdentityApi_InstanceCount]">
-        <SingletonPartition />
-      </StatelessService>
-    </Service>
     <Service Name="CatalogApi" ServiceDnsName="catalogapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
       <StatelessService ServiceTypeName="CatalogApiType" InstanceCount="[CatalogApi_InstanceCount]">
         <SingletonPartition />

ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml

@@ -24,7 +24,7 @@
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
       <EnvironmentVariable Name="ConnectionString" Value="basketdata.eshoponservicefabric"/>
       <EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
-      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
       <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
       <EnvironmentVariable Name="EventBusUserName" Value="admin"/>

ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml

@@ -23,7 +23,7 @@
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
       <EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word"/>
-      <EnvironmentVariable Name="PicBaseUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/"/>
+      <EnvironmentVariable Name="PicBaseUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/"/>
       <EnvironmentVariable Name="AzureStorageAccountName" Value=""/>
       <EnvironmentVariable Name="AzureStorageAccountKey" Value=""/>
       <EnvironmentVariable Name="UseCustomizationData" Value="True"/>

ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml

@@ -25,7 +25,7 @@
       <EnvironmentVariable Name="ConnectionString" Value="mongodb://mongodb.eshoponservicefabric"/>
       <EnvironmentVariable Name="Database" Value="LocationsDb"/>
       <EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
-      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
       <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>      
       <EnvironmentVariable Name="EventBusUserName" Value="admin"/>

ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml

@@ -22,8 +22,8 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
-      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
       <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
       <EnvironmentVariable Name="CampaignDetailFunctionUri" Value=""/>

ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml

@@ -24,7 +24,7 @@
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
       <EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word"/>
       <EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
-      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
       <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
       <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
@@ -45,7 +45,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="OrderingApiTypeEndpoint" Port="80" UriScheme="http" PathSuffix="eShopOnServiceFabric/OrderingApi"/>
+      <Endpoint Name="OrderingApiTypeEndpoint" Port="5102" UriScheme="http" PathSuffix="eShopOnServiceFabric/OrderingApi"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>

ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml

@@ -8,12 +8,8 @@
     <Parameter Name="PaymentApi_InstanceCount" Value="-1" />
     <Parameter Name="RabbitMQ_InstanceCount" Value="-1" />
     <Parameter Name="SqlServer_InstanceCount" Value="-1" />
-    <Parameter Name="WebStatus_InstanceCount" Value="-1" />
-    <Parameter Name="WebSPA_InstanceCount" Value="-1" />
-    <Parameter Name="WebMVC_InstanceCount" Value="-1" />
     <Parameter Name="SqlServer_InstanceCount" Value="-1" />
     <Parameter Name="OrderingApi_InstanceCount" Value="-1" />
-    <Parameter Name="IdentityApi_InstanceCount" Value="-1" />
     <Parameter Name="CatalogApi_InstanceCount" Value="-1" />
     <Parameter Name="BasketApi_InstanceCount" Value="-1" />
   </Parameters>

ServiceFabric/eShopOnServiceFabric/PublishProfiles/Cloud.xml

@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="your_dns_servicefabric:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>

ServiceFabric/eShopOnServiceFabric/eShopOnServiceFabric.sfproj

@@ -34,8 +34,6 @@
     <Content Include="ApplicationPackageRoot\BasketDataPkg\ServiceManifest.xml" />
     <Content Include="ApplicationPackageRoot\CatalogApiPkg\Config\Settings.xml" />
     <Content Include="ApplicationPackageRoot\CatalogApiPkg\ServiceManifest.xml" />
-    <Content Include="ApplicationPackageRoot\IdentityApiPkg\Config\Settings.xml" />
-    <Content Include="ApplicationPackageRoot\IdentityApiPkg\ServiceManifest.xml" />
     <Content Include="ApplicationPackageRoot\LocationsApiPkg\Config\Settings.xml" />
     <Content Include="ApplicationPackageRoot\LocationsApiPkg\ServiceManifest.xml" />
     <Content Include="ApplicationPackageRoot\MarketingApiPkg\Config\Settings.xml" />
@@ -50,12 +48,6 @@
     <Content Include="ApplicationPackageRoot\RabbitMQPkg\ServiceManifest.xml" />
     <Content Include="ApplicationPackageRoot\SqlServerPkg\Config\Settings.xml" />
     <Content Include="ApplicationPackageRoot\SqlServerPkg\ServiceManifest.xml" />
-    <Content Include="ApplicationPackageRoot\WebMVCPkg\Config\Settings.xml" />
-    <Content Include="ApplicationPackageRoot\WebMVCPkg\ServiceManifest.xml" />
-    <Content Include="ApplicationPackageRoot\WebSPAPkg\Config\Settings.xml" />
-    <Content Include="ApplicationPackageRoot\WebSPAPkg\ServiceManifest.xml" />
-    <Content Include="ApplicationPackageRoot\WebStatusPkg\Config\Settings.xml" />
-    <Content Include="ApplicationPackageRoot\WebStatusPkg\ServiceManifest.xml" />
     <Content Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />

ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/ApplicationManifest.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationManifest ApplicationTypeName="eShopOnServiceFabricIdSrvType"
+                     ApplicationTypeVersion="1.0.0"
+                     xmlns="http://schemas.microsoft.com/2011/01/fabric"
+                     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+    <Parameter Name="IdentityApi_InstanceCount" DefaultValue="-1" />
+  </Parameters>
+  <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion 
+       should match the Name and Version attributes of the ServiceManifest element defined in the 
+       ServiceManifest.xml file. -->
+  <ServiceManifestImport>
+    <ServiceManifestRef ServiceManifestName="IdentityApiPkg" ServiceManifestVersion="1.0.0" />
+    <ConfigOverrides />
+    <Policies>
+      <ContainerHostPolicies CodePackageRef="Code">
+        <PortBinding ContainerPort="80" EndpointRef="IdentityApiTypeEndpoint"/>
+      </ContainerHostPolicies>
+    </Policies>
+  </ServiceManifestImport>
+  <DefaultServices>
+    <!-- The section below creates instances of service types, when an instance of this 
+         application type is created. You can also create one or more instances of service type using the 
+         ServiceFabric PowerShell module.
+         
+         The attribute ServiceTypeName below must match the name defined in the imported ServiceManifest.xml file. -->
+    <Service Name="IdentityApi" ServiceDnsName="identityapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
+      <StatelessService ServiceTypeName="IdentityApiType" InstanceCount="[IdentityApi_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
+    </Service>
+  </DefaultServices>
+</ApplicationManifest>

ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml → ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml

@@ -19,20 +19,21 @@
       </ContainerHost>
     </EntryPoint>
     <!-- Pass environment variables to your container: -->
+    
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/IdentityApi"/>
-      <EnvironmentVariable Name="SpaClient" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/WebSPA"/>
-      <EnvironmentVariable Name="XamarinCallback" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi/xamarincallback"/>      
+      <EnvironmentVariable Name="SpaClient" Value="http://your_sf_dns:5104"/>
+      <EnvironmentVariable Name="XamarinCallback" Value="http://your_sf_dns:5105/xamarincallback"/>
       <EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word"/>
-      <EnvironmentVariable Name="MvcClient" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/WebMVC"/>
+      <EnvironmentVariable Name="MvcClient" Value="http://your_sf_dns:5100"/>
       <EnvironmentVariable Name="LocationApiClient" Value=""/>
       <EnvironmentVariable Name="MarketingApiClient" Value=""/>
       <EnvironmentVariable Name="BasketApiClient" Value=""/>
       <EnvironmentVariable Name="OrderingApiClient" Value=""/>
       <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
     </EnvironmentVariables>
+    
   </CodePackage>
 
   <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
@@ -44,7 +45,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="IdentityApiTypeEndpoint" Port="5105" UriScheme="http" PathSuffix="eShopOnServiceFabric/IdentityApi"/>
+      <Endpoint Name="IdentityApiTypeEndpoint" Port="5105" UriScheme="http"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>

ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricIdSrv" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+    <Parameter Name="IdentityApi_InstanceCount" Value="-1" />
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.1Node.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricIdSrv" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.5Node.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricIdSrv" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a remote cluster, you would need to specify the appropriate parameters for that specific cluster.
+         For example: <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000" />
+
+       Example showing parameters for a cluster that uses certificate security:
+       <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000"
+                                    X509Credential="true"
+                                    ServerCertThumbprint="0123456789012345678901234567890123456789"
+                                    FindType="FindByThumbprint"
+                                    FindValue="9876543210987654321098765432109876543210"
+                                    StoreLocation="CurrentUser"
+                                    StoreName="My" />
+
+       Example showing parameters for a cluster that uses Azure Active Directory (AAD) security:
+       <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000"
+                                    AzureActiveDirectory="true"
+                                    ServerCertThumbprint="0123456789012345678901234567890123456789" />
+  -->
+  <ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.1Node.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a local cluster, you would typically not use any parameters.
+         For example: <ClusterConnectionParameters />
+  -->
+  <ClusterConnectionParameters />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Local.1Node.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.5Node.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a local cluster, you would typically not use any parameters.
+         For example: <ClusterConnectionParameters />
+  -->
+  <ClusterConnectionParameters />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Local.5Node.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/Scripts/Deploy-FabricApplication.ps1

@@ -0,0 +1,258 @@
+<#
+.SYNOPSIS 
+Deploys a Service Fabric application type to a cluster.
+
+.DESCRIPTION
+This script deploys a Service Fabric application type to a cluster.  It is invoked by Visual Studio when deploying a Service Fabric Application project.
+
+.NOTES
+WARNING: This script file is invoked by Visual Studio.  Its parameters must not be altered but its logic can be customized as necessary.
+
+.PARAMETER PublishProfileFile
+Path to the file containing the publish profile.
+
+.PARAMETER ApplicationPackagePath
+Path to the folder of the packaged Service Fabric application.
+
+.PARAMETER DeployOnly
+Indicates that the Service Fabric application should not be created or upgraded after registering the application type.
+
+.PARAMETER ApplicationParameter
+Hashtable of the Service Fabric application parameters to be used for the application.
+
+.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade
+Indicates whether to unregister any unused application versions that exist after an upgrade is finished.
+
+.PARAMETER OverrideUpgradeBehavior
+Indicates the behavior used to override the upgrade settings specified by the publish profile.
+'None' indicates that the upgrade settings will not be overridden.
+'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile.
+'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile.
+
+.PARAMETER UseExistingClusterConnection
+Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session.  The cluster connection parameters configured in the publish profile are ignored.
+
+.PARAMETER OverwriteBehavior
+Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application.
+'Never' will not remove the existing application. This is the default behavior.
+'Always' will remove the existing application even if its Application type and Version is different from the application being created. 
+'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created.
+
+.PARAMETER SkipPackageValidation
+Switch signaling whether the package should be validated or not before deployment.
+
+.PARAMETER SecurityToken
+A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory.
+
+.PARAMETER CopyPackageTimeoutSec
+Timeout in seconds for copying application package to image store.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug'
+
+Deploy the application using the default package location for a Debug build.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication
+
+Deploy the application but do not create the application instance.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'}
+
+Deploy the application by providing values for parameters that are defined in the application manifest.
+#>
+
+Param
+(
+    [String]
+    $PublishProfileFile,
+
+    [String]
+    $ApplicationPackagePath,
+
+    [Switch]
+    $DeployOnly,
+
+    [Hashtable]
+    $ApplicationParameter,
+
+    [Boolean]
+    $UnregisterUnusedApplicationVersionsAfterUpgrade,
+
+    [String]
+    [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')]
+    $OverrideUpgradeBehavior = 'None',
+
+    [Switch]
+    $UseExistingClusterConnection,
+
+    [String]
+    [ValidateSet('Never','Always','SameAppTypeAndVersion')]
+    $OverwriteBehavior = 'Never',
+
+    [Switch]
+    $SkipPackageValidation,
+
+    [String]
+    $SecurityToken,
+
+    [int]
+    $CopyPackageTimeoutSec
+)
+
+function Read-XmlElementAsHashtable
+{
+    Param (
+        [System.Xml.XmlElement]
+        $Element
+    )
+
+    $hashtable = @{}
+    if ($Element.Attributes)
+    {
+        $Element.Attributes | 
+            ForEach-Object {
+                $boolVal = $null
+                if ([bool]::TryParse($_.Value, [ref]$boolVal)) {
+                    $hashtable[$_.Name] = $boolVal
+                }
+                else {
+                    $hashtable[$_.Name] = $_.Value
+                }
+            }
+    }
+
+    return $hashtable
+}
+
+function Read-PublishProfile
+{
+    Param (
+        [ValidateScript({Test-Path $_ -PathType Leaf})]
+        [String]
+        $PublishProfileFile
+    )
+
+    $publishProfileXml = [Xml] (Get-Content $PublishProfileFile)
+    $publishProfile = @{}
+
+    $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters")
+    $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment")
+    $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters")
+
+    if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment"))
+    {
+        $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters")
+        if ($publishProfile.UpgradeDeployment["Mode"])
+        {
+            $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true
+        }
+    }
+
+    $publishProfileFolder = (Split-Path $PublishProfileFile)
+    $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path)
+
+    return $publishProfile
+}
+
+$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path)
+
+if (!$PublishProfileFile)
+{
+    $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml"
+}
+
+if (!$ApplicationPackagePath)
+{
+    $ApplicationPackagePath = "$LocalFolder\..\pkg\Release"
+}
+
+$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath
+
+$publishProfile = Read-PublishProfile $PublishProfileFile
+
+if (-not $UseExistingClusterConnection)
+{
+    $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters
+    if ($SecurityToken)
+    {
+        $ClusterConnectionParameters["SecurityToken"] = $SecurityToken
+    }
+
+    try
+    {
+        [void](Connect-ServiceFabricCluster @ClusterConnectionParameters)
+    }
+    catch [System.Fabric.FabricObjectClosedException]
+    {
+        Write-Warning "Service Fabric cluster may not be connected."
+        throw
+    }
+}
+
+$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK"
+$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath
+Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1"
+
+$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade'
+
+$PublishParameters = @{
+    'ApplicationPackagePath' = $ApplicationPackagePath
+    'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile
+    'ApplicationParameter' = $ApplicationParameter
+    'ErrorAction' = 'Stop'
+}
+
+if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec)
+{
+    $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec
+}
+
+if ($publishProfile.CopyPackageParameters.CompressPackage)
+{
+    $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage
+}
+
+# CopyPackageTimeoutSec parameter overrides the value from the publish profile
+if ($CopyPackageTimeoutSec)
+{
+    $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec
+}
+
+if ($IsUpgrade)
+{
+    $Action = "RegisterAndUpgrade"
+    if ($DeployOnly)
+    {
+        $Action = "Register"
+    }
+    
+    $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters
+
+    if ($OverrideUpgradeBehavior -eq 'ForceUpgrade')
+    {
+        # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior.
+        $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true }
+    }
+
+    $PublishParameters['Action'] = $Action
+    $PublishParameters['UpgradeParameters'] = $UpgradeParameters
+    $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade
+
+    Publish-UpgradedServiceFabricApplication @PublishParameters
+}
+else
+{
+    $Action = "RegisterAndCreate"
+    if ($DeployOnly)
+    {
+        $Action = "Register"
+    }
+
+    $PublishParameters['Action'] = $Action
+    $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior
+    $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation
+    
+    Publish-NewServiceFabricApplication @PublishParameters
+}

ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv.sfproj

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets=";ValidateMSBuildFiles">
+  <Import Project="..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>39b54901-d57d-416e-b51e-33c4017ca464</ProjectGuid>
+    <ProjectVersion>1.7</ProjectVersion>
+    <MinToolsVersion>1.5</MinToolsVersion>
+    <SupportedMSBuildNuGetPackageVersion>1.6</SupportedMSBuildNuGetPackageVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ApplicationPackageRoot\ApplicationManifest.xml" />
+    <None Include="ApplicationParameters\Cloud.xml" />
+    <None Include="ApplicationParameters\Local.1Node.xml" />
+    <None Include="ApplicationParameters\Local.5Node.xml" />
+    <None Include="PublishProfiles\Cloud.xml" />
+    <None Include="PublishProfiles\Local.1Node.xml" />
+    <None Include="PublishProfiles\Local.5Node.xml" />
+    <None Include="Scripts\Deploy-FabricApplication.ps1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ApplicationPackageRoot\IdentityApiPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\IdentityApiPkg\ServiceManifest.xml" />
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+  <PropertyGroup>
+    <ApplicationProjectTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets</ApplicationProjectTargetsPath>
+  </PropertyGroup>
+  <Import Project="$(ApplicationProjectTargetsPath)" Condition="Exists('$(ApplicationProjectTargetsPath)')" />
+  <Import Project="..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" />
+  <Target Name="ValidateMSBuildFiles">
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" Text="Unable to find the '..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" Text="Unable to find the '..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package" />
+  </Target>
+</Project>

ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.VisualStudio.Azure.Fabric.MSBuild" version="1.6.1" targetFramework="net461" />
+</packages>

ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/ApplicationManifest.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationManifest ApplicationTypeName="eShopOnServiceFabricWebMVCType"
+                     ApplicationTypeVersion="1.0.0"
+                     xmlns="http://schemas.microsoft.com/2011/01/fabric"
+                     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+    <Parameter Name="WebMVC_InstanceCount" DefaultValue="-1" />
+  </Parameters>
+  <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion 
+       should match the Name and Version attributes of the ServiceManifest element defined in the 
+       ServiceManifest.xml file. -->
+  <ServiceManifestImport>
+    <ServiceManifestRef ServiceManifestName="WebMVCPkg" ServiceManifestVersion="1.0.0" />
+    <ConfigOverrides />
+    <Policies>
+      <ContainerHostPolicies CodePackageRef="Code">
+        <PortBinding ContainerPort="80" EndpointRef="WebMVCTypeEndpoint"/>
+      </ContainerHostPolicies>
+    </Policies>
+  </ServiceManifestImport>
+  <DefaultServices>
+    <!-- The section below creates instances of service types, when an instance of this 
+         application type is created. You can also create one or more instances of service type using the 
+         ServiceFabric PowerShell module.
+         
+         The attribute ServiceTypeName below must match the name defined in the imported ServiceManifest.xml file. -->
+    <Service Name="WebMVC" ServiceDnsName="webmvc.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
+      <StatelessService ServiceTypeName="WebMVCType" InstanceCount="[WebMVC_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
+    </Service>
+  </DefaultServices>
+</ApplicationManifest>

ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml → ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml

@@ -22,12 +22,11 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/WebMVC"/>
       <EnvironmentVariable Name="CatalogUrl" Value="http://catalogapi.eshoponservicefabric:5101"/>
       <EnvironmentVariable Name="OrderingUrl" Value="http://orderingapi.eshoponservicefabric:5102"/>
       <EnvironmentVariable Name="BasketUrl" Value="http://basketapi.eshoponservicefabric:5103"/>
-      <EnvironmentVariable Name="IdentityUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
-      <EnvironmentVariable Name="MarketingUrl" Value=""/>
+      <EnvironmentVariable Name="IdentityUrl" Value="http://your_sf_dns:5105"/>
+      <EnvironmentVariable Name="MarketingUrl" Value="http://marketingapi.eshoponservicefabric:5110"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -40,7 +39,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="WebMVCTypeEndpoint" UriScheme="http" Port="5100" PathSuffix="eShopOnServiceFabric/WebMVC"/>
+      <Endpoint Name="WebMVCTypeEndpoint" UriScheme="http" Port="5100"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>

ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricWebMVC" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+    <Parameter Name="WebMVC_InstanceCount" Value="-1" />
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.1Node.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricWebMVC" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.5Node.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricWebMVC" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a remote cluster, you would need to specify the appropriate parameters for that specific cluster.
+         For example: <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000" />
+
+       Example showing parameters for a cluster that uses certificate security:
+       <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000"
+                                    X509Credential="true"
+                                    ServerCertThumbprint="0123456789012345678901234567890123456789"
+                                    FindType="FindByThumbprint"
+                                    FindValue="9876543210987654321098765432109876543210"
+                                    StoreLocation="CurrentUser"
+                                    StoreName="My" />
+
+       Example showing parameters for a cluster that uses Azure Active Directory (AAD) security:
+       <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000"
+                                    AzureActiveDirectory="true"
+                                    ServerCertThumbprint="0123456789012345678901234567890123456789" />
+  -->
+  <ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.1Node.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a local cluster, you would typically not use any parameters.
+         For example: <ClusterConnectionParameters />
+  -->
+  <ClusterConnectionParameters />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Local.1Node.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.5Node.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a local cluster, you would typically not use any parameters.
+         For example: <ClusterConnectionParameters />
+  -->
+  <ClusterConnectionParameters />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Local.5Node.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/Scripts/Deploy-FabricApplication.ps1

@@ -0,0 +1,258 @@
+<#
+.SYNOPSIS 
+Deploys a Service Fabric application type to a cluster.
+
+.DESCRIPTION
+This script deploys a Service Fabric application type to a cluster.  It is invoked by Visual Studio when deploying a Service Fabric Application project.
+
+.NOTES
+WARNING: This script file is invoked by Visual Studio.  Its parameters must not be altered but its logic can be customized as necessary.
+
+.PARAMETER PublishProfileFile
+Path to the file containing the publish profile.
+
+.PARAMETER ApplicationPackagePath
+Path to the folder of the packaged Service Fabric application.
+
+.PARAMETER DeployOnly
+Indicates that the Service Fabric application should not be created or upgraded after registering the application type.
+
+.PARAMETER ApplicationParameter
+Hashtable of the Service Fabric application parameters to be used for the application.
+
+.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade
+Indicates whether to unregister any unused application versions that exist after an upgrade is finished.
+
+.PARAMETER OverrideUpgradeBehavior
+Indicates the behavior used to override the upgrade settings specified by the publish profile.
+'None' indicates that the upgrade settings will not be overridden.
+'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile.
+'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile.
+
+.PARAMETER UseExistingClusterConnection
+Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session.  The cluster connection parameters configured in the publish profile are ignored.
+
+.PARAMETER OverwriteBehavior
+Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application.
+'Never' will not remove the existing application. This is the default behavior.
+'Always' will remove the existing application even if its Application type and Version is different from the application being created. 
+'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created.
+
+.PARAMETER SkipPackageValidation
+Switch signaling whether the package should be validated or not before deployment.
+
+.PARAMETER SecurityToken
+A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory.
+
+.PARAMETER CopyPackageTimeoutSec
+Timeout in seconds for copying application package to image store.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug'
+
+Deploy the application using the default package location for a Debug build.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication
+
+Deploy the application but do not create the application instance.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'}
+
+Deploy the application by providing values for parameters that are defined in the application manifest.
+#>
+
+Param
+(
+    [String]
+    $PublishProfileFile,
+
+    [String]
+    $ApplicationPackagePath,
+
+    [Switch]
+    $DeployOnly,
+
+    [Hashtable]
+    $ApplicationParameter,
+
+    [Boolean]
+    $UnregisterUnusedApplicationVersionsAfterUpgrade,
+
+    [String]
+    [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')]
+    $OverrideUpgradeBehavior = 'None',
+
+    [Switch]
+    $UseExistingClusterConnection,
+
+    [String]
+    [ValidateSet('Never','Always','SameAppTypeAndVersion')]
+    $OverwriteBehavior = 'Never',
+
+    [Switch]
+    $SkipPackageValidation,
+
+    [String]
+    $SecurityToken,
+
+    [int]
+    $CopyPackageTimeoutSec
+)
+
+function Read-XmlElementAsHashtable
+{
+    Param (
+        [System.Xml.XmlElement]
+        $Element
+    )
+
+    $hashtable = @{}
+    if ($Element.Attributes)
+    {
+        $Element.Attributes | 
+            ForEach-Object {
+                $boolVal = $null
+                if ([bool]::TryParse($_.Value, [ref]$boolVal)) {
+                    $hashtable[$_.Name] = $boolVal
+                }
+                else {
+                    $hashtable[$_.Name] = $_.Value
+                }
+            }
+    }
+
+    return $hashtable
+}
+
+function Read-PublishProfile
+{
+    Param (
+        [ValidateScript({Test-Path $_ -PathType Leaf})]
+        [String]
+        $PublishProfileFile
+    )
+
+    $publishProfileXml = [Xml] (Get-Content $PublishProfileFile)
+    $publishProfile = @{}
+
+    $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters")
+    $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment")
+    $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters")
+
+    if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment"))
+    {
+        $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters")
+        if ($publishProfile.UpgradeDeployment["Mode"])
+        {
+            $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true
+        }
+    }
+
+    $publishProfileFolder = (Split-Path $PublishProfileFile)
+    $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path)
+
+    return $publishProfile
+}
+
+$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path)
+
+if (!$PublishProfileFile)
+{
+    $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml"
+}
+
+if (!$ApplicationPackagePath)
+{
+    $ApplicationPackagePath = "$LocalFolder\..\pkg\Release"
+}
+
+$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath
+
+$publishProfile = Read-PublishProfile $PublishProfileFile
+
+if (-not $UseExistingClusterConnection)
+{
+    $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters
+    if ($SecurityToken)
+    {
+        $ClusterConnectionParameters["SecurityToken"] = $SecurityToken
+    }
+
+    try
+    {
+        [void](Connect-ServiceFabricCluster @ClusterConnectionParameters)
+    }
+    catch [System.Fabric.FabricObjectClosedException]
+    {
+        Write-Warning "Service Fabric cluster may not be connected."
+        throw
+    }
+}
+
+$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK"
+$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath
+Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1"
+
+$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade'
+
+$PublishParameters = @{
+    'ApplicationPackagePath' = $ApplicationPackagePath
+    'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile
+    'ApplicationParameter' = $ApplicationParameter
+    'ErrorAction' = 'Stop'
+}
+
+if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec)
+{
+    $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec
+}
+
+if ($publishProfile.CopyPackageParameters.CompressPackage)
+{
+    $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage
+}
+
+# CopyPackageTimeoutSec parameter overrides the value from the publish profile
+if ($CopyPackageTimeoutSec)
+{
+    $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec
+}
+
+if ($IsUpgrade)
+{
+    $Action = "RegisterAndUpgrade"
+    if ($DeployOnly)
+    {
+        $Action = "Register"
+    }
+    
+    $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters
+
+    if ($OverrideUpgradeBehavior -eq 'ForceUpgrade')
+    {
+        # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior.
+        $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true }
+    }
+
+    $PublishParameters['Action'] = $Action
+    $PublishParameters['UpgradeParameters'] = $UpgradeParameters
+    $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade
+
+    Publish-UpgradedServiceFabricApplication @PublishParameters
+}
+else
+{
+    $Action = "RegisterAndCreate"
+    if ($DeployOnly)
+    {
+        $Action = "Register"
+    }
+
+    $PublishParameters['Action'] = $Action
+    $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior
+    $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation
+    
+    Publish-NewServiceFabricApplication @PublishParameters
+}

ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC.sfproj

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets=";ValidateMSBuildFiles">
+  <Import Project="..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>0cf895ff-3616-4d1f-8d2e-5d856cdf3612</ProjectGuid>
+    <ProjectVersion>1.7</ProjectVersion>
+    <MinToolsVersion>1.5</MinToolsVersion>
+    <SupportedMSBuildNuGetPackageVersion>1.6</SupportedMSBuildNuGetPackageVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ApplicationPackageRoot\ApplicationManifest.xml" />
+    <None Include="ApplicationParameters\Cloud.xml" />
+    <None Include="ApplicationParameters\Local.1Node.xml" />
+    <None Include="ApplicationParameters\Local.5Node.xml" />
+    <None Include="PublishProfiles\Cloud.xml" />
+    <None Include="PublishProfiles\Local.1Node.xml" />
+    <None Include="PublishProfiles\Local.5Node.xml" />
+    <None Include="Scripts\Deploy-FabricApplication.ps1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ApplicationPackageRoot\WebMVCPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\WebMVCPkg\ServiceManifest.xml" />
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+  <PropertyGroup>
+    <ApplicationProjectTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets</ApplicationProjectTargetsPath>
+  </PropertyGroup>
+  <Import Project="$(ApplicationProjectTargetsPath)" Condition="Exists('$(ApplicationProjectTargetsPath)')" />
+  <Import Project="..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" />
+  <Target Name="ValidateMSBuildFiles">
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" Text="Unable to find the '..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" Text="Unable to find the '..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package" />
+  </Target>
+</Project>

ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.VisualStudio.Azure.Fabric.MSBuild" version="1.6.1" targetFramework="net461" />
+</packages>

ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationManifest ApplicationTypeName="eShopOnServiceFabricWebSPAType"
+                     ApplicationTypeVersion="1.0.0"
+                     xmlns="http://schemas.microsoft.com/2011/01/fabric"
+                     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+    <Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
+  </Parameters>
+  <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion 
+       should match the Name and Version attributes of the ServiceManifest element defined in the 
+       ServiceManifest.xml file. -->
+  <ServiceManifestImport>
+    <ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" />
+    <ConfigOverrides />
+    <Policies>
+      <ContainerHostPolicies CodePackageRef="Code">
+        <PortBinding ContainerPort="80" EndpointRef="WebSPATypeEndpoint"/>
+      </ContainerHostPolicies>
+    </Policies>
+  </ServiceManifestImport>
+  <DefaultServices>
+    <!-- The section below creates instances of service types, when an instance of this 
+         application type is created. You can also create one or more instances of service type using the 
+         ServiceFabric PowerShell module.
+         
+         The attribute ServiceTypeName below must match the name defined in the imported ServiceManifest.xml file. -->
+    <Service Name="WebSPA" ServiceDnsName="webspa.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
+      <StatelessService ServiceTypeName="WebSPAType" InstanceCount="[WebSPA_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
+    </Service>
+  </DefaultServices>
+</ApplicationManifest>

ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml → ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml

@@ -22,18 +22,17 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="CatalogUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/CatalogApi"/>
-      <EnvironmentVariable Name="OrderingUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/OrderingApi"/>
-      <EnvironmentVariable Name="IdentityUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
-      <EnvironmentVariable Name="BasketUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/BasketApi"/>
-      <EnvironmentVariable Name="MarketingUrl" Value=""/>
+      <EnvironmentVariable Name="CatalogUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/CatalogApi"/>
+      <EnvironmentVariable Name="OrderingUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/OrderingApi"/>
+      <EnvironmentVariable Name="BasketUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/BasketApi"/>
+      <EnvironmentVariable Name="MarketingUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/MarketingApi"/>
+      <EnvironmentVariable Name="IdentityUrl" Value="http://your_sf_dns:5105"/>
       <EnvironmentVariable Name="CatalogUrlHC" Value="http://catalogapi.eshoponservicefabric:5101/hc"/>
       <EnvironmentVariable Name="OrderingUrlHC" Value="http://orderingapi.eshoponservicefabric:5102/hc"/>
       <EnvironmentVariable Name="IdentityUrlHC" Value="http://identityapi.eshoponservicefabric:5105/hc"/>
       <EnvironmentVariable Name="BasketUrlHC" Value="http://basketapi.eshoponservicefabric:5103/hc"/>
       <EnvironmentVariable Name="MarketingUrlHC" Value="http://marketingapi.eshoponservicefabric:5110/hc"/>
       <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
-      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/WebSPA"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -46,7 +45,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="WebSPATypeEndpoint" Port="5104" UriScheme="http" PathSuffix="eShopOnServiceFabric/WebSPA"/>
+      <Endpoint Name="WebSPATypeEndpoint" Port="5104" UriScheme="http"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>

ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricWebSPA" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+    <Parameter Name="WebSPA_InstanceCount" Value="-1" />
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.1Node.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricWebSPA" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.5Node.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricWebSPA" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a remote cluster, you would need to specify the appropriate parameters for that specific cluster.
+         For example: <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000" />
+
+       Example showing parameters for a cluster that uses certificate security:
+       <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000"
+                                    X509Credential="true"
+                                    ServerCertThumbprint="0123456789012345678901234567890123456789"
+                                    FindType="FindByThumbprint"
+                                    FindValue="9876543210987654321098765432109876543210"
+                                    StoreLocation="CurrentUser"
+                                    StoreName="My" />
+
+       Example showing parameters for a cluster that uses Azure Active Directory (AAD) security:
+       <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000"
+                                    AzureActiveDirectory="true"
+                                    ServerCertThumbprint="0123456789012345678901234567890123456789" />
+  -->
+  <ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.1Node.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a local cluster, you would typically not use any parameters.
+         For example: <ClusterConnectionParameters />
+  -->
+  <ClusterConnectionParameters />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Local.1Node.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.5Node.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a local cluster, you would typically not use any parameters.
+         For example: <ClusterConnectionParameters />
+  -->
+  <ClusterConnectionParameters />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Local.5Node.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/Scripts/Deploy-FabricApplication.ps1

@@ -0,0 +1,258 @@
+<#
+.SYNOPSIS 
+Deploys a Service Fabric application type to a cluster.
+
+.DESCRIPTION
+This script deploys a Service Fabric application type to a cluster.  It is invoked by Visual Studio when deploying a Service Fabric Application project.
+
+.NOTES
+WARNING: This script file is invoked by Visual Studio.  Its parameters must not be altered but its logic can be customized as necessary.
+
+.PARAMETER PublishProfileFile
+Path to the file containing the publish profile.
+
+.PARAMETER ApplicationPackagePath
+Path to the folder of the packaged Service Fabric application.
+
+.PARAMETER DeployOnly
+Indicates that the Service Fabric application should not be created or upgraded after registering the application type.
+
+.PARAMETER ApplicationParameter
+Hashtable of the Service Fabric application parameters to be used for the application.
+
+.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade
+Indicates whether to unregister any unused application versions that exist after an upgrade is finished.
+
+.PARAMETER OverrideUpgradeBehavior
+Indicates the behavior used to override the upgrade settings specified by the publish profile.
+'None' indicates that the upgrade settings will not be overridden.
+'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile.
+'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile.
+
+.PARAMETER UseExistingClusterConnection
+Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session.  The cluster connection parameters configured in the publish profile are ignored.
+
+.PARAMETER OverwriteBehavior
+Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application.
+'Never' will not remove the existing application. This is the default behavior.
+'Always' will remove the existing application even if its Application type and Version is different from the application being created. 
+'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created.
+
+.PARAMETER SkipPackageValidation
+Switch signaling whether the package should be validated or not before deployment.
+
+.PARAMETER SecurityToken
+A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory.
+
+.PARAMETER CopyPackageTimeoutSec
+Timeout in seconds for copying application package to image store.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug'
+
+Deploy the application using the default package location for a Debug build.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication
+
+Deploy the application but do not create the application instance.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'}
+
+Deploy the application by providing values for parameters that are defined in the application manifest.
+#>
+
+Param
+(
+    [String]
+    $PublishProfileFile,
+
+    [String]
+    $ApplicationPackagePath,
+
+    [Switch]
+    $DeployOnly,
+
+    [Hashtable]
+    $ApplicationParameter,
+
+    [Boolean]
+    $UnregisterUnusedApplicationVersionsAfterUpgrade,
+
+    [String]
+    [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')]
+    $OverrideUpgradeBehavior = 'None',
+
+    [Switch]
+    $UseExistingClusterConnection,
+
+    [String]
+    [ValidateSet('Never','Always','SameAppTypeAndVersion')]
+    $OverwriteBehavior = 'Never',
+
+    [Switch]
+    $SkipPackageValidation,
+
+    [String]
+    $SecurityToken,
+
+    [int]
+    $CopyPackageTimeoutSec
+)
+
+function Read-XmlElementAsHashtable
+{
+    Param (
+        [System.Xml.XmlElement]
+        $Element
+    )
+
+    $hashtable = @{}
+    if ($Element.Attributes)
+    {
+        $Element.Attributes | 
+            ForEach-Object {
+                $boolVal = $null
+                if ([bool]::TryParse($_.Value, [ref]$boolVal)) {
+                    $hashtable[$_.Name] = $boolVal
+                }
+                else {
+                    $hashtable[$_.Name] = $_.Value
+                }
+            }
+    }
+
+    return $hashtable
+}
+
+function Read-PublishProfile
+{
+    Param (
+        [ValidateScript({Test-Path $_ -PathType Leaf})]
+        [String]
+        $PublishProfileFile
+    )
+
+    $publishProfileXml = [Xml] (Get-Content $PublishProfileFile)
+    $publishProfile = @{}
+
+    $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters")
+    $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment")
+    $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters")
+
+    if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment"))
+    {
+        $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters")
+        if ($publishProfile.UpgradeDeployment["Mode"])
+        {
+            $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true
+        }
+    }
+
+    $publishProfileFolder = (Split-Path $PublishProfileFile)
+    $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path)
+
+    return $publishProfile
+}
+
+$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path)
+
+if (!$PublishProfileFile)
+{
+    $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml"
+}
+
+if (!$ApplicationPackagePath)
+{
+    $ApplicationPackagePath = "$LocalFolder\..\pkg\Release"
+}
+
+$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath
+
+$publishProfile = Read-PublishProfile $PublishProfileFile
+
+if (-not $UseExistingClusterConnection)
+{
+    $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters
+    if ($SecurityToken)
+    {
+        $ClusterConnectionParameters["SecurityToken"] = $SecurityToken
+    }
+
+    try
+    {
+        [void](Connect-ServiceFabricCluster @ClusterConnectionParameters)
+    }
+    catch [System.Fabric.FabricObjectClosedException]
+    {
+        Write-Warning "Service Fabric cluster may not be connected."
+        throw
+    }
+}
+
+$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK"
+$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath
+Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1"
+
+$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade'
+
+$PublishParameters = @{
+    'ApplicationPackagePath' = $ApplicationPackagePath
+    'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile
+    'ApplicationParameter' = $ApplicationParameter
+    'ErrorAction' = 'Stop'
+}
+
+if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec)
+{
+    $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec
+}
+
+if ($publishProfile.CopyPackageParameters.CompressPackage)
+{
+    $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage
+}
+
+# CopyPackageTimeoutSec parameter overrides the value from the publish profile
+if ($CopyPackageTimeoutSec)
+{
+    $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec
+}
+
+if ($IsUpgrade)
+{
+    $Action = "RegisterAndUpgrade"
+    if ($DeployOnly)
+    {
+        $Action = "Register"
+    }
+    
+    $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters
+
+    if ($OverrideUpgradeBehavior -eq 'ForceUpgrade')
+    {
+        # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior.
+        $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true }
+    }
+
+    $PublishParameters['Action'] = $Action
+    $PublishParameters['UpgradeParameters'] = $UpgradeParameters
+    $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade
+
+    Publish-UpgradedServiceFabricApplication @PublishParameters
+}
+else
+{
+    $Action = "RegisterAndCreate"
+    if ($DeployOnly)
+    {
+        $Action = "Register"
+    }
+
+    $PublishParameters['Action'] = $Action
+    $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior
+    $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation
+    
+    Publish-NewServiceFabricApplication @PublishParameters
+}

ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA.sfproj

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets=";ValidateMSBuildFiles">
+  <Import Project="..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>1670de10-5626-429d-a74a-2dd8281cc0c9</ProjectGuid>
+    <ProjectVersion>1.7</ProjectVersion>
+    <MinToolsVersion>1.5</MinToolsVersion>
+    <SupportedMSBuildNuGetPackageVersion>1.6</SupportedMSBuildNuGetPackageVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ApplicationPackageRoot\ApplicationManifest.xml" />
+    <None Include="ApplicationParameters\Cloud.xml" />
+    <None Include="ApplicationParameters\Local.1Node.xml" />
+    <None Include="ApplicationParameters\Local.5Node.xml" />
+    <None Include="PublishProfiles\Cloud.xml" />
+    <None Include="PublishProfiles\Local.1Node.xml" />
+    <None Include="PublishProfiles\Local.5Node.xml" />
+    <None Include="Scripts\Deploy-FabricApplication.ps1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ApplicationPackageRoot\WebSPAPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\WebSPAPkg\ServiceManifest.xml" />
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+  <PropertyGroup>
+    <ApplicationProjectTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets</ApplicationProjectTargetsPath>
+  </PropertyGroup>
+  <Import Project="$(ApplicationProjectTargetsPath)" Condition="Exists('$(ApplicationProjectTargetsPath)')" />
+  <Import Project="..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" />
+  <Target Name="ValidateMSBuildFiles">
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" Text="Unable to find the '..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" Text="Unable to find the '..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package" />
+  </Target>
+</Project>

ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.VisualStudio.Azure.Fabric.MSBuild" version="1.6.1" targetFramework="net461" />
+</packages>

ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/ApplicationManifest.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationManifest ApplicationTypeName="eShopOnServiceFabricWebStatusType"
+                     ApplicationTypeVersion="1.0.0"
+                     xmlns="http://schemas.microsoft.com/2011/01/fabric"
+                     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+    <Parameter Name="WebStatus_InstanceCount" DefaultValue="-1" />
+  </Parameters>
+  <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion 
+       should match the Name and Version attributes of the ServiceManifest element defined in the 
+       ServiceManifest.xml file. -->
+  <ServiceManifestImport>
+    <ServiceManifestRef ServiceManifestName="WebStatusPkg" ServiceManifestVersion="1.0.0" />
+    <ConfigOverrides />
+    <Policies>
+      <ContainerHostPolicies CodePackageRef="Code">
+        <PortBinding ContainerPort="80" EndpointRef="WebStatusTypeEndpoint"/>
+      </ContainerHostPolicies>
+    </Policies>
+  </ServiceManifestImport>
+  <DefaultServices>
+    <!-- The section below creates instances of service types, when an instance of this 
+         application type is created. You can also create one or more instances of service type using the 
+         ServiceFabric PowerShell module.
+         
+         The attribute ServiceTypeName below must match the name defined in the imported ServiceManifest.xml file. -->
+    <Service Name="WebStatus" ServiceDnsName="webstatus.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
+      <StatelessService ServiceTypeName="WebStatusType" InstanceCount="[WebStatus_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
+    </Service>
+  </DefaultServices>
+</ApplicationManifest>

ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml → ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml

@@ -30,7 +30,6 @@
       <EnvironmentVariable Name="LocationsUrl" Value="http://locationsapi.eshoponservicefabric:5109"/>
       <EnvironmentVariable Name="mvc" Value="http://webmvc.eshoponservicefabric:5100"/>
       <EnvironmentVariable Name="spa" Value="http://webspa.eshoponservicefabric:5104"/>
-      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/WebStatus"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -43,7 +42,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="WebStatusTypeEndpoint" Port="5107" UriScheme="http" PathSuffix="eShopOnServiceFabric/WebStatus"/>
+      <Endpoint Name="WebStatusTypeEndpoint" Port="5107" UriScheme="http"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>

ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Cloud.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricWebStatus" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+    <Parameter Name="WebStatus_InstanceCount" Value="-1" />
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.1Node.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricWebStatus" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.5Node.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application Name="fabric:/eShopOnServiceFabricWebStatus" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Parameters>
+  </Parameters>
+</Application>

ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a remote cluster, you would need to specify the appropriate parameters for that specific cluster.
+         For example: <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000" />
+
+       Example showing parameters for a cluster that uses certificate security:
+       <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000"
+                                    X509Credential="true"
+                                    ServerCertThumbprint="0123456789012345678901234567890123456789"
+                                    FindType="FindByThumbprint"
+                                    FindValue="9876543210987654321098765432109876543210"
+                                    StoreLocation="CurrentUser"
+                                    StoreName="My" />
+
+       Example showing parameters for a cluster that uses Azure Active Directory (AAD) security:
+       <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000"
+                                    AzureActiveDirectory="true"
+                                    ServerCertThumbprint="0123456789012345678901234567890123456789" />
+  -->
+  <ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.1Node.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a local cluster, you would typically not use any parameters.
+         For example: <ClusterConnectionParameters />
+  -->
+  <ClusterConnectionParameters />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Local.1Node.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.5Node.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
+  <!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
+       Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.
+       
+       For a local cluster, you would typically not use any parameters.
+         For example: <ClusterConnectionParameters />
+  -->
+  <ClusterConnectionParameters />
+  <ApplicationParameterFile Path="..\ApplicationParameters\Local.5Node.xml" />
+</PublishProfile>

ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/Scripts/Deploy-FabricApplication.ps1

@@ -0,0 +1,258 @@
+<#
+.SYNOPSIS 
+Deploys a Service Fabric application type to a cluster.
+
+.DESCRIPTION
+This script deploys a Service Fabric application type to a cluster.  It is invoked by Visual Studio when deploying a Service Fabric Application project.
+
+.NOTES
+WARNING: This script file is invoked by Visual Studio.  Its parameters must not be altered but its logic can be customized as necessary.
+
+.PARAMETER PublishProfileFile
+Path to the file containing the publish profile.
+
+.PARAMETER ApplicationPackagePath
+Path to the folder of the packaged Service Fabric application.
+
+.PARAMETER DeployOnly
+Indicates that the Service Fabric application should not be created or upgraded after registering the application type.
+
+.PARAMETER ApplicationParameter
+Hashtable of the Service Fabric application parameters to be used for the application.
+
+.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade
+Indicates whether to unregister any unused application versions that exist after an upgrade is finished.
+
+.PARAMETER OverrideUpgradeBehavior
+Indicates the behavior used to override the upgrade settings specified by the publish profile.
+'None' indicates that the upgrade settings will not be overridden.
+'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile.
+'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile.
+
+.PARAMETER UseExistingClusterConnection
+Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session.  The cluster connection parameters configured in the publish profile are ignored.
+
+.PARAMETER OverwriteBehavior
+Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application.
+'Never' will not remove the existing application. This is the default behavior.
+'Always' will remove the existing application even if its Application type and Version is different from the application being created. 
+'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created.
+
+.PARAMETER SkipPackageValidation
+Switch signaling whether the package should be validated or not before deployment.
+
+.PARAMETER SecurityToken
+A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory.
+
+.PARAMETER CopyPackageTimeoutSec
+Timeout in seconds for copying application package to image store.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug'
+
+Deploy the application using the default package location for a Debug build.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication
+
+Deploy the application but do not create the application instance.
+
+.EXAMPLE
+. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'}
+
+Deploy the application by providing values for parameters that are defined in the application manifest.
+#>
+
+Param
+(
+    [String]
+    $PublishProfileFile,
+
+    [String]
+    $ApplicationPackagePath,
+
+    [Switch]
+    $DeployOnly,
+
+    [Hashtable]
+    $ApplicationParameter,
+
+    [Boolean]
+    $UnregisterUnusedApplicationVersionsAfterUpgrade,
+
+    [String]
+    [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')]
+    $OverrideUpgradeBehavior = 'None',
+
+    [Switch]
+    $UseExistingClusterConnection,
+
+    [String]
+    [ValidateSet('Never','Always','SameAppTypeAndVersion')]
+    $OverwriteBehavior = 'Never',
+
+    [Switch]
+    $SkipPackageValidation,
+
+    [String]
+    $SecurityToken,
+
+    [int]
+    $CopyPackageTimeoutSec
+)
+
+function Read-XmlElementAsHashtable
+{
+    Param (
+        [System.Xml.XmlElement]
+        $Element
+    )
+
+    $hashtable = @{}
+    if ($Element.Attributes)
+    {
+        $Element.Attributes | 
+            ForEach-Object {
+                $boolVal = $null
+                if ([bool]::TryParse($_.Value, [ref]$boolVal)) {
+                    $hashtable[$_.Name] = $boolVal
+                }
+                else {
+                    $hashtable[$_.Name] = $_.Value
+                }
+            }
+    }
+
+    return $hashtable
+}
+
+function Read-PublishProfile
+{
+    Param (
+        [ValidateScript({Test-Path $_ -PathType Leaf})]
+        [String]
+        $PublishProfileFile
+    )
+
+    $publishProfileXml = [Xml] (Get-Content $PublishProfileFile)
+    $publishProfile = @{}
+
+    $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters")
+    $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment")
+    $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters")
+
+    if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment"))
+    {
+        $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters")
+        if ($publishProfile.UpgradeDeployment["Mode"])
+        {
+            $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true
+        }
+    }
+
+    $publishProfileFolder = (Split-Path $PublishProfileFile)
+    $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path)
+
+    return $publishProfile
+}
+
+$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path)
+
+if (!$PublishProfileFile)
+{
+    $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml"
+}
+
+if (!$ApplicationPackagePath)
+{
+    $ApplicationPackagePath = "$LocalFolder\..\pkg\Release"
+}
+
+$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath
+
+$publishProfile = Read-PublishProfile $PublishProfileFile
+
+if (-not $UseExistingClusterConnection)
+{
+    $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters
+    if ($SecurityToken)
+    {
+        $ClusterConnectionParameters["SecurityToken"] = $SecurityToken
+    }
+
+    try
+    {
+        [void](Connect-ServiceFabricCluster @ClusterConnectionParameters)
+    }
+    catch [System.Fabric.FabricObjectClosedException]
+    {
+        Write-Warning "Service Fabric cluster may not be connected."
+        throw
+    }
+}
+
+$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK"
+$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath
+Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1"
+
+$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade'
+
+$PublishParameters = @{
+    'ApplicationPackagePath' = $ApplicationPackagePath
+    'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile
+    'ApplicationParameter' = $ApplicationParameter
+    'ErrorAction' = 'Stop'
+}
+
+if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec)
+{
+    $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec
+}
+
+if ($publishProfile.CopyPackageParameters.CompressPackage)
+{
+    $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage
+}
+
+# CopyPackageTimeoutSec parameter overrides the value from the publish profile
+if ($CopyPackageTimeoutSec)
+{
+    $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec
+}
+
+if ($IsUpgrade)
+{
+    $Action = "RegisterAndUpgrade"
+    if ($DeployOnly)
+    {
+        $Action = "Register"
+    }
+    
+    $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters
+
+    if ($OverrideUpgradeBehavior -eq 'ForceUpgrade')
+    {
+        # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior.
+        $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true }
+    }
+
+    $PublishParameters['Action'] = $Action
+    $PublishParameters['UpgradeParameters'] = $UpgradeParameters
+    $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade
+
+    Publish-UpgradedServiceFabricApplication @PublishParameters
+}
+else
+{
+    $Action = "RegisterAndCreate"
+    if ($DeployOnly)
+    {
+        $Action = "Register"
+    }
+
+    $PublishParameters['Action'] = $Action
+    $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior
+    $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation
+    
+    Publish-NewServiceFabricApplication @PublishParameters
+}

ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus.sfproj

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets=";ValidateMSBuildFiles">
+  <Import Project="..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>25f73fd9-b32f-401a-80e8-17c72606a7e1</ProjectGuid>
+    <ProjectVersion>1.7</ProjectVersion>
+    <MinToolsVersion>1.5</MinToolsVersion>
+    <SupportedMSBuildNuGetPackageVersion>1.6</SupportedMSBuildNuGetPackageVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ApplicationPackageRoot\ApplicationManifest.xml" />
+    <None Include="ApplicationParameters\Cloud.xml" />
+    <None Include="ApplicationParameters\Local.1Node.xml" />
+    <None Include="ApplicationParameters\Local.5Node.xml" />
+    <None Include="PublishProfiles\Cloud.xml" />
+    <None Include="PublishProfiles\Local.1Node.xml" />
+    <None Include="PublishProfiles\Local.5Node.xml" />
+    <None Include="Scripts\Deploy-FabricApplication.ps1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ApplicationPackageRoot\WebStatusPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\WebStatusPkg\ServiceManifest.xml" />
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+  <PropertyGroup>
+    <ApplicationProjectTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets</ApplicationProjectTargetsPath>
+  </PropertyGroup>
+  <Import Project="$(ApplicationProjectTargetsPath)" Condition="Exists('$(ApplicationProjectTargetsPath)')" />
+  <Import Project="..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" />
+  <Target Name="ValidateMSBuildFiles">
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" Text="Unable to find the '..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.props' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package" />
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" Text="Unable to find the '..\..\..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.6.1\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package" />
+  </Target>
+</Project>

ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.VisualStudio.Azure.Fabric.MSBuild" version="1.6.1" targetFramework="net461" />
+</packages>

eShopOnContainers-ServicesAndWebApps.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}"
 EndProject
@@ -103,6 +103,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServiceFabric", "ServiceFab
 EndProject
 Project("{A07B5EB6-E848-4116-A8D0-A826331D98C6}") = "eShopOnServiceFabric", "ServiceFabric\eShopOnServiceFabric\eShopOnServiceFabric.sfproj", "{983EAB84-65C5-4793-A300-08F97C791A15}"
 EndProject
+Project("{A07B5EB6-E848-4116-A8D0-A826331D98C6}") = "eShopOnServiceFabricIdSrv", "ServiceFabric\eShopOnServiceFabricIdSrv\eShopOnServiceFabricIdSrv\eShopOnServiceFabricIdSrv.sfproj", "{39B54901-D57D-416E-B51E-33C4017CA464}"
+EndProject
+Project("{A07B5EB6-E848-4116-A8D0-A826331D98C6}") = "eShopOnServiceFabricWebMVC", "ServiceFabric\eShopOnServiceFabricWebMVC\eShopOnServiceFabricWebMVC\eShopOnServiceFabricWebMVC.sfproj", "{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}"
+EndProject
+Project("{A07B5EB6-E848-4116-A8D0-A826331D98C6}") = "eShopOnServiceFabricWebSPA", "ServiceFabric\eShopOnServiceFabricWebSPA\eShopOnServiceFabricWebSPA\eShopOnServiceFabricWebSPA.sfproj", "{1670DE10-5626-429D-A74A-2DD8281CC0C9}"
+EndProject
+Project("{A07B5EB6-E848-4116-A8D0-A826331D98C6}") = "eShopOnServiceFabricWebStatus", "ServiceFabric\eShopOnServiceFabricWebStatus\eShopOnServiceFabricWebStatus\eShopOnServiceFabricWebStatus.sfproj", "{25F73FD9-B32F-401A-80E8-17C72606A7E1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -1417,6 +1425,214 @@ Global
 		{983EAB84-65C5-4793-A300-08F97C791A15}.Release|x64.Build.0 = Release|x64
 		{983EAB84-65C5-4793-A300-08F97C791A15}.Release|x64.Deploy.0 = Release|x64
 		{983EAB84-65C5-4793-A300-08F97C791A15}.Release|x86.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|Any CPU.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|ARM.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|ARM.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|ARM.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|iPhone.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|iPhone.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|iPhone.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|x64.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|x64.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|x64.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|x86.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|x86.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Ad-Hoc|x86.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|Any CPU.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|Any CPU.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|Any CPU.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|ARM.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|ARM.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|ARM.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|iPhone.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|iPhone.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|iPhone.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|iPhoneSimulator.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|x64.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|x64.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|x64.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|x86.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|x86.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.AppStore|x86.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Debug|ARM.ActiveCfg = Debug|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Debug|iPhone.ActiveCfg = Debug|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Debug|x64.ActiveCfg = Debug|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Debug|x64.Build.0 = Debug|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Debug|x64.Deploy.0 = Debug|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Debug|x86.ActiveCfg = Debug|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Release|Any CPU.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Release|ARM.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Release|iPhone.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Release|iPhoneSimulator.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Release|x64.ActiveCfg = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Release|x64.Build.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Release|x64.Deploy.0 = Release|x64
+		{39B54901-D57D-416E-B51E-33C4017CA464}.Release|x86.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|Any CPU.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|ARM.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|ARM.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|ARM.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|iPhone.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|iPhone.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|iPhone.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|x64.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|x64.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|x64.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|x86.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|x86.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Ad-Hoc|x86.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|Any CPU.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|Any CPU.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|Any CPU.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|ARM.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|ARM.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|ARM.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|iPhone.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|iPhone.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|iPhone.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|iPhoneSimulator.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|x64.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|x64.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|x64.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|x86.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|x86.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.AppStore|x86.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Debug|ARM.ActiveCfg = Debug|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Debug|iPhone.ActiveCfg = Debug|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Debug|x64.ActiveCfg = Debug|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Debug|x64.Build.0 = Debug|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Debug|x64.Deploy.0 = Debug|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Debug|x86.ActiveCfg = Debug|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Release|Any CPU.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Release|ARM.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Release|iPhone.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Release|iPhoneSimulator.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Release|x64.ActiveCfg = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Release|x64.Build.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Release|x64.Deploy.0 = Release|x64
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612}.Release|x86.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|Any CPU.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|ARM.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|ARM.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|ARM.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|iPhone.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|iPhone.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|iPhone.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|x64.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|x64.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|x64.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|x86.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|x86.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Ad-Hoc|x86.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|Any CPU.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|Any CPU.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|Any CPU.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|ARM.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|ARM.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|ARM.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|iPhone.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|iPhone.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|iPhone.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|iPhoneSimulator.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|x64.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|x64.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|x64.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|x86.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|x86.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.AppStore|x86.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Debug|ARM.ActiveCfg = Debug|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Debug|iPhone.ActiveCfg = Debug|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Debug|x64.ActiveCfg = Debug|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Debug|x64.Build.0 = Debug|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Debug|x64.Deploy.0 = Debug|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Debug|x86.ActiveCfg = Debug|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Release|Any CPU.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Release|ARM.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Release|iPhone.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Release|iPhoneSimulator.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Release|x64.ActiveCfg = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Release|x64.Build.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Release|x64.Deploy.0 = Release|x64
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9}.Release|x86.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|Any CPU.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|ARM.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|ARM.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|ARM.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|iPhone.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|iPhone.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|iPhone.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|x64.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|x64.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|x64.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|x86.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|x86.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Ad-Hoc|x86.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|Any CPU.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|Any CPU.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|Any CPU.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|ARM.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|ARM.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|ARM.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|iPhone.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|iPhone.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|iPhone.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|iPhoneSimulator.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|x64.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|x64.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|x64.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|x86.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|x86.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.AppStore|x86.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Debug|ARM.ActiveCfg = Debug|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Debug|iPhone.ActiveCfg = Debug|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Debug|x64.ActiveCfg = Debug|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Debug|x64.Build.0 = Debug|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Debug|x64.Deploy.0 = Debug|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Debug|x86.ActiveCfg = Debug|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Release|Any CPU.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Release|ARM.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Release|iPhone.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Release|iPhoneSimulator.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Release|x64.ActiveCfg = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Release|x64.Build.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Release|x64.Deploy.0 = Release|x64
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1}.Release|x86.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1465,6 +1681,10 @@ Global
 		{768C887F-C229-4B94-ACD8-0C7F65686524} = {A81ECBC2-6B00-4DCD-8388-469174033379}
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
 		{983EAB84-65C5-4793-A300-08F97C791A15} = {0D1E7D4E-12DD-4B67-9595-7C0BD347F8C8}
+		{39B54901-D57D-416E-B51E-33C4017CA464} = {0D1E7D4E-12DD-4B67-9595-7C0BD347F8C8}
+		{0CF895FF-3616-4D1F-8D2E-5D856CDF3612} = {0D1E7D4E-12DD-4B67-9595-7C0BD347F8C8}
+		{1670DE10-5626-429D-A74A-2DD8281CC0C9} = {0D1E7D4E-12DD-4B67-9595-7C0BD347F8C8}
+		{25F73FD9-B32F-401A-80E8-17C72606A7E1} = {0D1E7D4E-12DD-4B67-9595-7C0BD347F8C8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}