Sync master into release-1.6 (#523)

* Make sure the client is actual built (#517)

Signed-off-by: Xavier Geerinck <[email protected]>

* Update DevContainer base image to fix CodeSpaces and DevContainer issues (#519)

* Update base image to later Universal 1.x Focal, but still pin to 1.x major version

Signed-off-by: Paul Yuknewicz <[email protected]>

* Updated readme to clarify pre-req SKUs for GitHub CodeSpaces support

Signed-off-by: Paul Yuknewicz <[email protected]>

Co-authored-by: Mukundan Sundararajan <[email protected]>

* Setting FLASK_RUN_PORT=5001 in distributed-calc

Signed-off-by: Charlie Stanley <[email protected]>

Co-authored-by: Xavier Geerinck <[email protected]>
Co-authored-by: Paul Yuknewicz <[email protected]>
Co-authored-by: Mukundan Sundararajan <[email protected]>
Co-authored-by: Charlie Stanley <[email protected]>

.devcontainer/Dockerfile

@@ -3,7 +3,7 @@
 # Licensed under the MIT License.
 # ------------------------------------------------------------
 
-FROM mcr.microsoft.com/vscode/devcontainers/universal:1.6.9-focal
+FROM mcr.microsoft.com/vscode/devcontainers/universal:1-focal
 
 # Copy custom first notice message.
 COPY first-run-notice.txt /tmp/staging/

README.md

@@ -11,6 +11,7 @@ This repository contains a collection of tutorials with code samples that are ai
 If you are new to Dapr and haven't done so already, it is recommended you go through the Dapr [Getting Started](https://docs.dapr.io/getting-started/install-dapr/) instructions.
 
 If you would like to jump in right away by using [GitHub Codespaces](https://github.com/features/codespaces), you can click on "Code" in this repo and "Open with Codespaces", which will let you get started right away with [`dapr init`](https://docs.dapr.io/getting-started/install-dapr-selfhost/). The Codespace will be based off a personal fork of this repo (if you have not already forked this repo, one will be created for you), so feel free to explore!
+>Note GitHub Codespaces currently requires GitHub Team and Enterprise Cloud plans plus configuration by organization owners.  See the [CodeSpaces FAQ](https://github.com/features/codespaces) for current information on pre-reqs.  
 
 This repository is designed to help you explore different Dapr capabilities and you can go through the quickstarts based on the areas you would like to explore. Each quickstart includes sample code and a tutorial that will guide you through it.
 

distributed-calculator/README.md

@@ -176,6 +176,15 @@ working_dir: "./python"
 
 <!-- END_STEP -->
 
+- Set environment variable to use non-default app port 5000
+   ```bash
+   #Linux/Mac OS:
+   export FLASK_RUN_PORT=5001
+
+   #Windows:
+   set FLASK_RUN_PORT=5001
+   ```
+
 <!-- STEP
 expected_stdout_lines:
   - "You're up and running! Both Dapr and your app logs will appear here."
@@ -188,6 +197,8 @@ working_dir: "./python"
 output_match_mode: substring
 background: true
 sleep: 2
+env:
+  FLASK_RUN_PORT: "5001"
 -->
 
 - Start dapr using the command: