diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 51284360a..dc01317a8 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -219,23 +219,23 @@ services: - "15672:15672" - "5672:5672" -# mobileshoppingapigw: -# environment: -# - ASPNETCORE_ENVIRONMENT=Development -# - IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. -# ports: -# - "5200:80" -# volumes: -# - ./src/Apigw/configs/mobileshoppingapigw:/app/configuration -# -# mobilemarketingapigw: -# environment: -# - ASPNETCORE_ENVIRONMENT=Development -# - IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. -# ports: -# - "5201:80" -# volumes: -# - ./src/Apigw/configs/mobilemarketingapigw:/app/configuration + mobileshoppingapigw: + environment: + - ASPNETCORE_ENVIRONMENT=Development + - IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. + ports: + - "5200:80" + volumes: + - ./src/ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration + + mobilemarketingapigw: + environment: + - ASPNETCORE_ENVIRONMENT=Development + - IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. + ports: + - "5201:80" + volumes: + - ./src/ApiGateways/Mobile.Bff.Marketing/apigw:/app/configuration webshoppingapigw: environment: @@ -244,16 +244,16 @@ services: ports: - "5202:80" volumes: - - ./src/Apigw/configs/webshoppingapigw:/app/configuration + - ./src/ApiGateways/Web.Bff.Shopping/apigw:/app/configuration -# webmarketingapigw: -# environment: -# - ASPNETCORE_ENVIRONMENT=Development -# - IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. -# ports: -# - "5203:80" -# volumes: -# - ./src/Apigw/configs/webmarketingapigw:/app/configuration + webmarketingapigw: + environment: + - ASPNETCORE_ENVIRONMENT=Development + - IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110. + ports: + - "5203:80" + volumes: + - ./src/ApiGateways/Web.Bff.Marketing/apigw:/app/configuration mobileshoppingagg: environment: diff --git a/docker-compose.yml b/docker-compose.yml index 18372f23e..f1bd68076 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,39 +108,39 @@ services: rabbitmq: image: rabbitmq:3-management-alpine -# mobileshoppingapigw: -# image: eshop/ocelotapigw-ms -# build: -# context: . -# dockerfile: src/Apigw/OcelotApiGw/Dockerfile -# -# mobilemarketingapigw: -# image: eshop/ocelotapigw-mm -# build: -# context: . -# dockerfile: src/Apigw/OcelotApiGw/Dockerfile2 -# + mobileshoppingapigw: + image: eshop/ocelotapigw-ms + build: + context: . + dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile + + mobilemarketingapigw: + image: eshop/ocelotapigw-mm + build: + context: . + dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile2 + webshoppingapigw: image: eshop/ocelotapigw-ws build: context: . - dockerfile: src/Apigw/OcelotApiGw/Dockerfile3 + dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile3 -# webmarketingapigw: -# image: eshop/ocelotapigw-wm -# build: -# context: . -# dockerfile: src/Apigw/OcelotApiGw/Dockerfile4 + webmarketingapigw: + image: eshop/ocelotapigw-wm + build: + context: . + dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile mobileshoppingagg: image: eshop/mobileshoppingagg build: context: . - dockerfile: src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile + dockerfile: src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile webshoppingagg: image: eshop/webshoppingagg build: context: . - dockerfile: src/Aggregators/Web.Shopping.HttpAggregator/Dockerfile + dockerfile: src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln index 2be8cf090..c1fe125a5 100644 --- a/eShopOnContainers-ServicesAndWebApps.sln +++ b/eShopOnContainers-ServicesAndWebApps.sln @@ -97,15 +97,35 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebHost", "WebHost", "{1815 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebHost.Customization", "src\BuildingBlocks\WebHostCustomization\WebHost.Customization\WebHost.Customization.csproj", "{15F4B3AA-89B6-4A0D-9051-414305974781}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiGw", "ApiGw", "{7A58AA20-67F3-48F3-88C8-24EBFE621792}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiGateways", "ApiGateways", "{77849D35-37D4-4802-81DC-9477B2775A40}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OcelotApiGw", "src\Apigw\OcelotApiGw\OcelotApiGw.csproj", "{E0C5162E-DF26-4341-9E51-14AE800D7505}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiGw-Base", "ApiGw-Base", "{EC91ADE9-3D66-4AB2-9FB4-2B585E1F3531}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aggregators", "Aggregators", "{EA378316-9D49-4A6B-858E-D4A25F948A74}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile.Bff.Marketing", "Mobile.Bff.Marketing", "{DB813A36-11BA-41FE-B258-CA9A7152247B}" + ProjectSection(SolutionItems) = preProject + src\ApiGateways\Mobile.Bff.Marketing\apigw\configuration.json = src\ApiGateways\Mobile.Bff.Marketing\apigw\configuration.json + EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.Shopping.HttpAggregator", "src\Aggregators\Mobile.Shopping.HttpAggregator\Mobile.Shopping.HttpAggregator.csproj", "{6E99F232-1536-424F-A28C-91692C8FD325}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile.Bff.Shopping", "Mobile.Bff.Shopping", "{0189E4FB-6E2B-4F2E-9B1D-5473D23FC6DB}" + ProjectSection(SolutionItems) = preProject + src\ApiGateways\Mobile.Bff.Shopping\apigw\configuration.json = src\ApiGateways\Mobile.Bff.Shopping\apigw\configuration.json + EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Shopping.HttpAggregator", "src\Aggregators\Web.Shopping.HttpAggregator\Web.Shopping.HttpAggregator.csproj", "{714CE0A1-E8BE-4CF1-8948-C1202E1526E2}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Bff.Marketing", "Web.Bff.Marketing", "{F8F0921C-EE5D-4AED-A4D6-5BF5FAE02CB5}" + ProjectSection(SolutionItems) = preProject + src\ApiGateways\Web.Bff.Marketing\apigw\configuration.json = src\ApiGateways\Web.Bff.Marketing\apigw\configuration.json + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Bff.Shopping", "Web.Bff.Shopping", "{28C0F5C8-4849-4035-80AB-45639424E73F}" + ProjectSection(SolutionItems) = preProject + src\ApiGateways\Web.Bff.Shopping\apigw\configuration.json = src\ApiGateways\Web.Bff.Shopping\apigw\configuration.json + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OcelotApiGw", "src\ApiGateways\ApiGw-Base\OcelotApiGw.csproj", "{3F79558C-485D-49E1-BD3E-E12538D3D308}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.Shopping.HttpAggregator", "src\ApiGateways\Mobile.Bff.Shopping\aggregator\Mobile.Shopping.HttpAggregator.csproj", "{BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Shopping.HttpAggregator", "src\ApiGateways\Web.Bff.Shopping\aggregator\Web.Shopping.HttpAggregator.csproj", "{AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -1321,150 +1341,150 @@ Global {15F4B3AA-89B6-4A0D-9051-414305974781}.Release|x64.Build.0 = Release|Any CPU {15F4B3AA-89B6-4A0D-9051-414305974781}.Release|x86.ActiveCfg = Release|Any CPU {15F4B3AA-89B6-4A0D-9051-414305974781}.Release|x86.Build.0 = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|ARM.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|iPhone.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|x64.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|x64.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|x86.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.AppStore|x86.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|ARM.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|iPhone.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|x64.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|x64.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|x86.ActiveCfg = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Debug|x86.Build.0 = Debug|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|Any CPU.Build.0 = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|ARM.ActiveCfg = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|ARM.Build.0 = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|iPhone.ActiveCfg = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|iPhone.Build.0 = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|x64.ActiveCfg = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|x64.Build.0 = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|x86.ActiveCfg = Release|Any CPU - {E0C5162E-DF26-4341-9E51-14AE800D7505}.Release|x86.Build.0 = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|ARM.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhone.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x64.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x64.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x86.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.AppStore|x86.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|ARM.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhone.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x64.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x64.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x86.ActiveCfg = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Debug|x86.Build.0 = Debug|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|Any CPU.Build.0 = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|ARM.ActiveCfg = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|ARM.Build.0 = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhone.ActiveCfg = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhone.Build.0 = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x64.ActiveCfg = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x64.Build.0 = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x86.ActiveCfg = Release|Any CPU - {6E99F232-1536-424F-A28C-91692C8FD325}.Release|x86.Build.0 = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|ARM.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|iPhone.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|x64.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|x64.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|x86.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.AppStore|x86.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|ARM.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|ARM.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|iPhone.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|x64.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|x64.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|x86.ActiveCfg = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Debug|x86.Build.0 = Debug|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|Any CPU.Build.0 = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|ARM.ActiveCfg = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|ARM.Build.0 = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|iPhone.ActiveCfg = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|iPhone.Build.0 = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|x64.ActiveCfg = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|x64.Build.0 = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|x86.ActiveCfg = Release|Any CPU - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2}.Release|x86.Build.0 = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|x64.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|ARM.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|iPhone.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|x64.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|x64.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|x86.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.AppStore|x86.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|ARM.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|ARM.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|iPhone.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|x64.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|x64.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|x86.ActiveCfg = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Debug|x86.Build.0 = Debug|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|Any CPU.Build.0 = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|ARM.ActiveCfg = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|ARM.Build.0 = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|iPhone.ActiveCfg = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|iPhone.Build.0 = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|x64.ActiveCfg = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|x64.Build.0 = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|x86.ActiveCfg = Release|Any CPU + {3F79558C-485D-49E1-BD3E-E12538D3D308}.Release|x86.Build.0 = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|x64.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|ARM.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|iPhone.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|x64.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|x64.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|x86.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.AppStore|x86.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|ARM.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|ARM.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|iPhone.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|x64.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|x64.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|x86.ActiveCfg = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Debug|x86.Build.0 = Debug|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|Any CPU.Build.0 = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|ARM.ActiveCfg = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|ARM.Build.0 = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|iPhone.ActiveCfg = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|iPhone.Build.0 = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|x64.ActiveCfg = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|x64.Build.0 = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|x86.ActiveCfg = Release|Any CPU + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0}.Release|x86.Build.0 = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|x64.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|ARM.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|iPhone.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|x64.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|x64.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|x86.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.AppStore|x86.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|ARM.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|ARM.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|iPhone.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|x64.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|x64.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|x86.ActiveCfg = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Debug|x86.Build.0 = Debug|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|Any CPU.Build.0 = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|ARM.ActiveCfg = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|ARM.Build.0 = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|iPhone.ActiveCfg = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|iPhone.Build.0 = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|x64.ActiveCfg = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|x64.Build.0 = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|x86.ActiveCfg = Release|Any CPU + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1511,11 +1531,15 @@ Global {969E793C-C413-490E-9C9D-B2B46DA5AF32} = {EF0337F2-ED00-4643-89FD-EE10863F1870} {1815B651-941C-466B-AE33-D1D7EEB8F77F} = {DB0EFB20-B024-4E5E-A75C-52143C131D25} {15F4B3AA-89B6-4A0D-9051-414305974781} = {1815B651-941C-466B-AE33-D1D7EEB8F77F} - {7A58AA20-67F3-48F3-88C8-24EBFE621792} = {932D8224-11F6-4D07-B109-DA28AD288A63} - {E0C5162E-DF26-4341-9E51-14AE800D7505} = {7A58AA20-67F3-48F3-88C8-24EBFE621792} - {EA378316-9D49-4A6B-858E-D4A25F948A74} = {932D8224-11F6-4D07-B109-DA28AD288A63} - {6E99F232-1536-424F-A28C-91692C8FD325} = {EA378316-9D49-4A6B-858E-D4A25F948A74} - {714CE0A1-E8BE-4CF1-8948-C1202E1526E2} = {EA378316-9D49-4A6B-858E-D4A25F948A74} + {77849D35-37D4-4802-81DC-9477B2775A40} = {932D8224-11F6-4D07-B109-DA28AD288A63} + {EC91ADE9-3D66-4AB2-9FB4-2B585E1F3531} = {77849D35-37D4-4802-81DC-9477B2775A40} + {DB813A36-11BA-41FE-B258-CA9A7152247B} = {77849D35-37D4-4802-81DC-9477B2775A40} + {0189E4FB-6E2B-4F2E-9B1D-5473D23FC6DB} = {77849D35-37D4-4802-81DC-9477B2775A40} + {F8F0921C-EE5D-4AED-A4D6-5BF5FAE02CB5} = {77849D35-37D4-4802-81DC-9477B2775A40} + {28C0F5C8-4849-4035-80AB-45639424E73F} = {77849D35-37D4-4802-81DC-9477B2775A40} + {3F79558C-485D-49E1-BD3E-E12538D3D308} = {EC91ADE9-3D66-4AB2-9FB4-2B585E1F3531} + {BEA37D6D-4CF2-4AE8-9575-72388E54FBD0} = {0189E4FB-6E2B-4F2E-9B1D-5473D23FC6DB} + {AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1} = {28C0F5C8-4849-4035-80AB-45639424E73F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9} diff --git a/src/Apigw/OcelotApiGw/Dockerfile b/src/ApiGateways/ApiGw-Base/Dockerfile similarity index 60% rename from src/Apigw/OcelotApiGw/Dockerfile rename to src/ApiGateways/ApiGw-Base/Dockerfile index aec2dc4e3..f0ff49f43 100644 --- a/src/Apigw/OcelotApiGw/Dockerfile +++ b/src/ApiGateways/ApiGw-Base/Dockerfile @@ -1,13 +1,14 @@ FROM microsoft/aspnetcore:2.0 AS base WORKDIR /app +ENV ESHOP_API_GW Mobile_Bff_Shopping_ApiGw EXPOSE 80 FROM microsoft/aspnetcore-build:2.0 AS build WORKDIR /src -COPY src/Apigw/OcelotApiGw/OcelotApiGw.csproj src/Apigw/OcelotApiGw/ -RUN dotnet restore src/Apigw/OcelotApiGw/ +COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/ +RUN dotnet restore src/ApiGateways/ApiGw-Base/ COPY . . -WORKDIR /src/src/Apigw/OcelotApiGw +WORKDIR /src/src/ApiGateways/ApiGw-Base/ RUN dotnet build -c Release -o /app FROM build AS publish diff --git a/src/Apigw/OcelotApiGw/Dockerfile2 b/src/ApiGateways/ApiGw-Base/Dockerfile2 similarity index 60% rename from src/Apigw/OcelotApiGw/Dockerfile2 rename to src/ApiGateways/ApiGw-Base/Dockerfile2 index aec2dc4e3..f127b33d1 100644 --- a/src/Apigw/OcelotApiGw/Dockerfile2 +++ b/src/ApiGateways/ApiGw-Base/Dockerfile2 @@ -1,13 +1,14 @@ FROM microsoft/aspnetcore:2.0 AS base WORKDIR /app +ENV ESHOP_API_GW Mobile_Bff_Marketing_ApiGw EXPOSE 80 FROM microsoft/aspnetcore-build:2.0 AS build WORKDIR /src -COPY src/Apigw/OcelotApiGw/OcelotApiGw.csproj src/Apigw/OcelotApiGw/ -RUN dotnet restore src/Apigw/OcelotApiGw/ +COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/ +RUN dotnet restore src/ApiGateways/ApiGw-Base/ COPY . . -WORKDIR /src/src/Apigw/OcelotApiGw +WORKDIR /src/src/ApiGateways/ApiGw-Base/ RUN dotnet build -c Release -o /app FROM build AS publish diff --git a/src/Apigw/OcelotApiGw/Dockerfile3 b/src/ApiGateways/ApiGw-Base/Dockerfile3 similarity index 61% rename from src/Apigw/OcelotApiGw/Dockerfile3 rename to src/ApiGateways/ApiGw-Base/Dockerfile3 index aec2dc4e3..aff6cc920 100644 --- a/src/Apigw/OcelotApiGw/Dockerfile3 +++ b/src/ApiGateways/ApiGw-Base/Dockerfile3 @@ -1,13 +1,14 @@ FROM microsoft/aspnetcore:2.0 AS base WORKDIR /app +ENV ESHOP_API_GW Web_Bff_Shopping_ApiGw EXPOSE 80 FROM microsoft/aspnetcore-build:2.0 AS build WORKDIR /src -COPY src/Apigw/OcelotApiGw/OcelotApiGw.csproj src/Apigw/OcelotApiGw/ -RUN dotnet restore src/Apigw/OcelotApiGw/ +COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/ +RUN dotnet restore src/ApiGateways/ApiGw-Base/ COPY . . -WORKDIR /src/src/Apigw/OcelotApiGw +WORKDIR /src/src/ApiGateways/ApiGw-Base/ RUN dotnet build -c Release -o /app FROM build AS publish diff --git a/src/Apigw/OcelotApiGw/Dockerfile4 b/src/ApiGateways/ApiGw-Base/Dockerfile4 similarity index 61% rename from src/Apigw/OcelotApiGw/Dockerfile4 rename to src/ApiGateways/ApiGw-Base/Dockerfile4 index aec2dc4e3..4686420d1 100644 --- a/src/Apigw/OcelotApiGw/Dockerfile4 +++ b/src/ApiGateways/ApiGw-Base/Dockerfile4 @@ -1,13 +1,14 @@ FROM microsoft/aspnetcore:2.0 AS base WORKDIR /app +ENV ESHOP_API_GW Web_Bff_Marketing_ApiGw EXPOSE 80 FROM microsoft/aspnetcore-build:2.0 AS build WORKDIR /src -COPY src/Apigw/OcelotApiGw/OcelotApiGw.csproj src/Apigw/OcelotApiGw/ -RUN dotnet restore src/Apigw/OcelotApiGw/ +COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/ +RUN dotnet restore src/ApiGateways/ApiGw-Base/ COPY . . -WORKDIR /src/src/Apigw/OcelotApiGw +WORKDIR /src/src/ApiGateways/ApiGw-Base/ RUN dotnet build -c Release -o /app FROM build AS publish diff --git a/src/Apigw/OcelotApiGw/OcelotApiGw.csproj b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj similarity index 100% rename from src/Apigw/OcelotApiGw/OcelotApiGw.csproj rename to src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj diff --git a/src/Apigw/OcelotApiGw/Program.cs b/src/ApiGateways/ApiGw-Base/Program.cs similarity index 100% rename from src/Apigw/OcelotApiGw/Program.cs rename to src/ApiGateways/ApiGw-Base/Program.cs diff --git a/src/Apigw/OcelotApiGw/Properties/launchSettings.json b/src/ApiGateways/ApiGw-Base/Properties/launchSettings.json similarity index 100% rename from src/Apigw/OcelotApiGw/Properties/launchSettings.json rename to src/ApiGateways/ApiGw-Base/Properties/launchSettings.json diff --git a/src/Apigw/OcelotApiGw/Startup.cs b/src/ApiGateways/ApiGw-Base/Startup.cs similarity index 100% rename from src/Apigw/OcelotApiGw/Startup.cs rename to src/ApiGateways/ApiGw-Base/Startup.cs diff --git a/src/Apigw/OcelotApiGw/appsettings.json b/src/ApiGateways/ApiGw-Base/appsettings.json similarity index 100% rename from src/Apigw/OcelotApiGw/appsettings.json rename to src/ApiGateways/ApiGw-Base/appsettings.json diff --git a/src/Apigw/configs/mobilemarketingapigw/configuration.json b/src/ApiGateways/Mobile.Bff.Marketing/apigw/configuration.json similarity index 100% rename from src/Apigw/configs/mobilemarketingapigw/configuration.json rename to src/ApiGateways/Mobile.Bff.Marketing/apigw/configuration.json diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Config/UrlsConfig.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Config/UrlsConfig.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Config/UrlsConfig.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Config/UrlsConfig.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/BasketController.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/BasketController.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/BasketController.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/BasketController.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/HomeController.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/HomeController.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/HomeController.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/HomeController.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/OrderController.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/OrderController.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Controllers/OrderController.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Controllers/OrderController.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile similarity index 87% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile index 24df53c80..273743cee 100644 --- a/src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile @@ -6,7 +6,7 @@ FROM microsoft/aspnetcore-build:2.0 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 -WORKDIR /src/src/Aggregators/Mobile.Shopping.HttpAggregator +WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator RUN dotnet build --no-restore -c Release -o /app FROM build AS publish @@ -16,3 +16,4 @@ FROM base AS final WORKDIR /app COPY --from=publish /app . ENTRYPOINT ["dotnet", "Mobile.Shopping.HttpAggregator.dll"] + diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Filters/AuthorizeCheckOperationFilter.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Filters/AuthorizeCheckOperationFilter.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Mobile.Shopping.HttpAggregator.csproj b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj similarity index 87% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Mobile.Shopping.HttpAggregator.csproj rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj index 093e7a370..bd6d73950 100644 --- a/src/Aggregators/Mobile.Shopping.HttpAggregator/Mobile.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/AddBasketItemRequest.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Models/AddBasketItemRequest.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/BasketData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Models/BasketData.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/BasketData.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/CatalogItem.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/CatalogItem.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Models/CatalogItem.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/CatalogItem.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderData.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderItemData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderItemData.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Models/OrderItemData.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderItemData.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketItemsRequest.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketItemsRequest.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketRequest.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Models/UpdateBasketRequest.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Program.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Program.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Program.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Program.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Properties/launchSettings.json b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Properties/launchSettings.json similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Properties/launchSettings.json rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Properties/launchSettings.json diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/BasketService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Services/BasketService.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/CatalogService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/CatalogService.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Services/CatalogService.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/CatalogService.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IBasketService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/IBasketService.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IBasketService.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/IBasketService.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/ICatalogService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/ICatalogService.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Services/ICatalogService.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/ICatalogService.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IOrderApiClient.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/IOrderApiClient.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Services/IOrderApiClient.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/IOrderApiClient.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Services/OrderApiClient.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderApiClient.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Services/OrderApiClient.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/OrderApiClient.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/appsettings.json b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.json similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/appsettings.json rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.json diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/appsettings.localhost.json b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.localhost.json similarity index 100% rename from src/Aggregators/Mobile.Shopping.HttpAggregator/appsettings.localhost.json rename to src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.localhost.json diff --git a/src/Apigw/configs/mobileshoppingapigw/configuration.json b/src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json similarity index 100% rename from src/Apigw/configs/mobileshoppingapigw/configuration.json rename to src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json diff --git a/src/Apigw/configs/webmarketingapigw/configuration.json b/src/ApiGateways/Web.Bff.Marketing/apigw/configuration.json similarity index 100% rename from src/Apigw/configs/webmarketingapigw/configuration.json rename to src/ApiGateways/Web.Bff.Marketing/apigw/configuration.json diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Config/UrlsConfig.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Config/UrlsConfig.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Controllers/BasketController.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/BasketController.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Controllers/BasketController.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/BasketController.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Controllers/HomeController.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/HomeController.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Controllers/HomeController.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/HomeController.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Controllers/OrderController.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/OrderController.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Controllers/OrderController.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/OrderController.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Dockerfile b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile similarity index 87% rename from src/Aggregators/Web.Shopping.HttpAggregator/Dockerfile rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile index 267cb233c..ce6f1b155 100644 --- a/src/Aggregators/Web.Shopping.HttpAggregator/Dockerfile +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile @@ -6,7 +6,7 @@ FROM microsoft/aspnetcore-build:2.0 AS build WORKDIR /src COPY . . RUN dotnet restore -nowarn:msb3202,nu1503 -WORKDIR /src/src/Aggregators/Web.Shopping.HttpAggregator +WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator RUN dotnet build --no-restore -c Release -o /app FROM build AS publish diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Filters/AuthorizeCheckOperationFilter.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Filters/AuthorizeCheckOperationFilter.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Models/AddBasketItemRequest.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Models/AddBasketItemRequest.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Models/BasketData.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Models/BasketData.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Models/CatalogItem.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/CatalogItem.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Models/CatalogItem.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Models/CatalogItem.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Models/OrderData.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderData.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Models/OrderData.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderData.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Models/OrderItemData.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderItemData.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Models/OrderItemData.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderItemData.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Models/UpdateBasketItemsRequest.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Models/UpdateBasketItemsRequest.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Models/UpdateBasketRequest.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Models/UpdateBasketRequest.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Program.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Program.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Program.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Program.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Properties/launchSettings.json b/src/ApiGateways/Web.Bff.Shopping/aggregator/Properties/launchSettings.json similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Properties/launchSettings.json rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Properties/launchSettings.json diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Services/BasketService.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Services/BasketService.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Services/CatalogService.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/CatalogService.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Services/CatalogService.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Services/CatalogService.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Services/IBasketService.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IBasketService.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Services/IBasketService.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IBasketService.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Services/ICatalogService.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/ICatalogService.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Services/ICatalogService.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Services/ICatalogService.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Services/IOrderApiClient.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IOrderApiClient.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Services/IOrderApiClient.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IOrderApiClient.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Services/OrderApiClient.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Services/OrderApiClient.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Startup.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/Startup.cs rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Web.Shopping.HttpAggregator.csproj b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj similarity index 87% rename from src/Aggregators/Web.Shopping.HttpAggregator/Web.Shopping.HttpAggregator.csproj rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj index fd04c8bee..0b6dbf44b 100644 --- a/src/Aggregators/Web.Shopping.HttpAggregator/Web.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/appsettings.json b/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/appsettings.json rename to src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/appsettings.localhost.json b/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json similarity index 100% rename from src/Aggregators/Web.Shopping.HttpAggregator/appsettings.localhost.json rename to src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json diff --git a/src/Apigw/configs/webshoppingapigw/configuration.json b/src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json similarity index 100% rename from src/Apigw/configs/webshoppingapigw/configuration.json rename to src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json