From 8ff4856a89be55d11c6a41aabaef3f5ce71d6ba5 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Mon, 2 Oct 2017 12:57:19 -0700 Subject: [PATCH 1/5] Git test --- cli-mac/build-bits.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli-mac/build-bits.sh b/cli-mac/build-bits.sh index 8548ec72b..39ac6e5da 100755 --- a/cli-mac/build-bits.sh +++ b/cli-mac/build-bits.sh @@ -38,3 +38,5 @@ fi # No need to build the images, docker build or docker compose will # do that using the images and containers defined in the docker-compose.yml file. +# +# From 09e35a8c65b6cee21f6a089ef6bf367a555d6eab Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Mon, 2 Oct 2017 13:16:11 -0700 Subject: [PATCH 2/5] Update build-bits.sh --- cli-mac/build-bits.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli-mac/build-bits.sh b/cli-mac/build-bits.sh index 39ac6e5da..a7712b831 100755 --- a/cli-mac/build-bits.sh +++ b/cli-mac/build-bits.sh @@ -1,5 +1,7 @@ #!/bin/sh +# List of microservices here needs to be updated to include all the new microservices (Marketing, etc.) + projectList=( "../src/Services/Catalog/Catalog.API" "../src/Services/Basket/Basket.API" From 34a4271608e1a37f45d2c57cba832733fd808a26 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Mon, 2 Oct 2017 13:26:06 -0700 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c0218730f..de1a9ab13 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Sample .NET Core reference application, powered by Microsoft, based on a simplif **Note for Pull Requests**: We accept pull request from the community. When doing it, please do it onto the DEV branch which is the consolidated work-in-progress branch. Do not request it onto Master, if possible. ## Moved to .NET Core 2.0 "wave" -We have moved to .NET Core 2.0! +We have moved to .NET Core 2.0 already! * Branch `dev` is in .NET Core 2.0. * Branch `master` is *still* in .NET Core 1.1 (but it will be updated soon) From 2ca72e8f1d04c38006a401e730646cb17cc106c9 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Mon, 2 Oct 2017 14:59:30 -0700 Subject: [PATCH 4/5] Set Linux as by default target OS for Docker's project in VS2017 --- docker-compose.dcproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.dcproj b/docker-compose.dcproj index 8a3522935..23547b577 100644 --- a/docker-compose.dcproj +++ b/docker-compose.dcproj @@ -5,7 +5,7 @@ True http://localhost:5100 webmvc - Windows + Linux 2.0 From 01ff19a6133bcd6f101f18d696b518604a88f806 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Tue, 3 Oct 2017 09:19:06 -0700 Subject: [PATCH 5/5] Removed Service Fabric manifests targeting Windows from default eShopOnContainers VS solution which targets Docker Linux --- eShopOnContainers-ServicesAndWebApps.sln | 279 +---------------------- 1 file changed, 1 insertion(+), 278 deletions(-) diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln index 37555c403..cbb34f830 100644 --- a/eShopOnContainers-ServicesAndWebApps.sln +++ b/eShopOnContainers-ServicesAndWebApps.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.15 +VisualStudioVersion = 15.0.26730.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}" EndProject @@ -99,18 +99,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Health EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoadTest", "test\Services\LoadTest\LoadTest.csproj", "{969E793C-C413-490E-9C9D-B2B46DA5AF32}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServiceFabric", "ServiceFabric", "{0D1E7D4E-12DD-4B67-9595-7C0BD347F8C8}" -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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebHost", "WebHost", "{1815B651-941C-466B-AE33-D1D7EEB8F77F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebHost.Customization", "src\BuildingBlocks\WebHostCustomization\WebHost.Customization\WebHost.Customization.csproj", "{15F4B3AA-89B6-4A0D-9051-414305974781}" @@ -1377,266 +1365,6 @@ Global {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x64.Build.0 = Release|Any CPU {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x86.ActiveCfg = Release|Any CPU {969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x86.Build.0 = Release|Any CPU - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|Any CPU.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|ARM.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|ARM.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|ARM.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|iPhone.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|iPhone.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|iPhone.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|x64.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|x64.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|x64.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|x86.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|x86.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Ad-Hoc|x86.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|Any CPU.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|Any CPU.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|Any CPU.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|ARM.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|ARM.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|ARM.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|iPhone.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|iPhone.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|iPhone.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|iPhoneSimulator.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|x64.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|x64.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|x64.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|x86.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|x86.Build.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.AppStore|x86.Deploy.0 = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Debug|Any CPU.ActiveCfg = Debug|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Debug|ARM.ActiveCfg = Debug|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Debug|iPhone.ActiveCfg = Debug|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Debug|x64.ActiveCfg = Debug|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Debug|x64.Build.0 = Debug|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Debug|x64.Deploy.0 = Debug|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Debug|x86.ActiveCfg = Debug|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Release|Any CPU.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Release|ARM.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Release|iPhone.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Release|iPhoneSimulator.ActiveCfg = Release|x64 - {983EAB84-65C5-4793-A300-08F97C791A15}.Release|x64.ActiveCfg = Release|x64 - {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 {15F4B3AA-89B6-4A0D-9051-414305974781}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU {15F4B3AA-89B6-4A0D-9051-414305974781}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {15F4B3AA-89B6-4A0D-9051-414305974781}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU @@ -1732,11 +1460,6 @@ Global {69AF10D3-AA76-4FF7-B187-EC7E8CC5F5B8} = {807BB76E-B2BB-47A2-A57B-3D1B20FF5E7F} {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} {1815B651-941C-466B-AE33-D1D7EEB8F77F} = {DB0EFB20-B024-4E5E-A75C-52143C131D25} {15F4B3AA-89B6-4A0D-9051-414305974781} = {1815B651-941C-466B-AE33-D1D7EEB8F77F} EndGlobalSection