Merge branch 'master' of https://github.com/dotnet/eShopOnContainers

Author: ramon-tomas-c

NuGet.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
+    <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

README.md

@@ -0,0 +1,39 @@
+
+projectList=(
+    "/src/Services/Catalog/Catalog.API"
+    "/src/Services/Basket/Basket.API"
+    "/src/Services/Ordering/Ordering.API"
+    "/src/Services/Identity/Identity.API"
+    "/src/Web/WebMVC"
+    "/src/Web/WebSPA"
+)
+
+# Build SPA app
+pushd $(pwd)/src/Web/WebSPA
+npm rebuild node-sass
+npm run build:prod
+
+for project in "${projectList[@]}"
+do
+    echo -e "\e[33mWorking on $(pwd)/$project"
+    echo -e "\e[33m\tRemoving old publish output"
+    pushd $(pwd)/$project
+    rm -rf obj/Docker/publish
+    echo -e "\e[33m\tRestoring project"
+    dotnet restore
+    echo -e "\e[33m\tBuilding and publishing projects"
+    dotnet publish -o obj/Docker/publish
+    popd
+done
+
+# remove old docker images:
+#images=$(docker images --filter=reference="eshop/*" -q)
+#if [ -n "$images" ]; then
+#    docker rm $(docker ps -a -q) -f
+#    echo "Deleting eShop images in local Docker repo"
+#    echo $images
+#    docker rmi $(docker images --filter=reference="eshop/*" -q) -f
+#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.

README.md.saved.bak

@@ -1,3 +1,9 @@
+
+#########################################################################################################
+# This "expanded Script" can be used when debugging issues when building the .NET Core bits 
+# as it is easier to follow and debug than when using a loop (like in the optimized build-bits.ps1)
+#########################################################################################################
+
 Param([string] $rootPath)
 $scriptPath = Split-Path $script:MyInvocation.MyCommand.Path
 

cli-linux/build-bits-linux.sh

@@ -0,0 +1,20 @@
+# This approach still has issues, but would be the simplest approach for this script
+# See: https://github.com/dotnet/eShopOnContainers/issues/74 
+
+Param([string] $rootPath)
+$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path
+
+Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow
+
+if ([string]::IsNullOrEmpty($rootPath)) {
+    $rootPath = "$scriptPath\.."
+}
+Write-Host "Root path used is $rootPath" -ForegroundColor Yellow
+
+
+$SolutionFilePath = $rootPath + "eShopOnContainers-ServicesAndWebApps.sln"
+
+dotnet restore $SolutionFilePath
+
+dotnet publish $SolutionFilePath -c Release -o .\obj\Docker\publish
+