Merged with mainline

This commit is contained in:
Ollie Ferns 2017-04-12 18:51:34 +01:00
commit fa4a4c6b8d
5 changed files with 47 additions and 41 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="54687c57-08ec-4504-8060-f36bcb62ddcf" Publisher="CN=jsuarez" Version="1.0.0.0" /> <Identity Name="54687c57-08ec-4504-8060-f36bcb62ddce" Publisher="CN=jsuarez" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="54687c57-08ec-4504-8060-f36bcb62ddcf" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <mp:PhoneIdentity PhoneProductId="54687c57-08ec-4504-8060-f36bcb62ddcf" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties> <Properties>
<DisplayName>eShopOnContainers.UWP</DisplayName> <DisplayName>eShopOnContainers.UWP</DisplayName>

View File

@ -8,5 +8,6 @@
} }
}, },
"IdentityUrl": "http://localhost:5105", "IdentityUrl": "http://localhost:5105",
"ConnectionString": "127.0.0.1" "ConnectionString": "127.0.0.1",
"EventBusConnection": "amqp://guest:guest@localhost:5672"
} }

View File

@ -1,5 +1,6 @@
{ {
"ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word", "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word",
"EventBusConnection": "amqp://guest:guest@localhost:5672",
"ExternalCatalogBaseUrl": "http://localhost:5101", "ExternalCatalogBaseUrl": "http://localhost:5101",
"Logging": { "Logging": {
"IncludeScopes": false, "IncludeScopes": false,

View File

@ -1,6 +1,8 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;" "DefaultConnection": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;",
"EventBusConnection": "amqp://guest:guest@localhost:5672"
}, },
"MvcClient": "http://localhost:5100", "MvcClient": "http://localhost:5100",
"SpaClient": "http://localhost:5104", "SpaClient": "http://localhost:5104",

View File

@ -1,5 +1,7 @@
{ {
"ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
"EventBusConnection": "amqp://guest:guest@localhost:5672",
"IdentityUrl": "http://localhost:5105", "IdentityUrl": "http://localhost:5105",
"Logging": { "Logging": {
"IncludeScopes": false, "IncludeScopes": false,