.

.gitignore

@@ -2,7 +2,6 @@
 **/bin
 **/obj
 **/libs
-**/lib
 
 # editors
 **/*.xproj

docs/adrs/0263-proxy-support.md

@@ -1,5 +1,4 @@
 # ADR 263: Self Hosted Runner Proxies
-
 **Date**: 2019-11-13
 
 **Status**: Accepted
@@ -10,7 +9,8 @@
 - While there is not a standard convention, many applications support setting proxies via the environmental variables `http_proxy`, `https_proxy`, `no_proxy`, such as curl, wget, perl, python, docker, git, R, ect
   - Some of these applications use `HTTPS_PROXY` versus `https_proxy`, but most understand or primarily support the lowercase variant
 
-## Decision
+
+## Decisions
 
 We will update the Runner to use the conventional environment variables for proxies: `http_proxy`, `https_proxy` and `no_proxy` if they are set.
 These are described in detail below:

docs/adrs/0276-problem-matchers.md

@@ -1,263 +0,0 @@
-# ADR 0276: Problem Matchers
-
-**Date** 2019-06-05
-
-**Status** Accepted
-
-## Context
-
-Compilation failures during a CI build should surface good error messages.
-
-For example, the actual compile errors from the typescript compiler should bubble as issues in the UI. And not simply "tsc exited with exit code 1".
-
-VSCode has an extensible model for solving this type of problem. VSCode allows users to configure which problems matchers to use, when scanning output. For example, a user can apply the `tsc` problem matcher to receive a rich error output experience in VSCode, when compiling their typescript project.
-
-The problem-matcher concept fits well with "setup" actions. For example, the `setup-nodejs` action will download node.js, add it to the PATH, and register the `tsc` problem matcher. For the duration of the job, the `tsc` problem matcher will be applied against the output.
-
-## Decision
-
-### Registration
-
-#### Using `##` command
-
-`##[add-matcher]path-to-problem-matcher-config.json`
-
-Using a `##` command allows for flexibility:
-- Ad hoc scripts can register problem matchers
-- Allows problem matchers to be conditionally registered
-
-Note, if a matcher with the same name is registered a second time, it will clobber the first instance.
-
-#### Unregister using `##` command
-
-A way out for rare cases where scoping is a problem.
-
-`##[remove-matcher]owner`
-
-For the this to be usable, the `owner` needs to be discoverable. Therefore, debug print the owner on registration.
-
-### Single line matcher
-
-Consider the output:
-
-```
-[...]
-
-Build FAILED.
-
-"C:\temp\problemmatcher\myproject\ConsoleApp1\ConsoleApp1.sln" (default target) (1) ->
-"C:\temp\problemmatcher\myproject\ConsoleApp1\ConsoleApp1\ConsoleApp1.csproj" (default target) (2) ->
-"C:\temp\problemmatcher\myproject\ConsoleApp1\ClassLibrary1\ClassLibrary1.csproj" (default target) (3) ->
-(CoreCompile target) -> 
-  Class1.cs(16,24): warning CS0612: 'ClassLibrary1.Helpers.MyHelper.Name' is obsolete [C:\temp\problemmatcher\myproject\ConsoleApp1\ClassLibrary1\ClassLibrary1.csproj]
-
-
-"C:\temp\problemmatcher\myproject\ConsoleApp1\ConsoleApp1.sln" (default target) (1) ->
-"C:\temp\problemmatcher\myproject\ConsoleApp1\ConsoleApp1\ConsoleApp1.csproj" (default target) (2) ->
-"C:\temp\problemmatcher\myproject\ConsoleApp1\ClassLibrary1\ClassLibrary1.csproj" (default target) (3) ->
-(CoreCompile target) -> 
-  Helpers\MyHelper.cs(16,30): error CS1002: ; expected [C:\temp\problemmatcher\myproject\ConsoleApp1\ClassLibrary1\ClassLibrary1.csproj]
-
-    1 Warning(s)
-    1 Error(s)
-```
-
-The below match configuration uses a regular expression to discover problem lines. And the match groups are mapped into issue-properties.
-
-```json
-"owner": "msbuild",
-"pattern": [
-  {
-    "regexp": "^\\s*([^:]+)\\((\\d+),(\\d+)\\): (error|warning) ([^:]+): (.*) \\[(.+)\\]$",
-    "file": 1,
-    "line": 2,
-    "column": 3,
-    "severity": 4,
-    "code": 5,
-    "message": 6,
-    "fromPath": 7
-  }
-]
-```
-
-The above output and match configuration produces the following matches:
-
-```
-line:     Class1.cs(16,24): warning CS0612: 'ClassLibrary1.Helpers.MyHelper.Name' is obsolete [C:\myrepo\myproject\ConsoleApp1\ClassLibrary1\ClassLibrary1.csproj]
-file:     Class1.cs
-line:     16
-column:   24
-severity: warning
-code:     CS0612
-message:  'ClassLibrary1.Helpers.MyHelper.Name' is obsolete
-fromPath: C:\myrepo\myproject\ConsoleApp1\ClassLibrary1\ClassLibrary1.csproj
-```
-
-```
-line:     Helpers\MyHelper.cs(16,30): error CS1002: ; expected [C:\myrepo\myproject\ConsoleApp1\ClassLibrary1\ClassLibrary1.csproj]
-file:     Helpers\MyHelper.cs
-line:     16
-column:   30
-severity: error
-code:     CS1002
-message:  ; expected
-fromPath: C:\myrepo\myproject\ConsoleApp1\ClassLibrary1\ClassLibrary1.csproj
-```
-
-Additionally the line will appear red in the web UI (prefix with `##[error]`).
-
-Note, an error does not imply task failure. Exit codes communicate failure.
-
-Note, strip color codes when evaluating regular expressions.
-
-### Multi-line matcher
-
-Consider the below output from ESLint in stylish mode. The file name is printed once, yet multiple error lines are printed.
-
-```
-test.js
-  1:0   error  Missing "use strict" statement                 strict
-  5:10  error  'addOne' is defined but never used             no-unused-vars
-✖ 2 problems (2 errors, 0 warnings)
-```
-
-The below match configuration uses multiple regular expressions, for the multiple lines.
-
-And the last pattern of a multiline matcher can specify the `loop` property. This allows multiple errors to be discovered.
-
-```json
-"owner": "eslint-stylish",
-"pattern": [
-  {
-    "regexp": "^([^\\s].*)$",
-    "file": 1
-  },
-  {
-    "regexp": "^\\s+(\\d+):(\\d+)\\s+(error|warning|info)\\s+(.*)\\s\\s+(.*)$",
-    "line": 1,
-    "column": 2,
-    "severity": 3,
-    "message": 4,
-    "code": 5,
-    "loop": true
-  }
-]
-```
-
-The above output and match configuration produces two matches:
-
-```
-line:     1:0   error  Missing "use strict" statement                 strict
-file:     test.js
-line:     1
-column:   0
-severity: error
-message:  Missing "use strict" statement
-code:     strict
-```
-
-```
-line:     5:10  error  'addOne' is defined but never used             no-unused-vars
-file:     test.js
-line:     5
-column:   10
-severity: error
-message:  'addOne' is defined but never used
-code:     no-unused-vars
-```
-
-Note, in the above example only the error line will appear red in the web UI. The \"file\" line will not appear red.
-
-### Other details
-
-#### Configuration `owner`
-
-Can be used to stomp over or remove.
-
-#### Rooting the file
-
-The goal of the file information is to provide a hyperlink in the UI.
-
-Solving this problem means:
-- Rooting the file when unrooted:
-  - Use the `fromPath` if specified (assume file path)
-  - Use the `github.workspace` (where the repo is cloned on disk)
-- Match against a repository to determine the relative path within the repo
-
-This is a place where we diverge from VSCode. VSCode task configuration are specific to the local workspace (workspace root is known or can be specified). We're solving a more generic problem, so we need more information - specifically the `fromPath` property - in order to accurately root the path.
-
-In order to avoid creating inaccurate hyperlinks on the error issues, the agent will verify the file exists and is in the main repository. Otherwise omit the file property from the error issue and debug trace what happened.
-
-#### Supported severity levels
-
-Ordinal ignore case:
-
-- `warning`
-- `error`
-
-Coalesce empty with \"error\". For any other values, omit logging an issue and debug trace what happened.
-
-#### Default severity level
-
-Problem matchers are unable to interpret severity strings other than `warning` and `error`. The `severity` match group expects `warning` or `error` (case insensitive).
-
-However some tools indicate error/warning in different ways. For example `flake8` uses codes like `E100`, `W200`, and `F300` (error, warning, fatal, respectively).
-
-Therefore, allow a property `severity`, sibling to `owner`, which identifies the default severity for the problem matcher. This allows two problem matchers are registered - one for warnings and one for errors.
-
-For example, given the following `flake8` output:
-
-```
-./bootcamp/settings.py:156:80: E501 line too long (94 > 79 characters)
-./bootcamp/settings.py:165:5: F403 'from local_settings import *' used; unable to detect undefined names
-```
-
-Two problem matchers can be used:
-
-```json
-{
-    "problemMatcher": [
-        {
-            "owner": "flake8",
-            "pattern": [
-                {
-                    "regexp": "^(.+):(\\d+):(\\d+): ([EF]\\d+) (.+)$",
-                    "file": 1,
-                    "line": 2,
-                    "column": 3,
-                    "code": 4,
-                    "message": 5
-                }
-            ]
-        },
-        {
-            "owner": "flake8-warnings",
-            "severity": "warning",
-            "pattern": [
-                {
-                    "regexp": "^(.+):(\\d+):(\\d+): (W\\d+) (.+)$",
-                    "file": 1,
-                    "line": 2,
-                    "column": 3,
-                    "code": 4,
-                    "message": 5
-                }
-            ]
-        }
-    ]
-}
-```
-
-#### Mitigate regular expression denial of service (ReDos)
-
-If a matcher exceeds a 1 second timeout when processing a line, retry up to two three times total.
-After three unsuccessful attempts, warn and eject the matcher. The matcher will not run again for the duration of the job.
-
-### Where we diverge from VSCode
-
-- We added the `fromPath` concept for rooting paths. This is done differently in VSCode, since a task is the scope (root path well known). For us, the job is the scope.
-- VSCode allows additional activation info background tasks that are always running (recompile on files changed). They allow regular expressions to define when the matcher scope begins and ends. This is an interesting concept that we could leverage to help solve our scoping problem.
-
-## Consequences
-
-- Setup actions should register problem matchers

docs/adrs/0277-run-action-shell-options.md

@@ -1,93 +0,0 @@
-# ADR 0277: Run action shell option
-
-**Date** 2019-07-09
-
-**Status** Accepted
-
-## Context
-run-actions run scripts using a platform specific shell:
-`bash -eo pipefail` on non-windows, and `cmd.exe /c /d /s` on windows
-
-The `shell` option overwrites this to allow different flags or completely different shells/interpreters
-
-A small example is:
-```yml
-jobs:
-  bash-job:
-    actions:
-    - run: echo "Hello"
-      shell: bash
-  python-job:
-    actions:
-    - run: print("Hello")
-      shell: python {0}
-```
-
-## Decision
-
-___
-
-### Shell option
-The keyword being used is `shell` 
-
-`shell` can be either:
-
-1. Builtins / Explicitly supported keywords. It is useful to support at least `cmd`, and `powershell` on Windows. Because `cmd my_cmd_script` and `powershell my_ps1_script` are not valid the same way many Linux/cross-platform interpreters are, e.g. `bash myscript` or `python myscript`. Those tools (and potentially others) also require the correct file extension to run, or must be run in a particular way to get the exit codes consistently, so we must have first class knowledge about them. We provide default templates for these keywords as follows:
-    - `cmd`: Default is: `%ComSpec% /D /E:ON /V:OFF /S /C "CALL "{0}""` where the script name is automatically appended with `.cmd` and substituted for `{0}`
-        - Note this is equivalent to the default Windows behavior if no shell option is given
-    - `pwsh`: Default is: `pwsh -command "& '{0}'"` where the script is automatically appended with `.ps1`
-    - `powershell`: Default is: `powershell -command "& '{0}'"` where the script is automatically appended with `.ps1`
-    - `bash`: Uses `bash --noprofile --norc -eo pipefail {0}`
-        - The default behavior on non-Windows if no shell is given is to attempt this first
-    - `sh`: Uses `sh -e {0}`
-        - This is the default behavior on non-Windows if no shell is given, AND `bash` (see above) was not located on the PATH
-    - `python`: `python {0}`
-    - **NOTE**: The exact command ran may vary by machine. We only provide default arguments and command format for the listed shell. While the above behavior is expected on hosted machines, private runners may vary. For example, `sh` (or other commands) may actually be a link to `/bin/dash`, `/bin/bash`, or other
-
-1. A template string: `command [...options] {0} [...more_options]`
-    - As above, the file name of the temporary script will be templated in. This gives users more control to have options at any location relative to the script path
-    - The first whitespace-delimited word of the string will be interpreted as the command
-    - e.g. `python {0} arg1 arg2` or similar can be used if passing args is needed. Some shells will require other options after the filename for various reasons
-
-Note that (1) simply provides defaults that are executed with the same mechanism as (2). That is:
-- A temporary script file is generated, and the path to that file is templated into the string at `{0}`
-- The first word of the formatted string is assumed to be a command, and we attempt to locate its full path
-- The fully qualified path to the command, plus the remaining arguments, is executed
-    - e.g. `shell: bash` expands to `/bin/bash --noprofile --norc -eo pipefail /runner/_layout/_work/_temp/f8d4fb2b-19d9-47e6-a786-4cc538d52761.sh` on my private runner
-
-At this time, **THE LIST OF WELL-KNOWN SHELL OPTIONS IS**:
-- cmd - Windows (hosted vs2017, vs2019) only
-- powershell - Windows (hosted vs2017, vs2019) only
-- sh - All hosted platforms
-- pwsh - All hosted platforms
-- bash - All hosted platforms
-- python - All hosted platforms. Can use setup-python to configure which python will be used
-___
-
-### Containers
-For container jobs, `shell` should just work the same as above, transparently. We will simply `exec` the command in the job container, passing the same arguments in
-
-___
-
-### Exit codes / Error action preference
-
-For builtin shells, we provide defaults that make the most sense for CI, running within Actions, and being executed by our runner
-
-bash/sh:
-- Fail-fast behavior using `set -e o pipefail` is the default for `bash` and `shell` builtins, and by default when no option is given on non-Windows platforms
-- Users can opt out of fail-fast and take full control easily by providing a template string to the shell options, eg: `bash {0}`.
-- sh-like shells exit with the exit code of the last command executed in a script, and is our default behavior. Thus the runner reports the status of the step as fail/succeed based on this exit code
-
-powershell/pwsh
-- Fail-fast behavior when possible. For `pwsh` and `powershell` builtins, we will prepend `$ErrorActionPreference = 'stop'` to script contents
-- We append `if ((Test-Path -LiteralPath variable:\LASTEXITCODE)) { exit $LASTEXITCODE }` to powershell scripts to get Action statuses to reflect the script's last exit code
-- Users can always opt out by not using the builtins, and providing a shell option like: `pwsh -File {0}`, or `powershell -Command "& '{0}'"`, depending on need
-
-cmd
-- There doesnt seem to be a way to fully opt in to fail-fast behavior other than writing your script to check each error code and respond accordingly, so we cant actually provide that behavior by default, it will be completely up to the user to write this behavior into their script
-- cmd.exe will exit (return the error code to the runner) with the errorlevel of the last program it executed. This is internally consistent with the previous default behavior (sh, pwsh) and is the cmd.exe default, so we keep that behavior
-
-## Consequences
-Valid `shell` options will depend on the hosted images. We will need to maintain tight image compat
-
-First class support for a shell will require a major version schema change to modify. We cannot remove or modify the behavior of a well-known supported option, However, adding first class support for new shells is backwards compatible. For instance, we can add a well-known `python` option, because non-well-known options would have always needed to include `{0}`, e.g. `python {0}`

docs/adrs/0278-env-context.md

@@ -1,60 +0,0 @@
-# ADR 0278: Env Context
-
-**Date**: 2019-09-30
-
-**Status**: Accepted
-
-## Context
-
-User wants to reference workflow variables defined in workflow yaml file for action's input, displayName and condition.  
-
-## Decision
-
-### Add `env` context in the runner
-
-Runner will create and populate the `env` context for every job execution using following logic:
-1. On job start, create `env` context with any environment variables in the job message, these are env defined in customer's YAML file's job/workflow level `env` section.
-2. Update `env` context when customer use `::set-env::` to set env at the runner level.
-3. Update `env` context with step's `env` block before each step runs.
-
-The `env` context is only available in the runner, customer can't use the `env` context in any server evaluation part, just like the `runner` context
-
-Example yaml:
-```yaml
-
-env:
-  env1: 10
-  env2: 20
-  env3: 30
-jobs:
-  build:
-    env:
-      env1: 100
-      env2: 200
-    runs-on: ubuntu-latest
-    steps:
-      - run: |
-          echo ${{ env.env1 }}  // 1000
-          echo $env1            // 1000
-          echo $env2            // 200
-          echo $env3            // 30
-        if: env.env2 == 200     // true
-        name: ${{ env.env1 }}_${{ env.env2 }}   //1000_200
-        env:
-          env1: 1000
-```
-
-### Don't populate the `env` context with environment variables from runner machine. 
-
-With job container and container action, the `env` context may not have the right value customer want and will cause confusion.  
-Ex:
-```yaml
-build:
-  runs-on: ubuntu-latest   <- $USER=runner in hosted machine
-  container: ubuntu:16.04   <- $USER=root in container
-  steps:
-  - run: echo ${{env.USER}}    <- what should customer expect this output?  runner/root
-  - uses: docker://ubuntu:18.04
-    with:
-      args: echo ${{env.USER}}  <- what should customer expect this output? runner/root
-```

docs/adrs/0279-hashFiles-expression-function.md

@@ -1,71 +0,0 @@
-# ADR 0279: HashFiles Expression Function
-
-**Date**: 2019-09-30
-
-**Status**: Accepted
-
-## Context
-First party action `actions/cache` needs a input which is an explicit `key` used for restoring and saving the cache. For packages caching, the most comment `key` might be the hash result of contents from all `package-lock.json` under `node_modules` folder.
-  
-There are serval different ways to get the hash `key` input for `actions/cache` action.
-
-1. Customer calculate the `key` themselves from a different action, customer won't like this since it needs extra step for using cache feature
-```yaml
-  steps:
-  - run: |
-      hash=some_linux_hash_method(file1, file2, file3)
-      echo ::set-output name=hash::$hash
-    id: createHash
-  - uses: actions/cache@v1
-    with:
-      key: ${{ steps.createHash.outputs.hash }}
-``` 
-
-2. Make the `key` input of `actions/cache` follow certain convention to calculate hash, this limited the `key` input to a certain format customer may not want.
-```yaml
-  steps:
-  - uses: actions/cache@v1
-    with:
-      key: ${{ runner.os }}|${{ github.workspace }}|**/package-lock.json
-```
-
-## Decision
-
-### Add hashFiles() function to expression engine for calculate files' hash
-
-`hashFiles()` will only allow on runner side since it needs to read files on disk, using `hashFiles()` on any server side evaluated expression will cause runtime errors.
-
-`hashFiles()` will only support hashing files under the `$GITHUB_WORKSPACE` since the expression evaluated on the runner, if customer use job container or container action, the runner won't have access to file system inside the container.
-
-`hashFiles()` will only take 1 parameters:
- - `hashFiles('**/package-lock.json')`  // Search files under $GITHUB_WORKSPACE and calculate a hash for them
-
-**Question: Do we need to support more than one match patterns?**  
-Ex: `hashFiles('**/package-lock.json', '!toolkit/core/package-lock.json', '!toolkit/io/package-lock.json')`  
-Answer: Only support single match pattern for GA, we can always add later.
-
-This will help customer has better experience with the `actions/cache` action's input.
-```yaml
-  steps:
-  - uses: actions/cache@v1
-    with:
-      key: ${{hashFiles('**/package-lock.json')}}-${{github.ref}}-${{runner.os}}
-```
-
-For search pattern, we will use basic globbing (`*` `?` and `[]`) and globstar (`**`).
-
-Additional pattern details:
-- Root relative paths with `github.workspace` (the main repo)
-- Make `*` match files that start with `.`
-- Case insensitive on Windows
-- Accept `\` or `/` path separators on Windows
-
-Hashing logic:
-1. Get all files under `$GITHUB_WORKSPACE`.
-2. Use search pattern filter all files to get files that matches the search pattern. (search pattern only apply to file path not folder path)
-3. Sort all matched files by full file path in alphabet order.
-4. Use SHA256 algorithm to hash each matched file and store hash result.
-5. Use SHA256 to hash all stored files' hash results to get the final 64 chars hash result.
-
-**Question: Should we include the folder structure info into the hash?**  
-Answer: No

docs/adrs/0280-command-input-echoing.md

@@ -1,30 +0,0 @@
-# ADR 0280: Echoing of Command Input
-
-**Date**: 2019-11-04  
-
-**Status**: Accepted
-
-## Context
-
-Command echoing as a default behavior tends to clutter the user logs, so we want to swap to a system where users have to opt in to see this information.
-
-Command outputs will still be echoed in the case there are any errors processing such commands. This is so the end user can have more context on why the command failed and help with troubleshooting.
-
-Echo output in the user logs can be explicitly controlled by the new commands `::echo::on` and `::echo::off`. By default, echoing is enabled if `ACTIONS_STEP_DEBUG` secret is enabled, otherwise echoing is disabled.
-
-## Decision
-- The only commands that currently echo output are
-  - `remove-matcher`
-  - `add-matcher`
-  - `add-path`
-- These will no longer echo the command, if processed successfully
-- All commands echo the input when any of these conditions is fulfilled:
-  1. When such commands fail with an error
-  2. When `::echo::on` is set
-  3. When the `ACTIONS_STEP_DEBUG` is set, and echoing hasn't been explicitly disabled with `::echo::off`
-- There are a few commands that won't be echoed, even when echo is enabled. These are (as of 2019/11/04):
-   - `add-mask`
-   - `debug`
-   - `warning`
-   - `error`
-- The three commands above will not echo, either because echoing the command would leak secrets (e.g. `add-mask`), or it would not add any additional troubleshooting information to the logs (e.g. `debug`). It's expected that future commands would follow these "echo-suppressing" guidelines as well. Echo-suppressed commands are still free to output other information to the logs, as deemed fit.

docs/adrs/0297-base64-masking-trailing-characters.md

@@ -1,48 +0,0 @@
-# ADR 0297: Base64 Masking Trailing Characters
-
-**Date** 2020-01-21
-
-**Status** Proposed
-
-## Context
-
-The Runner registers a number of Value Encoders, which mask various encodings of a provided secret. Currently, we register a 3 base64 Encoders:
-- The base64 encoded secret
-- The secret with the first character removed then base64 encoded
-- The secret with the first two characters removed then base64 encoded
-
-This gives us good coverage across the board for secrets and secrets with a prefix (i.e. `base64($user:$pass)`).
-
-However, we don't have great coverage for cases where the secret has a string appended to it before it is base64 encoded (i.e.: `base64($pass\n))`). 
-
-Most notably we've seen this as a result of user error where a user accidentially appends a newline or space character before encoding their secret in base64.
-
-## Decision
-
-### Trim end characters
-
-We are going to modify all existing base64 encoders to trim information before registering as a secret.
-We will trim:
-- `=` from the end of all base64 strings. This is a padding character that contains no information. 
-  - Based on the number of `=`'s at the end of a base64 string, a malicious user could predict the length of the original secret modulo 3. 
-    - If a user saw `***==`, they would know the secret could be 1,4,7,10... characters.
-- If a string contains `=` we will also trim the last non-padding character from the base64 secret.
-  - This character can change if a string is appended to the secret before the encoding.
-
-
-### Register a fourth encoder
-
-We will also add back in the original base64 encoded secret encoder for four total encoders:
-- The base64 encoded secret
-- The base64 encoded secret trimmed
-- The secret with the first character removed then base64 encoded and trimmed
-- The secret with the first two characters removed then base64 encoded and trimmed
-
-This allows us to fully cover the most common scenario where a user base64 encodes their secret and expects the entire thing to be masked.
-This will result in us only revealing length or bit information when a prefix or suffix is added to a secret before encoding. 
-
-## Consequences
-
-- In the case where a secret has a prefix or suffix added before base64 encoding, we may now reveal up to 20 bits of information and the length of the original string modulo 3, rather then the original 16 bits and no length information
-- Secrets with a suffix appended before encoding will now be masked across the board. Previously it was only masked if it was a multiple of 3 characters
-- Performance will suffer in a neglible way

releaseNote.md

@@ -1,30 +1,17 @@
 ## Features
-  - Expose whether debug is on/off via RUNNER_DEBUG. (#253)
+  - Remove runner flow: Change from PAT to "deletion token" in prompt (#225) 
-  - Upload log on runner when worker get killed due to cancellation timeout. (#255)
+  - Expose github.run_id and github.run_number to action runtime env. (#224)
-  - Update config.sh/cmd --help documentation (#282) 
-  - Set http_proxy and related env vars for job/service containers (#304)
-  - Set both http_proxy and HTTP_PROXY env for runner/worker processes. (#298)
 
 ## Bugs
-  - Verify runner Windows service hash started successfully after configuration (#236)
+  - Clean up error messages for container scenarios (#221)
-  - Detect source file path in L0 without using env. (#257)
+  - Pick shell from prependpath (#231)
-  - Handle escaped '%' in commands data section (#200)
-  - Allow container to be null/empty during matrix expansion (#266)
-  - Translate problem matcher file to host path (#272)
-  - Change hashFiles() expression function to use @actions/glob. (#268)
-  - Default post-job action's condition to always(). (#293)
-  - Support action.yaml file as action's entry file (#288) 
-  - Trace javascript action exit code to debug instead of user logs (#290)
-  - Change prompt message when removing a runner to lines up with GitHub.com UI (#303) 
-  - Include step.env as part of env context. (#300)
-  - Update Base64 Encoders to deal with suffixes (#284)
 
 ## Misc
-  - Move .sln file under ./src (#238)
+  - Runner code cleanup  (#218 #227, #228, #229, #230) 
-  - Treat warnings as errors during compile (#249) 
+  - Consume dotnet core 3.1 in runner. (#213)
 
 ## Windows x64
-We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows
+We recommend configuring the runner under "<DRIVE>:\actions-runner". This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows
 ``` 
 // Create a folder under the drive root
 mkdir \actions-runner ; cd \actions-runner
@@ -32,7 +19,7 @@ mkdir \actions-runner ; cd \actions-runner
 Invoke-WebRequest -Uri https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-win-x64-<RUNNER_VERSION>.zip -OutFile actions-runner-win-x64-<RUNNER_VERSION>.zip
 // Extract the installer
 Add-Type -AssemblyName System.IO.Compression.FileSystem ; 
-[System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
+[System.IO.Compression.ZipFile]::ExtractToDirectory("$HOME\Downloads\actions-runner-win-x64-<RUNNER_VERSION>.zip", "$PWD")
 ```
 
 ## OSX
@@ -41,7 +28,7 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem ;
 // Create a folder
 mkdir actions-runner && cd actions-runner
 // Download the latest runner package
-curl -O -L https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
+curl -O https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
 // Extract the installer
 tar xzf ./actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
 ```
@@ -52,7 +39,7 @@ tar xzf ./actions-runner-osx-x64-<RUNNER_VERSION>.tar.gz
 // Create a folder
 mkdir actions-runner && cd actions-runner
 // Download the latest runner package
-curl -O -L https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
+curl -O https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
 // Extract the installer
 tar xzf ./actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
 ```
@@ -63,7 +50,7 @@ tar xzf ./actions-runner-linux-x64-<RUNNER_VERSION>.tar.gz
 // Create a folder
 mkdir actions-runner && cd actions-runner
 // Download the latest runner package
-curl -O -L https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
+curl -O https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
 // Extract the installer
 tar xzf ./actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
 ```
@@ -74,7 +61,7 @@ tar xzf ./actions-runner-linux-arm64-<RUNNER_VERSION>.tar.gz
 // Create a folder
 mkdir actions-runner && cd actions-runner
 // Download the latest runner package
-curl -O -L https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
+curl -O https://github.com/actions/runner/releases/download/v<RUNNER_VERSION>/actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
 // Extract the installer
 tar xzf ./actions-runner-linux-arm-<RUNNER_VERSION>.tar.gz
 ```

src/Misc/expressionFunc/hashFiles/.eslintignore

@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/

src/Misc/expressionFunc/hashFiles/.eslintrc.json

@@ -1,59 +0,0 @@
-{
-    "plugins": ["jest", "@typescript-eslint"],
-    "extends": ["plugin:github/es6"],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "ecmaVersion": 9,
-      "sourceType": "module",
-      "project": "./tsconfig.json"
-    },
-    "rules": {
-      "eslint-comments/no-use": "off",
-      "import/no-namespace": "off",
-      "no-console": "off",
-      "no-unused-vars": "off",
-      "@typescript-eslint/no-unused-vars": "error",
-      "@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
-      "@typescript-eslint/no-require-imports": "error",
-      "@typescript-eslint/array-type": "error",
-      "@typescript-eslint/await-thenable": "error",
-      "@typescript-eslint/ban-ts-ignore": "error",
-      "camelcase": "off",
-      "@typescript-eslint/camelcase": "error",
-      "@typescript-eslint/class-name-casing": "error",
-      "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
-      "@typescript-eslint/func-call-spacing": ["error", "never"],
-      "@typescript-eslint/generic-type-naming": ["error", "^[A-Z][A-Za-z]*$"],
-      "@typescript-eslint/no-array-constructor": "error",
-      "@typescript-eslint/no-empty-interface": "error",
-      "@typescript-eslint/no-explicit-any": "error",
-      "@typescript-eslint/no-extraneous-class": "error",
-      "@typescript-eslint/no-for-in-array": "error",
-      "@typescript-eslint/no-inferrable-types": "error",
-      "@typescript-eslint/no-misused-new": "error",
-      "@typescript-eslint/no-namespace": "error",
-      "@typescript-eslint/no-non-null-assertion": "warn",
-      "@typescript-eslint/no-object-literal-type-assertion": "error",
-      "@typescript-eslint/no-unnecessary-qualifier": "error",
-      "@typescript-eslint/no-unnecessary-type-assertion": "error",
-      "@typescript-eslint/no-useless-constructor": "error",
-      "@typescript-eslint/no-var-requires": "error",
-      "@typescript-eslint/prefer-for-of": "warn",
-      "@typescript-eslint/prefer-function-type": "warn",
-      "@typescript-eslint/prefer-includes": "error",
-      "@typescript-eslint/prefer-interface": "error",
-      "@typescript-eslint/prefer-string-starts-ends-with": "error",
-      "@typescript-eslint/promise-function-async": "error",
-      "@typescript-eslint/require-array-sort-compare": "error",
-      "@typescript-eslint/restrict-plus-operands": "error",
-      "semi": "off",
-      "@typescript-eslint/semi": ["error", "never"],
-      "@typescript-eslint/type-annotation-spacing": "error",
-      "@typescript-eslint/unbound-method": "error"
-    },
-    "env": {
-      "node": true,
-      "es6": true,
-      "jest/globals": true
-    }
-  }

src/Misc/expressionFunc/hashFiles/.prettierignore

@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/

src/Misc/expressionFunc/hashFiles/.prettierrc.json

@@ -1,11 +0,0 @@
-{
-    "printWidth": 80,
-    "tabWidth": 2,
-    "useTabs": false,
-    "semi": false,
-    "singleQuote": true,
-    "trailingComma": "none",
-    "bracketSpacing": false,
-    "arrowParens": "avoid",
-    "parser": "typescript"
-  }

src/Misc/expressionFunc/hashFiles/README.md

@@ -1 +0,0 @@
-To update hashFiles under `Misc/layoutbin` run `npm install && npm run all`

src/Misc/expressionFunc/hashFiles/package.json

@@ -1,35 +0,0 @@
-{
-  "name": "hashFiles",
-  "version": "1.0.0",
-  "description": "GitHub Actions HashFiles() expression function",
-  "main": "lib/hashFiles.js",
-  "scripts": {
-    "build": "tsc",
-    "format": "prettier --write **/*.ts",
-    "format-check": "prettier --check **/*.ts",
-    "lint": "eslint src/**/*.ts",
-    "pack": "ncc build -o ../../layoutbin/hashFiles",
-    "all": "npm run build && npm run format && npm run lint && npm run pack"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/actions/runner.git"
-  },
-  "keywords": [
-    "actions"
-  ],
-  "author": "GitHub Actions",
-  "license": "MIT",
-  "dependencies": {
-    "@actions/glob": "^0.1.0"
-  },
-  "devDependencies": {
-    "@types/node": "^12.7.12",
-    "@typescript-eslint/parser": "^2.8.0",
-    "@zeit/ncc": "^0.20.5",
-    "eslint": "^5.16.0",
-    "eslint-plugin-github": "^2.0.0",
-    "prettier": "^1.19.1",
-    "typescript": "^3.6.4"
-  }
-}

src/Misc/expressionFunc/hashFiles/src/hashFiles.ts

@@ -1,55 +0,0 @@
-import * as glob from '@actions/glob'
-import * as crypto from 'crypto'
-import * as fs from 'fs'
-import * as stream from 'stream'
-import * as util from 'util'
-import * as path from 'path'
-
-async function run(): Promise<void> {
-  // arg0 -> node
-  // arg1 -> hashFiles.js
-  // env[followSymbolicLinks] = true/null
-  // env[patterns] -> glob patterns
-  let followSymbolicLinks = false
-  const matchPatterns = process.env.patterns || ''
-  if (process.env.followSymbolicLinks === 'true') {
-    console.log('Follow symbolic links')
-    followSymbolicLinks = true
-  }
-
-  console.log(`Match Pattern: ${matchPatterns}`)
-  let hasMatch = false
-  const githubWorkspace = process.cwd()
-  const result = crypto.createHash('sha256')
-  let count = 0
-  const globber = await glob.create(matchPatterns, {followSymbolicLinks})
-  for await (const file of globber.globGenerator()) {
-    console.log(file)
-    if (!file.startsWith(`${githubWorkspace}${path.sep}`)) {
-      console.log(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`)
-      continue
-    }
-    if (fs.statSync(file).isDirectory()) {
-      console.log(`Skip directory '${file}'.`)
-      continue
-    }
-    const hash = crypto.createHash('sha256')
-    const pipeline = util.promisify(stream.pipeline)
-    await pipeline(fs.createReadStream(file), hash)
-    result.write(hash.digest())
-    count++
-    if (!hasMatch) {
-      hasMatch = true
-    }
-  }
-  result.end()
-
-  if (hasMatch) {
-    console.log(`Find ${count} files to hash.`)
-    console.error(`__OUTPUT__${result.digest('hex')}__OUTPUT__`)
-  } else {
-    console.error(`__OUTPUT____OUTPUT__`)
-  }
-}
-
-run()

src/Misc/expressionFunc/hashFiles/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    "outDir": "./lib",                        /* Redirect output structure to the directory. */
-    "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    "noImplicitAny": true,                    /* Raise error on expressions and declarations with an implied 'any' type. */
-    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-  },
-  "exclude": ["node_modules", "**/*.test.ts"]
-}

src/NuGet.Config

@@ -3,6 +3,8 @@
   <packageSources>
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
+    <add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/api/v3/index.json" />    
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

src/Runner.Common/Constants.cs

@@ -136,12 +136,6 @@ namespace GitHub.Runner.Common
             }
         }
 
-        public static class RunnerEvent
-        {
-            public static readonly string Register = "register";
-            public static readonly string Remove = "remove";
-        }
-
         public static class Pipeline
         {
             public static class Path
@@ -168,8 +162,7 @@ namespace GitHub.Runner.Common
         public static class Path
         {
             public static readonly string ActionsDirectory = "_actions";
-            public static readonly string ActionManifestYmlFile = "action.yml";
+            public static readonly string ActionManifestFile = "action.yml";
-            public static readonly string ActionManifestYamlFile = "action.yaml";
             public static readonly string BinDirectory = "bin";
             public static readonly string DiagDirectory = "_diag";
             public static readonly string ExternalsDirectory = "externals";

src/Runner.Common/ExtensionManager.cs

@@ -46,7 +46,6 @@ namespace GitHub.Runner.Common
                     Add<T>(extensions, "GitHub.Runner.Worker.SetOutputCommandExtension, Runner.Worker");
                     Add<T>(extensions, "GitHub.Runner.Worker.SaveStateCommandExtension, Runner.Worker");
                     Add<T>(extensions, "GitHub.Runner.Worker.AddPathCommandExtension, Runner.Worker");
-                    Add<T>(extensions, "GitHub.Runner.Worker.RefreshTokenCommandExtension, Runner.Worker");
                     Add<T>(extensions, "GitHub.Runner.Worker.AddMaskCommandExtension, Runner.Worker");
                     Add<T>(extensions, "GitHub.Runner.Worker.AddMatcherCommandExtension, Runner.Worker");
                     Add<T>(extensions, "GitHub.Runner.Worker.RemoveMatcherCommandExtension, Runner.Worker");

src/Runner.Common/JobServer.cs

@@ -22,7 +22,6 @@ namespace GitHub.Runner.Common
         Task<List<TimelineRecord>> UpdateTimelineRecordsAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, IEnumerable<TimelineRecord> records, CancellationToken cancellationToken);
         Task RaisePlanEventAsync<T>(Guid scopeIdentifier, string hubName, Guid planId, T eventData, CancellationToken cancellationToken) where T : JobEvent;
         Task<Timeline> GetTimelineAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, CancellationToken cancellationToken);
-        Task<GitHubToken> RefreshGitHubTokenAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, CancellationToken cancellationToken);
     }
 
     public sealed class JobServer : RunnerService, IJobServer
@@ -114,11 +113,5 @@ namespace GitHub.Runner.Common
             CheckConnection();
             return _taskClient.GetTimelineAsync(scopeIdentifier, hubName, planId, timelineId, includeRecords: true, cancellationToken: cancellationToken);
         }
-
-        public Task<GitHubToken> RefreshGitHubTokenAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, CancellationToken cancellationToken)
-        {
-            CheckConnection();
-            return _taskClient.RefreshTokenAsync(scopeIdentifier, hubName, planId, jobId, cancellationToken: cancellationToken);
-        }
     }
 }

src/Runner.Common/Logging.cs

@@ -100,7 +100,7 @@ namespace GitHub.Runner.Common
         {
             EndPage();
             _byteCount = 0;
-            _dataFileName = Path.Combine(_pagesFolder, $"{_timelineId}_{_timelineRecordId}_{++_pageCount}.log");
+            _dataFileName = Path.Combine(_pagesFolder, $"{_timelineRecordId}_{++_pageCount}.log");
             _pageData = new FileStream(_dataFileName, FileMode.CreateNew);
             _pageWriter = new StreamWriter(_pageData, System.Text.Encoding.UTF8);
         }

src/Runner.Common/Util/TaskResultUtil.cs

@@ -1,4 +1,5 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.Pipelines.ContextData;
+using GitHub.DistributedTask.WebApi;
 using System;
 
 namespace GitHub.Runner.Common.Util
@@ -75,5 +76,29 @@ namespace GitHub.Runner.Common.Util
                     throw new NotSupportedException(result.ToString());
             }
         }
+
+        public static StringContextData ToContextData(this TaskResult result)
+        {
+            string str;
+            switch (result)
+            {
+                case TaskResult.Succeeded:
+                    str = "success";
+                    break;
+                case TaskResult.Failed:
+                    str = "failure";
+                    break;
+                case TaskResult.Canceled:
+                    str = "cancelled";
+                    break;
+                case TaskResult.Skipped:
+                    str = "skipped";
+                    break;
+                default:
+                    throw new NotSupportedException($"Unexpected task result '{result}' when converting to context data");
+            }
+
+            return str;
+        }
     }
 }

src/Runner.Listener/CommandSettings.cs

@@ -190,7 +190,7 @@ namespace GitHub.Runner.Listener
         {
             return GetArgOrPrompt(
                 name: Constants.Runner.CommandLine.Args.Token,
-                description: "Enter runner remove token:",
+                description: "Enter runner deletion token:",
                 defaultValue: string.Empty,
                 validator: Validators.NonEmptyValidator);
         }
@@ -291,7 +291,7 @@ namespace GitHub.Runner.Listener
             if (!string.IsNullOrEmpty(result))
             {
                 // After read the arg from input commandline args, remove it from Arg dictionary,
-                // This will help if bad arg value passed through CommandLine arg, when ConfigurationManager ask CommandSetting the second time,
+                // This will help if bad arg value passed through CommandLine arg, when ConfigurationManager ask CommandSetting the second time, 
                 // It will prompt for input instead of continue use the bad input.
                 _trace.Info($"Remove {name} from Arg dictionary.");
                 RemoveArg(name);

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -1,18 +1,19 @@
 using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
-using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.OAuth;
 using GitHub.Services.WebApi;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+using GitHub.Runner.Common;
+using GitHub.Runner.Sdk;
+using System.Net.Http;
+using System.Net.Http.Headers;
 
 namespace GitHub.Runner.Listener.Configuration
 {
@@ -108,7 +109,7 @@ namespace GitHub.Runner.Listener.Configuration
                 {
                     runnerSettings.GitHubUrl = inputUrl;
                     var githubToken = command.GetRunnerRegisterToken();
-                    GitHubAuthResult authResult = await GetTenantCredential(inputUrl, githubToken, Constants.RunnerEvent.Register);
+                    GitHubAuthResult authResult = await GetTenantCredential(inputUrl, githubToken);
                     runnerSettings.ServerUrl = authResult.TenantUrl;
                     creds = authResult.ToVssCredentials();
                     Trace.Info("cred retrieved via GitHub auth");
@@ -276,15 +277,12 @@ namespace GitHub.Runner.Listener.Configuration
                 throw new NotSupportedException("Message queue listen OAuth token.");
             }
 
-            // Testing agent connection, detect any potential connection issue, like local clock skew that cause OAuth token expired.
+            // Testing agent connection, detect any protential connection issue, like local clock skew that cause OAuth token expired.
             var credMgr = HostContext.GetService<ICredentialManager>();
             VssCredentials credential = credMgr.LoadCredentials();
             try
             {
                 await _runnerServer.ConnectAsync(new Uri(runnerSettings.ServerUrl), credential);
-                // ConnectAsync() hits _apis/connectionData which is an anonymous endpoint
-                // Need to hit an authenticate endpoint to trigger OAuth token exchange.
-                await _runnerServer.GetAgentPoolsAsync();
                 _term.WriteSuccessMessage("Runner connection is good");
             }
             catch (VssOAuthTokenRequestException ex) when (ex.Message.Contains("Current server time is"))
@@ -375,7 +373,7 @@ namespace GitHub.Runner.Listener.Configuration
                     else
                     {
                         var githubToken = command.GetRunnerDeletionToken();
-                        GitHubAuthResult authResult = await GetTenantCredential(settings.GitHubUrl, githubToken, Constants.RunnerEvent.Remove);
+                        GitHubAuthResult authResult = await GetTenantCredential(settings.GitHubUrl, githubToken);
                         creds = authResult.ToVssCredentials();
                         Trace.Info("cred retrieved via GitHub auth");
                     }
@@ -519,23 +517,17 @@ namespace GitHub.Runner.Listener.Configuration
             }
         }
 
-        private async Task<GitHubAuthResult> GetTenantCredential(string githubUrl, string githubToken, string runnerEvent)
+        private async Task<GitHubAuthResult> GetTenantCredential(string githubUrl, string githubToken)
         {
-            var gitHubUrlBuilder = new UriBuilder(githubUrl);
+            var gitHubUrl = new UriBuilder(githubUrl);
-            var githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/actions/runner-registration";
+            var githubApiUrl = $"https://api.{gitHubUrl.Host}/repos/{gitHubUrl.Path.Trim('/')}/actions-runners/registration";
             using (var httpClientHandler = HostContext.CreateHttpClientHandler())
             using (var httpClient = new HttpClient(httpClientHandler))
             {
                 httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("RemoteAuth", githubToken);
                 httpClient.DefaultRequestHeaders.UserAgent.Add(HostContext.UserAgent);
-
+                httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github.shuri-preview+json"));
-                var bodyObject = new Dictionary<string, string>()
+                var response = await httpClient.PostAsync(githubApiUrl, new StringContent("", null, "application/json"));
-                {
-                    {"url", githubUrl},
-                    {"runner_event", runnerEvent}
-                };
-
-                var response = await httpClient.PostAsync(githubApiUrl, new StringContent(StringUtil.ConvertToJson(bodyObject), null, "application/json"));
 
                 if (response.IsSuccessStatusCode)
                 {

src/Runner.Listener/JobDispatcher.cs

@@ -752,32 +752,27 @@ namespace GitHub.Runner.Listener
                 foreach (var log in logs)
                 {
                     var logName = Path.GetFileNameWithoutExtension(log);
-                    var logNameParts = logName.Split('_', StringSplitOptions.RemoveEmptyEntries);
-                    if (logNameParts.Length != 3)
-                    {
-                        Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_GUID_INT'.");
-                        continue;
-                    }
                     var logPageSeperator = logName.IndexOf('_');
                     var logRecordId = Guid.Empty;
                     var pageNumber = 0;
-
+                    if (logPageSeperator < 0)
-                    if (!Guid.TryParse(logNameParts[0], out Guid timelineId) || timelineId != timeline.Id)
                     {
-                        Trace.Warning($"log file '{log}' is not belongs to current job");
+                        Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_INT'.");
                         continue;
                     }
-
+                    else
-                    if (!Guid.TryParse(logNameParts[1], out logRecordId))
                     {
-                        Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_GUID_INT'.");
+                        if (!Guid.TryParse(logName.Substring(0, logPageSeperator), out logRecordId))
-                        continue;
+                        {
-                    }
+                            Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_INT'.");
+                            continue;
+                        }
 
-                    if (!int.TryParse(logNameParts[2], out pageNumber))
+                        if (!int.TryParse(logName.Substring(logPageSeperator + 1), out pageNumber))
-                    {
+                        {
-                        Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_GUID_INT'.");
+                            Trace.Warning($"log file '{log}' doesn't follow naming convension 'GUID_INT'.");
-                        continue;
+                            continue;
+                        }
                     }
 
                     var record = timeline.Records.FirstOrDefault(x => x.Id == logRecordId);

src/Runner.Listener/Runner.cs

@@ -451,38 +451,16 @@ namespace GitHub.Runner.Listener
             ext = "sh";
 #endif
             _term.WriteLine($@"
-Commands:
+Commands:,
- .{separator}config.{ext}         Configures the runner
+ .{separator}config.{ext}          Configures the runner
- .{separator}config.{ext} remove  Unconfigures the runner
+ .{separator}config.{ext} remove   Unconfigures the runner
- .{separator}run.{ext}            Runs the runner interactively. Does not require any options.
+ .{separator}run.{ext}             Runs the runner interactively. Does not require any options.
 
 Options:
- --help     Prints the help for each command
  --version  Prints the runner version
  --commit   Prints the runner commit
-
+ --help     Prints the help for each command
-Config Options:
+");
- --unattended     Disable interactive prompts for missing arguments. Defaults will be used for missing options
- --url string     Repository to add the runner to. Required if unattended
- --token string   Registration token. Required if unattended
- --name string    Name of the runner to configure (default {Environment.MachineName ?? "myrunner"})
- --work string    Relative runner work directory (default {Constants.Path.WorkDirectory})
- --replace        Replace any existing runner with the same name (default false)");
-#if OS_WINDOWS
-    _term.WriteLine($@" --runasservice   Run the runner as a service");
-    _term.WriteLine($@" --windowslogonaccount string   Account to run the service as. Requires runasservice");
-    _term.WriteLine($@" --windowslogonpassword string  Password for the service account. Requires runasservice");
-#endif
-    _term.WriteLine($@"
-Examples:
- Configure a runner non-interactively:
-  .{separator}config.{ext} --unattended --url <url> --token <token>
- Configure a runner non-interactively, replacing any existing runner with the same name:
-  .{separator}config.{ext} --unattended --url <url> --token <token> --replace [--name <name>]");
-#if OS_WINDOWS
-    _term.WriteLine($@" Configure a runner to run as a service:");
-    _term.WriteLine($@"  .{separator}config.{ext} --url <url> --token <token> --runasservice");
-#endif
         }
     }
 }

src/Runner.Sdk/RunnerWebProxy.cs

@@ -21,7 +21,6 @@ namespace GitHub.Runner.Sdk
         private string _httpsProxyAddress;
         private string _httpsProxyUsername;
         private string _httpsProxyPassword;
-        private string _noProxyString;
 
         private readonly List<ByPassInfo> _noProxyList = new List<ByPassInfo>();
         private readonly HashSet<string> _noProxyUnique = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
@@ -34,7 +33,6 @@ namespace GitHub.Runner.Sdk
         public string HttpsProxyAddress => _httpsProxyAddress;
         public string HttpsProxyUsername => _httpsProxyUsername;
         public string HttpsProxyPassword => _httpsProxyPassword;
-        public string NoProxyString => _noProxyString;
 
         public List<ByPassInfo> NoProxyList => _noProxyList;
 
@@ -73,10 +71,6 @@ namespace GitHub.Runner.Sdk
             {
                 _httpProxyAddress = proxyHttpUri.AbsoluteUri;
 
-                // Set both environment variables since there are tools support both casing (curl, wget) and tools support only one casing (docker)
-                Environment.SetEnvironmentVariable("HTTP_PROXY", _httpProxyAddress);
-                Environment.SetEnvironmentVariable("http_proxy", _httpProxyAddress);
-
                 // the proxy url looks like http://[user:pass@]127.0.0.1:8888
                 var userInfo = Uri.UnescapeDataString(proxyHttpUri.UserInfo).Split(':', 2, StringSplitOptions.RemoveEmptyEntries);
                 if (userInfo.Length == 2)
@@ -103,10 +97,6 @@ namespace GitHub.Runner.Sdk
             {
                 _httpsProxyAddress = proxyHttpsUri.AbsoluteUri;
 
-                // Set both environment variables since there are tools support both casing (curl, wget) and tools support only one casing (docker)
-                Environment.SetEnvironmentVariable("HTTPS_PROXY", _httpsProxyAddress);
-                Environment.SetEnvironmentVariable("https_proxy", _httpsProxyAddress);
-
                 // the proxy url looks like http://[user:pass@]127.0.0.1:8888
                 var userInfo = Uri.UnescapeDataString(proxyHttpsUri.UserInfo).Split(':', 2, StringSplitOptions.RemoveEmptyEntries);
                 if (userInfo.Length == 2)
@@ -131,12 +121,6 @@ namespace GitHub.Runner.Sdk
 
             if (!string.IsNullOrEmpty(noProxyList))
             {
-                _noProxyString = noProxyList;
-
-                // Set both environment variables since there are tools support both casing (curl, wget) and tools support only one casing (docker)
-                Environment.SetEnvironmentVariable("NO_PROXY", noProxyList);
-                Environment.SetEnvironmentVariable("no_proxy", noProxyList);
-
                 var noProxyListSplit = noProxyList.Split(',', StringSplitOptions.RemoveEmptyEntries);
                 foreach (string noProxy in noProxyListSplit)
                 {

src/Runner.Worker/ActionCommandManager.cs

@@ -1,7 +1,6 @@
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;
-using GitHub.Runner.Worker.Container;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -16,14 +15,14 @@ namespace GitHub.Runner.Worker
     {
         void EnablePluginInternalCommand();
         void DisablePluginInternalCommand();
-        bool TryProcessCommand(IExecutionContext context, string input, ContainerInfo container);
+        bool TryProcessCommand(IExecutionContext context, string input);
     }
 
     public sealed class ActionCommandManager : RunnerService, IActionCommandManager
     {
         private const string _stopCommand = "stop-commands";
         private readonly Dictionary<string, IActionCommandExtension> _commandExtensions = new Dictionary<string, IActionCommandExtension>(StringComparer.OrdinalIgnoreCase);
-        private readonly HashSet<string> _registeredCommands = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private HashSet<string> _registeredCommands = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         private readonly object _commandSerializeLock = new object();
         private bool _stopProcessCommand = false;
         private string _stopToken = null;
@@ -59,7 +58,7 @@ namespace GitHub.Runner.Worker
             _registeredCommands.Remove("internal-set-repo-path");
         }
 
-        public bool TryProcessCommand(IExecutionContext context, string input, ContainerInfo container)
+        public bool TryProcessCommand(IExecutionContext context, string input)
         {
             if (string.IsNullOrEmpty(input))
             {
@@ -115,7 +114,7 @@ namespace GitHub.Runner.Worker
 
                         try
                         {
-                            extension.ProcessCommand(context, input, actionCommand, container);
+                            extension.ProcessCommand(context, input, actionCommand);
                         }
                         catch (Exception ex)
                         {
@@ -141,7 +140,7 @@ namespace GitHub.Runner.Worker
         string Command { get; }
         bool OmitEcho { get; }
 
-        void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container);
+        void ProcessCommand(IExecutionContext context, string line, ActionCommand command);
     }
 
     public sealed class InternalPluginSetRepoPathCommandExtension : RunnerService, IActionCommandExtension
@@ -151,7 +150,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             if (!command.Properties.TryGetValue(SetRepoPathCommandProperties.repoFullName, out string repoFullName) || string.IsNullOrEmpty(repoFullName))
             {
@@ -181,7 +180,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             if (!command.Properties.TryGetValue(SetEnvCommandProperties.Name, out string envName) || string.IsNullOrEmpty(envName))
             {
@@ -206,7 +205,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             if (!command.Properties.TryGetValue(SetOutputCommandProperties.Name, out string outputName) || string.IsNullOrEmpty(outputName))
             {
@@ -230,7 +229,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             if (!command.Properties.TryGetValue(SaveStateCommandProperties.Name, out string stateName) || string.IsNullOrEmpty(stateName))
             {
@@ -254,7 +253,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             if (string.IsNullOrWhiteSpace(command.Data))
             {
@@ -280,7 +279,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             ArgUtil.NotNullOrEmpty(command.Data, "path");
             context.PrependPath.RemoveAll(x => string.Equals(x, command.Data, StringComparison.CurrentCulture));
@@ -288,30 +287,6 @@ namespace GitHub.Runner.Worker
         }
     }
 
-    public sealed class RefreshTokenCommandExtension : RunnerService, IActionCommandExtension
-    {
-        public string Command => "refresh-token";
-        public bool OmitEcho => false;
-
-        public Type ExtensionType => typeof(IActionCommandExtension);
-
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
-        {
-            ArgUtil.NotNullOrEmpty(command.Data, "token file");
-            var runnerTemp = HostContext.GetDirectory(WellKnownDirectory.Temp);
-            var tempFile = Path.Combine(runnerTemp, command.Data);
-            if (!tempFile.StartsWith(runnerTemp + Path.DirectorySeparatorChar))
-            {
-                throw new Exception($"'{command.Data}' has to be under runner temp directory '{runnerTemp}'");
-            }
-
-            Trace.Info("Here");
-            var githubToken = context.GetGitHubToken().GetAwaiter().GetResult();
-            File.WriteAllText(tempFile, githubToken);
-            Trace.Info("HereAgain");
-        }
-    }
-
     public sealed class AddMatcherCommandExtension : RunnerService, IActionCommandExtension
     {
         public string Command => "add-matcher";
@@ -319,7 +294,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             var file = command.Data;
 
@@ -331,9 +306,9 @@ namespace GitHub.Runner.Worker
             }
 
             // Translate file path back from container path
-            if (container != null)
+            if (context.Container != null)
             {
-                file = container.TranslateToHostPath(file);
+                file = context.Container.TranslateToHostPath(file);
             }
 
             // Root the path
@@ -366,7 +341,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             command.Properties.TryGetValue(RemoveMatcherCommandProperties.Owner, out string owner);
             var file = command.Data;
@@ -394,9 +369,9 @@ namespace GitHub.Runner.Worker
             else
             {
                 // Translate file path back from container path
-                if (container != null)
+                if (context.Container != null)
                 {
-                    file = container.TranslateToHostPath(file);
+                    file = context.Container.TranslateToHostPath(file);
                 }
 
                 // Root the path
@@ -434,7 +409,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command)
         {
             context.Debug(command.Data);
         }
@@ -462,7 +437,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string inputLine, ActionCommand command)
         {
             command.Properties.TryGetValue(IssueCommandProperties.File, out string file);
             command.Properties.TryGetValue(IssueCommandProperties.Line, out string line);
@@ -479,10 +454,10 @@ namespace GitHub.Runner.Worker
             {
                 issue.Category = "Code";
 
-                if (container != null)
+                if (context.Container != null)
                 {
                     // Translate file path back from container path
-                    file = container.TranslateToHostPath(file);
+                    file = context.Container.TranslateToHostPath(file);
                     command.Properties[IssueCommandProperties.File] = file;
                 }
 
@@ -542,7 +517,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             var data = this is GroupCommandExtension ? command.Data : string.Empty;
             context.Output($"##[{Command}]{data}");
@@ -556,7 +531,7 @@ namespace GitHub.Runner.Worker
 
         public Type ExtensionType => typeof(IActionCommandExtension);
 
-        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command, ContainerInfo container)
+        public void ProcessCommand(IExecutionContext context, string line, ActionCommand command)
         {
             ArgUtil.NotNullOrEmpty(command.Data, "value");
 

src/Runner.Worker/ActionManager.cs

@@ -21,24 +21,11 @@ using PipelineTemplateConstants = GitHub.DistributedTask.Pipelines.ObjectTemplat
 
 namespace GitHub.Runner.Worker
 {
-    public class PrepareResult
-    {
-        public PrepareResult(List<JobExtensionRunner> containerSetupSteps, Dictionary<Guid, IActionRunner> preStepTracker)
-        {
-            this.ContainerSetupSteps = containerSetupSteps;
-            this.PreStepTracker = preStepTracker;
-        }
-
-        public List<JobExtensionRunner> ContainerSetupSteps { get; set; }
-
-        public Dictionary<Guid, IActionRunner> PreStepTracker { get; set; }
-    }
-
     [ServiceLocator(Default = typeof(ActionManager))]
     public interface IActionManager : IRunnerService
     {
         Dictionary<Guid, ContainerInfo> CachedActionContainers { get; }
-        Task<PrepareResult> PrepareActionsAsync(IExecutionContext executionContext, IEnumerable<Pipelines.JobStep> steps);
+        Task<List<JobExtensionRunner>> PrepareActionsAsync(IExecutionContext executionContext, IEnumerable<Pipelines.JobStep> steps);
         Definition LoadAction(IExecutionContext executionContext, Pipelines.ActionStep action);
     }
 
@@ -46,13 +33,13 @@ namespace GitHub.Runner.Worker
     {
         private const int _defaultFileStreamBufferSize = 4096;
 
-        //81920 is the default used by System.IO.Stream.CopyTo and is under the large object heap threshold (85k).
+        //81920 is the default used by System.IO.Stream.CopyTo and is under the large object heap threshold (85k). 
         private const int _defaultCopyBufferSize = 81920;
 
         private readonly Dictionary<Guid, ContainerInfo> _cachedActionContainers = new Dictionary<Guid, ContainerInfo>();
 
         public Dictionary<Guid, ContainerInfo> CachedActionContainers => _cachedActionContainers;
-        public async Task<PrepareResult> PrepareActionsAsync(IExecutionContext executionContext, IEnumerable<Pipelines.JobStep> steps)
+        public async Task<List<JobExtensionRunner>> PrepareActionsAsync(IExecutionContext executionContext, IEnumerable<Pipelines.JobStep> steps)
         {
             ArgUtil.NotNull(executionContext, nameof(executionContext));
             ArgUtil.NotNull(steps, nameof(steps));
@@ -62,7 +49,6 @@ namespace GitHub.Runner.Worker
             Dictionary<string, List<Guid>> imagesToBuild = new Dictionary<string, List<Guid>>(StringComparer.OrdinalIgnoreCase);
             Dictionary<string, ActionContainer> imagesToBuildInfo = new Dictionary<string, ActionContainer>(StringComparer.OrdinalIgnoreCase);
             List<JobExtensionRunner> containerSetupSteps = new List<JobExtensionRunner>();
-            Dictionary<Guid, IActionRunner> preStepTracker = new Dictionary<Guid, IActionRunner>();
             IEnumerable<Pipelines.ActionStep> actions = steps.OfType<Pipelines.ActionStep>();
 
             // TODO: Depreciate the PREVIEW_ACTION_TOKEN
@@ -125,21 +111,6 @@ namespace GitHub.Runner.Worker
                             imagesToBuildInfo[setupInfo.ActionRepository] = setupInfo;
                         }
                     }
-
-                    var repoAction = action.Reference as Pipelines.RepositoryPathReference;
-                    if (repoAction.RepositoryType != Pipelines.PipelineConstants.SelfAlias)
-                    {
-                        var definition = LoadAction(executionContext, action);
-                        if (definition.Data.Execution.HasInit)
-                        {
-                            var actionRunner = HostContext.CreateService<IActionRunner>();
-                            actionRunner.Action = action;
-                            actionRunner.Stage = ActionRunStage.Pre;
-                            actionRunner.Condition = definition.Data.Execution.InitCondition;
-
-                            preStepTracker[action.Id] = actionRunner;
-                        }
-                    }
                 }
             }
 
@@ -176,7 +147,7 @@ namespace GitHub.Runner.Worker
             }
 #endif
 
-            return new PrepareResult(containerSetupSteps, preStepTracker);
+            return containerSetupSteps;
         }
 
         public Definition LoadAction(IExecutionContext executionContext, Pipelines.ActionStep action)
@@ -191,7 +162,6 @@ namespace GitHub.Runner.Worker
                 Data = new ActionDefinitionData()
             };
 
-            // bool localAction = false;
             if (action.Reference.Type == Pipelines.ActionSourceType.ContainerRegistry)
             {
                 Trace.Info("Load action that reference container from registry.");
@@ -210,7 +180,6 @@ namespace GitHub.Runner.Worker
                 var repoAction = action.Reference as Pipelines.RepositoryPathReference;
                 if (string.Equals(repoAction.RepositoryType, Pipelines.PipelineConstants.SelfAlias, StringComparison.OrdinalIgnoreCase))
                 {
-                    // localAction = true;
                     actionDirectory = executionContext.GetGitHubContext("workspace");
                     if (!string.IsNullOrEmpty(repoAction.Path))
                     {
@@ -229,21 +198,14 @@ namespace GitHub.Runner.Worker
                 Trace.Info($"Load action that reference repository from '{actionDirectory}'");
                 definition.Directory = actionDirectory;
 
-                string manifestFile = Path.Combine(actionDirectory, Constants.Path.ActionManifestYmlFile);
+                string manifestFile = Path.Combine(actionDirectory, "action.yml");
-                string manifestFileYaml = Path.Combine(actionDirectory, Constants.Path.ActionManifestYamlFile);
                 string dockerFile = Path.Combine(actionDirectory, "Dockerfile");
                 string dockerFileLowerCase = Path.Combine(actionDirectory, "dockerfile");
-                if (File.Exists(manifestFile) || File.Exists(manifestFileYaml))
+                if (File.Exists(manifestFile))
                 {
                     var manifestManager = HostContext.GetService<IActionManifestManager>();
-                    if (File.Exists(manifestFile))
+                    definition.Data = manifestManager.Load(executionContext, manifestFile);
-                    {
+
-                        definition.Data = manifestManager.Load(executionContext, manifestFile);
-                    }
-                    else
-                    {
-                        definition.Data = manifestManager.Load(executionContext, manifestFileYaml);
-                    }
                     Trace.Verbose($"Action friendly name: '{definition.Data.Name}'");
                     Trace.Verbose($"Action description: '{definition.Data.Description}'");
 
@@ -270,11 +232,6 @@ namespace GitHub.Runner.Worker
                             Trace.Info($"Action container env: {StringUtil.ConvertToJson(containerAction.Environment)}.");
                         }
 
-                        if (!string.IsNullOrEmpty(containerAction.Init))
-                        {
-                            Trace.Info($"Action container init entrypoint: {containerAction.Init}.");
-                        }
-
                         if (!string.IsNullOrEmpty(containerAction.EntryPoint))
                         {
                             Trace.Info($"Action container entrypoint: {containerAction.EntryPoint}.");
@@ -294,7 +251,6 @@ namespace GitHub.Runner.Worker
                     else if (definition.Data.Execution.ExecutionType == ActionExecutionType.NodeJS)
                     {
                         var nodeAction = definition.Data.Execution as NodeJSActionExecutionData;
-                        Trace.Info($"Action init node.js file: {nodeAction.Init ?? "N/A"}.");
                         Trace.Info($"Action node.js file: {nodeAction.Script}.");
                         Trace.Info($"Action cleanup node.js file: {nodeAction.Cleanup ?? "N/A"}.");
                     }
@@ -358,7 +314,7 @@ namespace GitHub.Runner.Worker
                 else
                 {
                     var fullPath = IOUtil.ResolvePath(actionDirectory, "."); // resolve full path without access filesystem.
-                    throw new NotSupportedException($"Can't find 'action.yml', 'action.yaml' or 'Dockerfile' under '{fullPath}'. Did you forget to run actions/checkout before running your local action?");
+                    throw new NotSupportedException($"Can't find 'action.yml' or 'Dockerfile' under '{fullPath}'. Did you forget to run actions/checkout before running your local action?");
                 }
             }
             else if (action.Reference.Type == Pipelines.ActionSourceType.Script)
@@ -521,7 +477,7 @@ namespace GitHub.Runner.Worker
 
                 int retryCount = 0;
 
-                // Allow up to 20 * 60s for any action to be downloaded from github graph.
+                // Allow up to 20 * 60s for any action to be downloaded from github graph. 
                 int timeoutSeconds = 20 * 60;
                 while (retryCount < 3)
                 {
@@ -699,21 +655,12 @@ namespace GitHub.Runner.Worker
             // find the docker file or action.yml file
             var dockerFile = Path.Combine(actionEntryDirectory, "Dockerfile");
             var dockerFileLowerCase = Path.Combine(actionEntryDirectory, "dockerfile");
-            var actionManifest = Path.Combine(actionEntryDirectory, Constants.Path.ActionManifestYmlFile);
+            var actionManifest = Path.Combine(actionEntryDirectory, "action.yml");
-            var actionManifestYaml = Path.Combine(actionEntryDirectory, Constants.Path.ActionManifestYamlFile);
+            if (File.Exists(actionManifest))
-            if (File.Exists(actionManifest) || File.Exists(actionManifestYaml))
             {
                 executionContext.Debug($"action.yml for action: '{actionManifest}'.");
                 var manifestManager = HostContext.GetService<IActionManifestManager>();
-                ActionDefinitionData actionDefinitionData = null;
+                var actionDefinitionData = manifestManager.Load(executionContext, actionManifest);
-                if (File.Exists(actionManifest))
-                {
-                    actionDefinitionData = manifestManager.Load(executionContext, actionManifest);
-                }
-                else
-                {
-                    actionDefinitionData = manifestManager.Load(executionContext, actionManifestYaml);
-                }
 
                 if (actionDefinitionData.Execution.ExecutionType == ActionExecutionType.Container)
                 {
@@ -773,7 +720,7 @@ namespace GitHub.Runner.Worker
             else
             {
                 var fullPath = IOUtil.ResolvePath(actionEntryDirectory, "."); // resolve full path without access filesystem.
-                throw new InvalidOperationException($"Can't find 'action.yml', 'action.yaml' or 'Dockerfile' under '{fullPath}'. Did you forget to run actions/checkout before running your local action?");
+                throw new InvalidOperationException($"Can't find 'action.yml' or 'Dockerfile' under '{fullPath}'. Did you forget to run actions/checkout before running your local action?");
             }
         }
     }
@@ -809,8 +756,6 @@ namespace GitHub.Runner.Worker
     {
         public override ActionExecutionType ExecutionType => ActionExecutionType.Container;
 
-        public override bool HasInit => !string.IsNullOrEmpty(Init);
-        public override bool HasMain => !string.IsNullOrEmpty(EntryPoint);
         public override bool HasCleanup => !string.IsNullOrEmpty(Cleanup);
 
         public string Image { get; set; }
@@ -821,8 +766,6 @@ namespace GitHub.Runner.Worker
 
         public MappingToken Environment { get; set; }
 
-        public string Init { get; set; }
-
         public string Cleanup { get; set; }
     }
 
@@ -830,14 +773,10 @@ namespace GitHub.Runner.Worker
     {
         public override ActionExecutionType ExecutionType => ActionExecutionType.NodeJS;
 
-        public override bool HasInit => !string.IsNullOrEmpty(Init);
-        public override bool HasMain => !string.IsNullOrEmpty(Script);
         public override bool HasCleanup => !string.IsNullOrEmpty(Cleanup);
 
         public string Script { get; set; }
 
-        public string Init { get; set; }
-
         public string Cleanup { get; set; }
     }
 
@@ -845,9 +784,6 @@ namespace GitHub.Runner.Worker
     {
         public override ActionExecutionType ExecutionType => ActionExecutionType.Plugin;
 
-        public override bool HasInit => false;
-        public override bool HasMain => true;
-
         public override bool HasCleanup => !string.IsNullOrEmpty(Cleanup);
 
         public string Plugin { get; set; }
@@ -858,20 +794,16 @@ namespace GitHub.Runner.Worker
     public sealed class ScriptActionExecutionData : ActionExecutionData
     {
         public override ActionExecutionType ExecutionType => ActionExecutionType.Script;
-        public override bool HasInit => false;
+
-        public override bool HasMain => true;
         public override bool HasCleanup => false;
     }
 
     public abstract class ActionExecutionData
     {
-        private string _initCondition = $"{Constants.Expressions.Always}()";
         private string _cleanupCondition = $"{Constants.Expressions.Always}()";
 
         public abstract ActionExecutionType ExecutionType { get; }
 
-        public abstract bool HasInit { get; }
-        public abstract bool HasMain { get; }
         public abstract bool HasCleanup { get; }
 
         public string CleanupCondition
@@ -879,12 +811,6 @@ namespace GitHub.Runner.Worker
             get { return _cleanupCondition; }
             set { _cleanupCondition = value; }
         }
-
-        public string InitCondition
-        {
-            get { return _initCondition; }
-            set { _initCondition = value; }
-        }
     }
 
     public class ContainerSetupInfo

src/Runner.Worker/ActionManifestManager.cs

@@ -280,9 +280,6 @@ namespace GitHub.Runner.Worker
             var envToken = default(MappingToken);
             var mainToken = default(StringToken);
             var pluginToken = default(StringToken);
-            var preToken = default(StringToken);
-            var preEntrypointToken = default(StringToken);
-            var preIfToken = default(StringToken);
             var postToken = default(StringToken);
             var postEntrypointToken = default(StringToken);
             var postIfToken = default(StringToken);
@@ -321,15 +318,6 @@ namespace GitHub.Runner.Worker
                     case "post-if":
                         postIfToken = run.Value.AssertString("post-if");
                         break;
-                    case "pre":
-                        preToken = run.Value.AssertString("pre");
-                        break;
-                    case "pre-entrypoint":
-                        preEntrypointToken = run.Value.AssertString("pre-entrypoint");
-                        break;
-                    case "pre-if":
-                        preIfToken = run.Value.AssertString("pre-if");
-                        break;
                     default:
                         Trace.Info($"Ignore run property {runsKey}.");
                         break;
@@ -352,10 +340,8 @@ namespace GitHub.Runner.Worker
                             Arguments = argsToken,
                             EntryPoint = entrypointToken?.Value,
                             Environment = envToken,
-                            Init = preEntrypointToken?.Value,
-                            InitCondition = preIfToken?.Value ?? "always()",
                             Cleanup = postEntrypointToken?.Value,
-                            CleanupCondition = postIfToken?.Value ?? "always()"
+                            CleanupCondition = postIfToken?.Value
                         };
                     }
                 }
@@ -370,10 +356,8 @@ namespace GitHub.Runner.Worker
                         return new NodeJSActionExecutionData()
                         {
                             Script = mainToken.Value,
-                            Init = preToken?.Value,
-                            InitCondition = preIfToken?.Value ?? "always()",
                             Cleanup = postToken?.Value,
-                            CleanupCondition = postIfToken?.Value ?? "always()"
+                            CleanupCondition = postIfToken?.Value
                         };
                     }
                 }

src/Runner.Worker/ActionRunner.cs

@@ -18,7 +18,6 @@ namespace GitHub.Runner.Worker
 {
     public enum ActionRunStage
     {
-        Pre,
         Main,
         Post,
     }
@@ -82,18 +81,20 @@ namespace GitHub.Runner.Worker
             ActionExecutionData handlerData = definition.Data?.Execution;
             ArgUtil.NotNull(handlerData, nameof(handlerData));
 
-            if (handlerData.HasInit &&
-                Action.Reference is Pipelines.RepositoryPathReference repoAction &&
-                string.Equals(repoAction.RepositoryType, Pipelines.PipelineConstants.SelfAlias, StringComparison.OrdinalIgnoreCase))
-            {
-                ExecutionContext.Warning($"`pre` execution is not supported for local action from '{repoAction.Path}'");
-            }
-
             // The action has post cleanup defined.
             // we need to create timeline record for them and add them to the step list that StepRunner is using
-            if (handlerData.HasCleanup && (Stage == ActionRunStage.Pre || Stage == ActionRunStage.Main))
+            if (handlerData.HasCleanup && Stage == ActionRunStage.Main)
             {
-                string postDisplayName = $"Post {this.DisplayName}";
+                string postDisplayName = null;
+                if (this.DisplayName.StartsWith(PipelineTemplateConstants.RunDisplayPrefix))
+                {
+                    postDisplayName = $"Post {this.DisplayName.Substring(PipelineTemplateConstants.RunDisplayPrefix.Length)}";
+                }
+                else
+                {
+                    postDisplayName = $"Post {this.DisplayName}";
+                }
+
                 var repositoryReference = Action.Reference as RepositoryPathReference;
                 var pathString = string.IsNullOrEmpty(repositoryReference.Path) ? string.Empty : $"/{repositoryReference.Path}";
                 var repoString = string.IsNullOrEmpty(repositoryReference.Ref) ? $"{repositoryReference.Name}{pathString}" :
@@ -107,7 +108,7 @@ namespace GitHub.Runner.Worker
                 actionRunner.Condition = handlerData.CleanupCondition;
                 actionRunner.DisplayName = postDisplayName;
 
-                ExecutionContext.RegisterPostJobStep(actionRunner);
+                ExecutionContext.RegisterPostJobStep($"{actionRunner.Action.Name}_post", actionRunner);
             }
 
             IStepHost stepHost = HostContext.CreateService<IDefaultStepHost>();
@@ -178,15 +179,17 @@ namespace GitHub.Runner.Worker
             ExecutionContext.Debug("Loading env");
             var environment = new Dictionary<String, String>(VarUtil.EnvironmentVariableKeyComparer);
 
-#if OS_WINDOWS
+            // Apply environment set using ##[set-env] first since these are job level env
-            var envContext = ExecutionContext.ExpressionValues["env"] as DictionaryContextData;
+            foreach (var env in ExecutionContext.EnvironmentVariables)
-#else
-            var envContext = ExecutionContext.ExpressionValues["env"] as CaseSensitiveDictionaryContextData;
-#endif
-            // Apply environment from env context, env context contains job level env and action's evn block
-            foreach (var env in envContext)
             {
-                environment[env.Key] = env.Value.ToString();
+                environment[env.Key] = env.Value ?? string.Empty;
+            }
+
+            // Apply action's env block later.
+            var actionEnvironment = templateEvaluator.EvaluateStepEnvironment(Action.Environment, ExecutionContext.ExpressionValues, VarUtil.EnvironmentVariableKeyComparer);
+            foreach (var env in actionEnvironment)
+            {
+                environment[env.Key] = env.Value ?? string.Empty;
             }
 
             // Apply action's intra-action state at last

src/Runner.Worker/Container/ContainerInfo.cs

@@ -63,8 +63,6 @@ namespace GitHub.Runner.Worker.Container
                     UserMountVolumes[volume] = volume;
                 }
             }
-
-            UpdateWebProxyEnv(hostContext.WebProxy);
         }
 
         public string ContainerId { get; set; }
@@ -224,26 +222,6 @@ namespace GitHub.Runner.Worker.Container
         {
             _pathMappings.Insert(0, new PathMapping(hostCommonPath, containerCommonPath));
         }
-
-        private void UpdateWebProxyEnv(RunnerWebProxy webProxy)
-        {
-            // Set common forms of proxy variables if configured in Runner and not set directly by container.env
-            if (!String.IsNullOrEmpty(webProxy.HttpProxyAddress))
-            {
-                ContainerEnvironmentVariables.TryAdd("HTTP_PROXY", webProxy.HttpProxyAddress);
-                ContainerEnvironmentVariables.TryAdd("http_proxy", webProxy.HttpProxyAddress);
-            }
-            if (!String.IsNullOrEmpty(webProxy.HttpsProxyAddress))
-            {
-                ContainerEnvironmentVariables.TryAdd("HTTPS_PROXY", webProxy.HttpsProxyAddress);
-                ContainerEnvironmentVariables.TryAdd("https_proxy", webProxy.HttpsProxyAddress);
-            }
-            if (!String.IsNullOrEmpty(webProxy.NoProxyString))
-            {
-                ContainerEnvironmentVariables.TryAdd("NO_PROXY", webProxy.NoProxyString);
-                ContainerEnvironmentVariables.TryAdd("no_proxy", webProxy.NoProxyString);
-            }
-        }
     }
 
     public class MountVolume

src/Runner.Worker/ContainerOperationProvider.cs

@@ -49,7 +49,7 @@ namespace GitHub.Runner.Worker
                                                 data: data);
             
             executionContext.Debug($"Register post job cleanup for stopping/deleting containers.");
-            executionContext.RegisterPostJobStep(postJobStep);
+            executionContext.RegisterPostJobStep(nameof(StopContainersAsync), postJobStep);
 
             // Check whether we are inside a container.
             // Our container feature requires to map working directory from host to the container.

src/Runner.Worker/ExecutionContext.cs

@@ -20,8 +20,6 @@ using System.Text;
 using System.Collections;
 using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating;
 using Pipelines = GitHub.DistributedTask.Pipelines;
-using GitHub.DistributedTask.Expressions2;
-using System.Diagnostics;
 
 namespace GitHub.Runner.Worker
 {
@@ -99,9 +97,7 @@ namespace GitHub.Runner.Worker
 
         // others
         void ForceTaskComplete();
-        void RegisterPostJobStep(IStep step);
+        void RegisterPostJobStep(string refName, IStep step);
-        Task<string> GetGitHubToken();
-        Task UpdateGitHubTokenInContext();
     }
 
     public sealed class ExecutionContext : RunnerService, IExecutionContext
@@ -113,7 +109,6 @@ namespace GitHub.Runner.Worker
         private readonly object _loggerLock = new object();
         private readonly HashSet<string> _outputvariables = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         private readonly object _matchersLock = new object();
-        public readonly List<Task> _getGitHubTokenTasks = new List<Task>();
 
         private event OnMatcherChanged _onMatcherChanged;
 
@@ -134,13 +129,6 @@ namespace GitHub.Runner.Worker
         // only job level ExecutionContext will track throttling delay.
         private long _totalThrottlingDelayInMilliseconds = 0;
 
-        private Guid _jobId;
-        private Guid _scopeIdentifier;
-        private string _hubName;
-        private Guid _planId;
-
-        private Stopwatch _githubTokenExpireTimer = new Stopwatch();
-
         public Guid Id => _record.Id;
         public string ScopeName { get; private set; }
         public string ContextName { get; private set; }
@@ -165,9 +153,6 @@ namespace GitHub.Runner.Worker
         // Only job level ExecutionContext has PostJobSteps
         public Stack<IStep> PostJobSteps { get; private set; }
 
-        // Only job level ExecutionContext has StepsWithPostRegisted
-        public HashSet<Guid> StepsWithPostRegisted { get; private set; }
-
         public bool EchoOnActionCommand { get; set; }
 
 
@@ -253,68 +238,9 @@ namespace GitHub.Runner.Worker
             });
         }
 
-        public Task<string> GetGitHubToken()
+        public void RegisterPostJobStep(string refName, IStep step)
         {
-            Trace.Info($"Try get new GITHUB_TOKEN");
+            step.ExecutionContext = Root.CreatePostChild(step.DisplayName, refName, IntraActionState);
-            return Root.RefreshGitHubToken();
-        }
-
-        public async Task UpdateGitHubTokenInContext()
-        {
-            try
-            {
-                await Root.EnsureGitHubToken();
-            }
-            catch (Exception ex)
-            {
-                this.Warning($"Fail to get a new GITHUB_TOKEN, error: {ex.Message}");
-                this.Debug(ex.ToString());
-            }
-        }
-
-        private async Task<string> RefreshGitHubToken()
-        {
-            Trace.Info("Request new GITHUB_TOKEN");
-            var jobServer = HostContext.GetService<IJobServer>();
-            var githubToken = await jobServer.RefreshGitHubTokenAsync(_scopeIdentifier, _hubName, _planId, _jobId, CancellationToken.None);
-
-            if (!string.IsNullOrEmpty(githubToken?.Token))
-            {
-                // register secret masker
-                Trace.Info("Register secret masker for new GITHUB_TOKEN");
-                HostContext.SecretMasker.AddValue(githubToken.Token);
-                return githubToken.Token;
-            }
-            else
-            {
-                throw new InvalidOperationException("Get empty GTIHUB_TOKEN.");
-            }
-        }
-
-        private async Task EnsureGitHubToken()
-        {
-            // needs to refresh GITHUB_TOKEN every 50 mins since the token is good for 60 min by default
-            if (_githubTokenExpireTimer.Elapsed.TotalMilliseconds > 10)
-            {
-                var githubToken = await this.RefreshGitHubToken();
-                var secretsContext = ExpressionValues["secrets"] as DictionaryContextData;
-                secretsContext["GITHUB_TOKEN"] = new StringContextData(githubToken);
-                var githubContext = ExpressionValues["github"] as GitHubContext;
-                githubContext["token"] = new StringContextData(githubToken);
-
-                _githubTokenExpireTimer.Restart();
-            }
-        }
-
-        public void RegisterPostJobStep(IStep step)
-        {
-            if (step is IActionRunner actionRunner && !Root.StepsWithPostRegisted.Add(actionRunner.Action.Id))
-            {
-                Trace.Info($"'post' of '{actionRunner.DisplayName}' already push to post step stack.");
-                return;
-            }
-
-            step.ExecutionContext = Root.CreatePostChild(step.DisplayName, ScopeName, ContextName, IntraActionState);
             Root.PostJobSteps.Push(step);
         }
 
@@ -416,6 +342,12 @@ namespace GitHub.Runner.Worker
 
             _logger.End();
 
+            // update context
+            if (!string.IsNullOrEmpty(ContextName))
+            {
+                StepsContext.SetConclusion(ScopeName, ContextName, Result.Value.ToContextData());
+            }
+
             return Result.Value;
         }
 
@@ -642,12 +574,6 @@ namespace GitHub.Runner.Worker
                 }
             }
 
-            // Expression functions
-            if (Variables.GetBoolean("System.HashFilesV2") == true)
-            {
-                ExpressionConstants.UpdateFunction<Handlers.HashFiles>("hashFiles", 1, byte.MaxValue);
-            }
-
             // Expression values
             if (message.ContextData?.Count > 0)
             {
@@ -681,7 +607,6 @@ namespace GitHub.Runner.Worker
 
             ExpressionValues["env"] = new CaseSensitiveDictionaryContextData();
 #endif
-            _githubTokenExpireTimer.Start();
 
             // Prepend Path
             PrependPath = new List<string>();
@@ -692,14 +617,6 @@ namespace GitHub.Runner.Worker
             // PostJobSteps for job ExecutionContext
             PostJobSteps = new Stack<IStep>();
 
-            // StepsWithPostRegisted for job ExecutionContext
-            StepsWithPostRegisted = new HashSet<Guid>();
-
-            _scopeIdentifier = message.Plan.ScopeIdentifier;
-            _hubName = message.Plan.PlanType;
-            _jobId = message.JobId;
-            _planId = message.Plan.PlanId;
-
             // Job timeline record.
             InitializeTimelineRecord(
                 timelineId: message.Timeline.Id,
@@ -900,7 +817,7 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        private IExecutionContext CreatePostChild(string displayName, string scopeName, string contextName, Dictionary<string, string> intraActionState)
+        private IExecutionContext CreatePostChild(string displayName, string refName, Dictionary<string, string> intraActionState)
         {
             if (!_expandedForPostJob)
             {
@@ -909,8 +826,7 @@ namespace GitHub.Runner.Worker
                 _childTimelineRecordOrder = _childTimelineRecordOrder * 2;
             }
 
-            var newGuid = Guid.NewGuid();
+            return CreateChild(Guid.NewGuid(), displayName, refName, null, null, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count);
-            return CreateChild(newGuid, displayName, newGuid.ToString("N"), scopeName, contextName, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count);
         }
     }
 

src/Runner.Worker/ExpressionFunctions/HashFiles.cs

@@ -1,126 +0,0 @@
-using System;
-using System.IO;
-using GitHub.DistributedTask.Expressions2.Sdk;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using GitHub.DistributedTask.Pipelines.ObjectTemplating;
-using GitHub.Runner.Sdk;
-using System.Reflection;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace GitHub.Runner.Worker.Handlers
-{
-    public class FunctionTrace : ITraceWriter
-    {
-        private GitHub.DistributedTask.Expressions2.ITraceWriter _trace;
-
-        public FunctionTrace(GitHub.DistributedTask.Expressions2.ITraceWriter trace)
-        {
-            _trace = trace;
-        }
-        public void Info(string message)
-        {
-            _trace.Info(message);
-        }
-
-        public void Verbose(string message)
-        {
-            _trace.Info(message);
-        }
-    }
-
-    public sealed class HashFiles : Function
-    {
-        protected sealed override Object EvaluateCore(
-            EvaluationContext context,
-            out ResultMemory resultMemory)
-        {
-            resultMemory = null;
-            var templateContext = context.State as DistributedTask.ObjectTemplating.TemplateContext;
-            ArgUtil.NotNull(templateContext, nameof(templateContext));
-            templateContext.ExpressionValues.TryGetValue(PipelineTemplateConstants.GitHub, out var githubContextData);
-            ArgUtil.NotNull(githubContextData, nameof(githubContextData));
-            var githubContext = githubContextData as DictionaryContextData;
-            ArgUtil.NotNull(githubContext, nameof(githubContext));
-            githubContext.TryGetValue(PipelineTemplateConstants.Workspace, out var workspace);
-            var workspaceData = workspace as StringContextData;
-            ArgUtil.NotNull(workspaceData, nameof(workspaceData));
-
-            string githubWorkspace = workspaceData.Value;
-            bool followSymlink = false;
-            List<string> patterns = new List<string>();
-            var firstParameter = true;
-            foreach (var parameter in Parameters)
-            {
-                var parameterString = parameter.Evaluate(context).ConvertToString();
-                if (firstParameter)
-                {
-                    firstParameter = false;
-                    if (parameterString.StartsWith("--"))
-                    {
-                        if (string.Equals(parameterString, "--follow-symbolic-links", StringComparison.OrdinalIgnoreCase))
-                        {
-                            followSymlink = true;
-                            continue;
-                        }
-                        else
-                        {
-                            throw new ArgumentOutOfRangeException($"Invalid glob option {parameterString}, avaliable option: '--follow-symbolic-links'.");
-                        }
-                    }
-                }
-
-                patterns.Add(parameterString);
-            }
-
-            context.Trace.Info($"Search root directory: '{githubWorkspace}'");
-            context.Trace.Info($"Search pattern: '{string.Join(", ", patterns)}'");
-
-            string binDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-            string runnerRoot = new DirectoryInfo(binDir).Parent.FullName;
-
-            string node = Path.Combine(runnerRoot, "externals", "node12", "bin", $"node{IOUtil.ExeExtension}");
-            string hashFilesScript = Path.Combine(binDir, "hashFiles");
-            var hashResult = string.Empty;
-            var p = new ProcessInvoker(new FunctionTrace(context.Trace));
-            p.ErrorDataReceived += ((_, data) =>
-            {
-                if (!string.IsNullOrEmpty(data.Data) && data.Data.StartsWith("__OUTPUT__") && data.Data.EndsWith("__OUTPUT__"))
-                {
-                    hashResult = data.Data.Substring(10, data.Data.Length - 20);
-                    context.Trace.Info($"Hash result: '{hashResult}'");
-                }
-                else
-                {
-                    context.Trace.Info(data.Data);
-                }
-            });
-
-            p.OutputDataReceived += ((_, data) =>
-            {
-                context.Trace.Info(data.Data);
-            });
-
-            var env = new Dictionary<string, string>();
-            if (followSymlink)
-            {
-                env["followSymbolicLinks"] = "true";
-            }
-            env["patterns"] = string.Join(Environment.NewLine, patterns);
-
-            int exitCode = p.ExecuteAsync(workingDirectory: githubWorkspace,
-                                          fileName: node,
-                                          arguments: $"\"{hashFilesScript.Replace("\"", "\\\"")}\"",
-                                          environment: env,
-                                          requireExitCodeZero: false,
-                                          cancellationToken: new CancellationTokenSource(TimeSpan.FromSeconds(120)).Token).GetAwaiter().GetResult();
-
-            if (exitCode != 0)
-            {
-                throw new InvalidOperationException($"hashFiles('{ExpressionUtility.StringEscape(string.Join(", ", patterns))}') failed. Fail to hash files under directory '{githubWorkspace}'");
-            }
-
-            return hashResult;
-        }
-    }
-}

src/Runner.Worker/Handlers/ContainerActionHandler.cs

@@ -82,10 +82,6 @@ namespace GitHub.Runner.Worker.Handlers
                     container.ContainerEntryPoint = Inputs.GetValueOrDefault("entryPoint");
                 }
             }
-            else if (stage == ActionRunStage.Pre)
-            {
-                container.ContainerEntryPoint = Data.Init;
-            }
             else if (stage == ActionRunStage.Post)
             {
                 container.ContainerEntryPoint = Data.Cleanup;
@@ -197,9 +193,9 @@ namespace GitHub.Runner.Worker.Handlers
             using (var stderrManager = new OutputManager(ExecutionContext, ActionCommandManager, container))
             {
                 var runExitCode = await dockerManger.DockerRun(ExecutionContext, container, stdoutManager.OnDataReceived, stderrManager.OnDataReceived);
-                ExecutionContext.Debug($"Docker Action run completed with exit code {runExitCode}");
                 if (runExitCode != 0)
                 {
+                    ExecutionContext.Error($"Docker run failed with exit code {runExitCode}");
                     ExecutionContext.Result = TaskResult.Failed;
                 }
             }

src/Runner.Worker/Handlers/NodeScriptActionHandler.cs

@@ -60,10 +60,6 @@ namespace GitHub.Runner.Worker.Handlers
             {
                 target = Data.Script;
             }
-            else if (stage == ActionRunStage.Pre)
-            {
-                target = Data.Init;
-            }
             else if (stage == ActionRunStage.Post)
             {
                 target = Data.Cleanup;
@@ -126,9 +122,9 @@ namespace GitHub.Runner.Worker.Handlers
                 else
                 {
                     var exitCode = await step;
-                    ExecutionContext.Debug($"Node Action run completed with exit code {exitCode}");
                     if (exitCode != 0)
                     {
+                        ExecutionContext.Error($"Node run failed with exit code {exitCode}");
                         ExecutionContext.Result = TaskResult.Failed;
                     }
                 }

src/Runner.Worker/Handlers/OutputManager.cs

@@ -84,7 +84,7 @@ namespace GitHub.Runner.Worker.Handlers
             {
                 // This does not need to be inside of a critical section.
                 // The logging queues and command handlers are thread-safe.
-                if (_commandManager.TryProcessCommand(_executionContext, line, _container))
+                if (_commandManager.TryProcessCommand(_executionContext, line))
                 {
                     return;
                 }

src/Runner.Worker/JobExtension.cs

@@ -116,8 +116,8 @@ namespace GitHub.Runner.Worker
                     // Download actions not already in the cache
                     Trace.Info("Downloading actions");
                     var actionManager = HostContext.GetService<IActionManager>();
-                    var prepareResult = await actionManager.PrepareActionsAsync(context, message.Steps);
+                    var prepareSteps = await actionManager.PrepareActionsAsync(context, message.Steps);
-                    preJobSteps.AddRange(prepareResult.ContainerSetupSteps);
+                    preJobSteps.AddRange(prepareSteps);
 
                     // Add start-container steps, record and stop-container steps
                     if (jobContext.Container != null || jobContext.ServiceContainers.Count > 0)
@@ -158,23 +158,9 @@ namespace GitHub.Runner.Worker
 
                             actionRunner.TryEvaluateDisplayName(contextData, context);
                             jobSteps.Add(actionRunner);
-
-                            if (prepareResult.PreStepTracker.TryGetValue(step.Id, out var preStep))
-                            {
-                                Trace.Info($"Adding pre-{action.DisplayName}.");
-                                preStep.TryEvaluateDisplayName(contextData, context);
-                                preStep.DisplayName = $"Pre {preStep.DisplayName}";
-                                preJobSteps.Add(preStep);
-                            }
                         }
                     }
 
-                    var intraActionStates = new Dictionary<Guid, Dictionary<string, string>>();
-                    foreach (var preStep in prepareResult.PreStepTracker)
-                    {
-                        intraActionStates[preStep.Key] = new Dictionary<string, string>();
-                    }
-
                     // Create execution context for pre-job steps
                     foreach (var step in preJobSteps)
                     {
@@ -185,12 +171,6 @@ namespace GitHub.Runner.Worker
                             Guid stepId = Guid.NewGuid();
                             extensionStep.ExecutionContext = jobContext.CreateChild(stepId, extensionStep.DisplayName, null, null, stepId.ToString("N"));
                         }
-                        else if (step is IActionRunner actionStep)
-                        {
-                            ArgUtil.NotNull(actionStep, step.DisplayName);
-                            Guid stepId = Guid.NewGuid();
-                            actionStep.ExecutionContext = jobContext.CreateChild(stepId, actionStep.DisplayName, null, actionStep.Action.ScopeName, actionStep.Action.ContextName, intraActionStates[actionStep.Action.Id]);
-                        }
                     }
 
                     // Create execution context for job steps
@@ -199,14 +179,7 @@ namespace GitHub.Runner.Worker
                         if (step is IActionRunner actionStep)
                         {
                             ArgUtil.NotNull(actionStep, step.DisplayName);
-                            if (intraActionStates.ContainsKey(actionStep.Action.Id))
+                            actionStep.ExecutionContext = jobContext.CreateChild(actionStep.Action.Id, actionStep.DisplayName, actionStep.Action.Name, actionStep.Action.ScopeName, actionStep.Action.ContextName);
-                            {
-                                actionStep.ExecutionContext = jobContext.CreateChild(actionStep.Action.Id, actionStep.DisplayName, actionStep.Action.Name, actionStep.Action.ScopeName, actionStep.Action.ContextName, intraActionStates[actionStep.Action.Id]);
-                            }
-                            else
-                            {
-                                actionStep.ExecutionContext = jobContext.CreateChild(actionStep.Action.Id, actionStep.DisplayName, actionStep.Action.Name, actionStep.Action.ScopeName, actionStep.Action.ContextName);
-                            }
                         }
                     }
 

src/Runner.Worker/StepsContext.cs

@@ -56,13 +56,13 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        public void SetResult(
+        public void SetConclusion(
             string scopeName,
             string stepName,
-            string result)
+            StringContextData conclusion)
         {
             var step = GetStep(scopeName, stepName);
-            step["result"] = new StringContextData(result);
+            step["conclusion"] = conclusion;
         }
 
         private DictionaryContextData GetStep(string scopeName, string stepName)

src/Runner.Worker/StepsRunner.cs

@@ -75,40 +75,16 @@ namespace GitHub.Runner.Worker
 
                 // Start
                 step.ExecutionContext.Start();
-                await step.ExecutionContext.UpdateGitHubTokenInContext();
+
+                // Set GITHUB_ACTION
+                if (step is IActionRunner actionStep)
+                {
+                    step.ExecutionContext.SetGitHubContext("action", actionStep.Action.Name);
+                }
 
                 // Initialize scope
                 if (InitializeScope(step, scopeInputs))
                 {
-                    // Populate env context for each step
-                    Trace.Info("Initialize Env context for step");
-#if OS_WINDOWS
-                    var envContext = new DictionaryContextData();
-#else
-                    var envContext = new CaseSensitiveDictionaryContextData();
-#endif
-                    step.ExecutionContext.ExpressionValues["env"] = envContext;
-                    foreach (var pair in step.ExecutionContext.EnvironmentVariables)
-                    {
-                        envContext[pair.Key] = new StringContextData(pair.Value ?? string.Empty);
-                    }
-
-                    if (step is IActionRunner actionStep)
-                    {
-                        // Set GITHUB_ACTION
-                        step.ExecutionContext.SetGitHubContext("action", actionStep.Action.Name);
-
-                        // Evaluate and merge action's env block to env context
-                        var templateTrace = step.ExecutionContext.ToTemplateTraceWriter();
-                        var schema = new PipelineTemplateSchemaFactory().CreateSchema();
-                        var templateEvaluator = new PipelineTemplateEvaluator(templateTrace, schema);
-                        var actionEnvironment = templateEvaluator.EvaluateStepEnvironment(actionStep.Action.Environment, step.ExecutionContext.ExpressionValues, VarUtil.EnvironmentVariableKeyComparer);
-                        foreach (var env in actionEnvironment)
-                        {
-                            envContext[env.Key] = new StringContextData(env.Value ?? string.Empty);
-                        }
-                    }
-
                     var expressionManager = HostContext.GetService<IExpressionManager>();
                     try
                     {

src/Runner.Worker/action_yaml.json

@@ -43,8 +43,6 @@
                     "entrypoint": "non-empty-string",
                     "args": "container-runs-args",
                     "env": "container-runs-env",
-                    "pre-entrypoint": "non-empty-string",
-                    "pre-if": "non-empty-string",
                     "post-entrypoint": "non-empty-string",
                     "post-if": "non-empty-string"
                 }
@@ -69,8 +67,6 @@
                 "properties": {
                     "using": "non-empty-string",
                     "main": "non-empty-string",
-                    "pre": "non-empty-string",
-                    "pre-if": "non-empty-string",
                     "post": "non-empty-string",
                     "post-if": "non-empty-string"
                 }

src/Sdk/DTExpressions2/Expressions2/ExpressionConstants.cs

@@ -5,7 +5,7 @@ using GitHub.DistributedTask.Expressions2.Sdk.Functions;
 
 namespace GitHub.DistributedTask.Expressions2
 {
-    public static class ExpressionConstants
+    internal static class ExpressionConstants
     {
         static ExpressionConstants()
         {
@@ -24,12 +24,6 @@ namespace GitHub.DistributedTask.Expressions2
             WellKnownFunctions.Add(name, new FunctionInfo<T>(name, minParameters, maxParameters));
         }
 
-        public static void UpdateFunction<T>(String name, Int32 minParameters, Int32 maxParameters)
-                    where T : Function, new()
-        {
-            WellKnownFunctions[name] = new FunctionInfo<T>(name, minParameters, maxParameters);
-        }
-
         internal static readonly String False = "false";
         internal static readonly String Infinity = "Infinity";
         internal static readonly Int32 MaxDepth = 50;

src/Sdk/DTGenerated/Generated/TaskHttpClientBase.cs

@@ -317,40 +317,5 @@ namespace GitHub.DistributedTask.WebApi
                 userState: userState,
                 cancellationToken: cancellationToken);
         }
-
-
-        /// <summary>
-        /// [Preview API]
-        /// </summary>
-        /// <param name="scopeIdentifier">The project GUID to scope the request</param>
-        /// <param name="hubName">The name of the server hub: "build" for the Build server or "rm" for the Release Management server</param>
-        /// <param name="planId"></param>
-        /// <param name="jobId"></param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public virtual Task<GitHubToken> RefreshTokenAsync(
-            Guid scopeIdentifier,
-            string hubName,
-            Guid planId,
-            Guid jobId,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("GET");
-            Guid locationId = new Guid("8aa8aff7-751b-496e-be8d-b7818770efb3");
-            object routeValues = new { scopeIdentifier = scopeIdentifier, hubName = hubName, planId = planId };
-
-            List<KeyValuePair<string, string>> queryParams = new List<KeyValuePair<string, string>>();
-            queryParams.Add("jobId", jobId.ToString());
-
-            return SendAsync<GitHubToken>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                queryParameters: queryParams,
-                userState: userState,
-                cancellationToken: cancellationToken);
-        }
     }
 }

src/Sdk/DTPipelines/Pipelines/ContextData/PipelineContextDataExtensions.cs

@@ -35,19 +35,6 @@ namespace GitHub.DistributedTask.Pipelines.ContextData
             throw new ArgumentException($"Unexpected type '{value?.GetType().Name}' encountered while reading '{objectDescription}'. The type '{nameof(DictionaryContextData)}' was expected.");
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static CaseSensitiveDictionaryContextData AssertCaseSensitiveDictionary(
-                    this PipelineContextData value,
-                    String objectDescription)
-        {
-            if (value is CaseSensitiveDictionaryContextData dictionary)
-            {
-                return dictionary;
-            }
-
-            throw new ArgumentException($"Unexpected type '{value?.GetType().Name}' encountered while reading '{objectDescription}'. The type '{nameof(CaseSensitiveDictionaryContextData)}' was expected.");
-        }
-
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static StringContextData AssertString(
             this PipelineContextData value,

src/Sdk/DTWebApi/WebApi/Issue.cs

@@ -4,17 +4,6 @@ using System.Runtime.Serialization;
 
 namespace GitHub.DistributedTask.WebApi
 {
-
-    [DataContract]
-    public class GitHubToken
-    {
-        [DataMember(EmitDefaultValue = false)]
-        public string Token { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public DateTime Expires_at { get; set; }
-    }
-
     [DataContract]
     public class Issue
     {

src/Test/L0/Listener/CommandSettingsL0.cs

@@ -498,7 +498,7 @@ namespace GitHub.Runner.Common.Tests
                 _promptManager
                     .Setup(x => x.ReadValue(
                         Constants.Runner.CommandLine.Args.Token, // argName
-                        "Enter runner remove token:", // description
+                        "Enter runner deletion token:", // description
                         true, // secret
                         string.Empty, // defaultValue
                         Validators.NonEmptyValidator, // validator

src/Test/L0/Listener/Configuration/ConfigurationManagerL0.cs

@@ -175,8 +175,8 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
                 Assert.True(s.PoolId.Equals(_expectedPoolId));
                 Assert.True(s.WorkFolder.Equals(_expectedWorkFolder));
 
-                // validate GetAgentPoolsAsync gets called twice with automation pool type
+                // validate GetAgentPoolsAsync gets called once with automation pool type
-                _runnerServer.Verify(x => x.GetAgentPoolsAsync(It.IsAny<string>(), It.Is<TaskAgentPoolType>(p => p == TaskAgentPoolType.Automation)), Times.Exactly(2));
+                _runnerServer.Verify(x => x.GetAgentPoolsAsync(It.IsAny<string>(), It.Is<TaskAgentPoolType>(p => p == TaskAgentPoolType.Automation)), Times.Once);
 
                 _runnerServer.Verify(x => x.AddAgentAsync(It.IsAny<int>(), It.Is<TaskAgent>(a => a.Labels.Contains("self-hosted") && a.Labels.Contains(VarUtil.OS) && a.Labels.Contains(VarUtil.OSArchitecture))), Times.Once);
             }

src/Test/L0/Util/TaskResultUtilL0.cs

@@ -202,5 +202,20 @@ namespace GitHub.Runner.Common.Tests.Util
                 Assert.Equal(TaskResult.Skipped, merged);
             }
         }
+
+        [Fact]
+        [Trait("Level", "L0")]
+        [Trait("Category", "Common")]
+        public void ToContextData()
+        {
+            // Arrange
+            using (TestHostContext hc = new TestHostContext(this))
+            {
+                Assert.Equal("success", TaskResult.Succeeded.ToContextData().ToString());
+                Assert.Equal("failure", TaskResult.Failed.ToContextData().ToString());
+                Assert.Equal("cancelled", TaskResult.Canceled.ToContextData().ToString());
+                Assert.Equal("skipped", TaskResult.Skipped.ToContextData().ToString());
+            }
+        }
     }
 }

src/Test/L0/Worker/ActionCommandManagerL0.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Runtime.CompilerServices;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Container;
 using Moq;
 using Xunit;
 using Pipelines = GitHub.DistributedTask.Pipelines;
@@ -13,35 +11,47 @@ namespace GitHub.Runner.Common.Tests.Worker
 {
     public sealed class ActionCommandManagerL0
     {
-        private ActionCommandManager _commandManager;
-        private Mock<IExecutionContext> _ec;
-        private Mock<IExtensionManager> _extensionManager;
-        private Mock<IPipelineDirectoryManager> _pipelineDirectoryManager;
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
         public void EnablePluginInternalCommand()
         {
-            using (TestHostContext hc = CreateTestContext())
+            using (TestHostContext _hc = new TestHostContext(this))
             {
+                var extensionManger = new Mock<IExtensionManager>();
+                var directoryManager = new Mock<IPipelineDirectoryManager>();
+
+                var pluginCommand = new InternalPluginSetRepoPathCommandExtension();
+                pluginCommand.Initialize(_hc);
+
+                var envCommand = new SetEnvCommandExtension();
+                envCommand.Initialize(_hc);
+
+                extensionManger.Setup(x => x.GetExtensions<IActionCommandExtension>())
+                               .Returns(new List<IActionCommandExtension>() { pluginCommand, envCommand });
+                _hc.SetSingleton<IExtensionManager>(extensionManger.Object);
+                _hc.SetSingleton<IPipelineDirectoryManager>(directoryManager.Object);
+
+                Mock<IExecutionContext> _ec = new Mock<IExecutionContext>();
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
-                                hc.GetTrace().Info($"{tag} {line}");
+                                _hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
                 _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>()))
                    .Callback((Issue issue, string message) =>
                    {
-                       hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
+                       _hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
                    });
+                ActionCommandManager commandManager = new ActionCommandManager();
+                commandManager.Initialize(_hc);
 
-                _commandManager.EnablePluginInternalCommand();
+                commandManager.EnablePluginInternalCommand();
 
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath", null));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath"));
 
-                _pipelineDirectoryManager.Verify(x => x.UpdateRepositoryDirectory(_ec.Object, "actions/runner", "somepath", true), Times.Once);
+                directoryManager.Verify(x => x.UpdateRepositoryDirectory(_ec.Object, "actions/runner", "somepath", true), Times.Once);
             }
         }
 
@@ -50,29 +60,47 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void DisablePluginInternalCommand()
         {
-            using (TestHostContext hc = CreateTestContext())
+            using (TestHostContext _hc = new TestHostContext(this))
             {
+                var extensionManger = new Mock<IExtensionManager>();
+                var directoryManager = new Mock<IPipelineDirectoryManager>();
+
+                var pluginCommand = new InternalPluginSetRepoPathCommandExtension();
+                pluginCommand.Initialize(_hc);
+
+                var envCommand = new SetEnvCommandExtension();
+                envCommand.Initialize(_hc);
+
+                extensionManger.Setup(x => x.GetExtensions<IActionCommandExtension>())
+                               .Returns(new List<IActionCommandExtension>() { pluginCommand, envCommand });
+
+                _hc.SetSingleton<IExtensionManager>(extensionManger.Object);
+                _hc.SetSingleton<IPipelineDirectoryManager>(directoryManager.Object);
+
+                Mock<IExecutionContext> _ec = new Mock<IExecutionContext>();
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
-                                hc.GetTrace().Info($"{tag} {line}");
+                                _hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
                 _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>()))
                    .Callback((Issue issue, string message) =>
                    {
-                       hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
+                       _hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
                    });
+                ActionCommandManager commandManager = new ActionCommandManager();
+                commandManager.Initialize(_hc);
 
-                _commandManager.EnablePluginInternalCommand();
+                commandManager.EnablePluginInternalCommand();
 
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath", null));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath"));
 
-                _commandManager.DisablePluginInternalCommand();
+                commandManager.DisablePluginInternalCommand();
 
-                Assert.False(_commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath", null));
+                Assert.False(commandManager.TryProcessCommand(_ec.Object, "##[internal-set-repo-path repoFullName=actions/runner;workspaceRepo=true]somepath"));
 
-                _pipelineDirectoryManager.Verify(x => x.UpdateRepositoryDirectory(_ec.Object, "actions/runner", "somepath", true), Times.Once);
+                directoryManager.Verify(x => x.UpdateRepositoryDirectory(_ec.Object, "actions/runner", "somepath", true), Times.Once);
             }
         }
 
@@ -81,27 +109,42 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void StopProcessCommand()
         {
-            using (TestHostContext hc = CreateTestContext())
+            using (TestHostContext _hc = new TestHostContext(this))
             {
+                var extensionManger = new Mock<IExtensionManager>();
+                var pluginCommand = new InternalPluginSetRepoPathCommandExtension();
+                pluginCommand.Initialize(_hc);
+
+                var envCommand = new SetEnvCommandExtension();
+                envCommand.Initialize(_hc);
+
+                extensionManger.Setup(x => x.GetExtensions<IActionCommandExtension>())
+                               .Returns(new List<IActionCommandExtension>() { pluginCommand, envCommand });
+                _hc.SetSingleton<IExtensionManager>(extensionManger.Object);
+
+                Mock<IExecutionContext> _ec = new Mock<IExecutionContext>();
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
-                                hc.GetTrace().Info($"{tag} {line}");
+                                _hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
 
                 _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>()))
                    .Callback((Issue issue, string message) =>
                    {
-                       hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
+                       _hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
                    });
 
                 _ec.Setup(x => x.EnvironmentVariables).Returns(new Dictionary<string, string>());
 
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[stop-commands]stopToken", null));
+                ActionCommandManager commandManager = new ActionCommandManager();
-                Assert.False(_commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar", null));
+                commandManager.Initialize(_hc);
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[stopToken]", null));
+
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar", null));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[stop-commands]stopToken"));
+                Assert.False(commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar"));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[stopToken]"));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "##[set-env name=foo]bar"));
             }
         }
 
@@ -110,29 +153,41 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void EchoProcessCommand()
         {
-            using (TestHostContext hc = CreateTestContext())
+            using (TestHostContext _hc = new TestHostContext(this))
             {
+                var extensionManager = new Mock<IExtensionManager>();
+                var echoCommand = new EchoCommandExtension();
+                echoCommand.Initialize(_hc);
+
+                extensionManager.Setup(x => x.GetExtensions<IActionCommandExtension>())
+                               .Returns(new List<IActionCommandExtension>() { echoCommand });
+                _hc.SetSingleton<IExtensionManager>(extensionManager.Object);
+
+                Mock<IExecutionContext> _ec = new Mock<IExecutionContext>();
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
-                                hc.GetTrace().Info($"{tag} {line}");
+                                _hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
 
                 _ec.SetupAllProperties();
 
+                ActionCommandManager commandManager = new ActionCommandManager();
+                commandManager.Initialize(_hc);
+
                 Assert.False(_ec.Object.EchoOnActionCommand);
 
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::on", null));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::on"));
                 Assert.True(_ec.Object.EchoOnActionCommand);
 
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::off", null));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::off"));
                 Assert.False(_ec.Object.EchoOnActionCommand);
 
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::ON", null));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::ON"));
                 Assert.True(_ec.Object.EchoOnActionCommand);
 
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::Off   ", null));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::Off   "));
                 Assert.False(_ec.Object.EchoOnActionCommand);
             }
         }
@@ -142,7 +197,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         [Trait("Category", "Worker")]
         public void EchoProcessCommandDebugOn()
         {
-            using (TestHostContext hc = CreateTestContext())
+            using (TestHostContext _hc = new TestHostContext(this))
             {
                 // Set up a few things
                 // 1. Job request message (with ACTIONS_STEP_DEBUG = true)
@@ -164,135 +219,84 @@ namespace GitHub.Runner.Common.Tests.Worker
                 var jobServerQueue = new Mock<IJobServerQueue>();
                 jobServerQueue.Setup(x => x.QueueTimelineRecordUpdate(It.IsAny<Guid>(), It.IsAny<TimelineRecord>()));
 
-                hc.SetSingleton(jobServerQueue.Object);
+                _hc.SetSingleton(jobServerQueue.Object);
+
+                var extensionManager = new Mock<IExtensionManager>();
+                var echoCommand = new EchoCommandExtension();
+                echoCommand.Initialize(_hc);
+
+                extensionManager.Setup(x => x.GetExtensions<IActionCommandExtension>())
+                               .Returns(new List<IActionCommandExtension>() { echoCommand });
+                _hc.SetSingleton<IExtensionManager>(extensionManager.Object);
 
                 var configurationStore = new Mock<IConfigurationStore>();
                 configurationStore.Setup(x => x.GetSettings()).Returns(new RunnerSettings());
-                hc.SetSingleton(configurationStore.Object);
+                _hc.SetSingleton(configurationStore.Object);
 
                 var pagingLogger = new Mock<IPagingLogger>();
-                hc.EnqueueInstance(pagingLogger.Object);
+                _hc.EnqueueInstance(pagingLogger.Object);
+
+                ActionCommandManager commandManager = new ActionCommandManager();
+                commandManager.Initialize(_hc);
+
+                var _ec = new Runner.Worker.ExecutionContext();
+                _ec.Initialize(_hc);
 
                 // Initialize the job (to exercise logic that sets EchoOnActionCommand)
-                var ec = new Runner.Worker.ExecutionContext();
+                _ec.InitializeJob(jobRequest, System.Threading.CancellationToken.None);
-                ec.Initialize(hc);
-                ec.InitializeJob(jobRequest, System.Threading.CancellationToken.None);
 
-                ec.Complete();
+                _ec.Complete();
 
-                Assert.True(ec.EchoOnActionCommand);
+                Assert.True(_ec.EchoOnActionCommand);
 
-                Assert.True(_commandManager.TryProcessCommand(ec, "::echo::off", null));
+                Assert.True(commandManager.TryProcessCommand(_ec, "::echo::off"));
-                Assert.False(ec.EchoOnActionCommand);
+                Assert.False(_ec.EchoOnActionCommand);
 
-                Assert.True(_commandManager.TryProcessCommand(ec, "::echo::on", null));
+                Assert.True(commandManager.TryProcessCommand(_ec, "::echo::on"));
-                Assert.True(ec.EchoOnActionCommand);
+                Assert.True(_ec.EchoOnActionCommand);
             }
         }
 
+
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
         public void EchoProcessCommandInvalid()
         {
-            using (TestHostContext hc = CreateTestContext())
+            using (TestHostContext _hc = new TestHostContext(this))
             {
+                var extensionManager = new Mock<IExtensionManager>();
+                var echoCommand = new EchoCommandExtension();
+                echoCommand.Initialize(_hc);
+
+                extensionManager.Setup(x => x.GetExtensions<IActionCommandExtension>())
+                               .Returns(new List<IActionCommandExtension>() { echoCommand });
+                _hc.SetSingleton<IExtensionManager>(extensionManager.Object);
+
+                Mock<IExecutionContext> _ec = new Mock<IExecutionContext>();
                 _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                    .Returns((string tag, string line) =>
                             {
-                                hc.GetTrace().Info($"{tag} {line}");
+                                _hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
 
                 _ec.SetupAllProperties();
 
+                ActionCommandManager commandManager = new ActionCommandManager();
+                commandManager.Initialize(_hc);
+
                 // Echo commands below are considered "processed", but are invalid
                 // 1. Invalid echo value
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::invalid", null));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::invalid"));
                 Assert.Equal(TaskResult.Failed, _ec.Object.CommandResult);
                 Assert.False(_ec.Object.EchoOnActionCommand);
 
                 // 2. No value
-                Assert.True(_commandManager.TryProcessCommand(_ec.Object, "::echo::", null));
+                Assert.True(commandManager.TryProcessCommand(_ec.Object, "::echo::"));
                 Assert.Equal(TaskResult.Failed, _ec.Object.CommandResult);
                 Assert.False(_ec.Object.EchoOnActionCommand);
             }
         }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void AddMatcherTranslatesFilePath()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Create a problem matcher config file
-                var hostDirectory = hc.GetDirectory(WellKnownDirectory.Temp);
-                var hostFile = Path.Combine(hostDirectory, "my-matcher.json");
-                Directory.CreateDirectory(hostDirectory);
-                var content = @"
-{
-    ""problemMatcher"": [
-        {
-            ""owner"": ""my-matcher"",
-            ""pattern"": [
-                {
-                    ""regexp"": ""^ERROR: (.+)$"",
-                    ""message"": 1
-                }
-            ]
-        }
-    ]
-}";
-                File.WriteAllText(hostFile, content);
-
-                // Setup translation info
-                var container = new ContainerInfo();
-                var containerDirectory = "/some-container-directory";
-                var containerFile = Path.Combine(containerDirectory, "my-matcher.json");
-                container.AddPathTranslateMapping(hostDirectory, containerDirectory);
-
-                // Act
-                _commandManager.TryProcessCommand(_ec.Object, $"::add-matcher::{containerFile}", container);
-
-                // Assert
-                _ec.Verify(x => x.AddMatchers(It.IsAny<IssueMatchersConfig>()), Times.Once);
-            }
-        }
-
-        private TestHostContext CreateTestContext([CallerMemberName] string testName = "")
-        {
-            var hostContext = new TestHostContext(this, testName);
-
-            // Mock extension manager
-            _extensionManager = new Mock<IExtensionManager>();
-            var commands = new IActionCommandExtension[]
-            {
-                new AddMatcherCommandExtension(),
-                new EchoCommandExtension(),
-                new InternalPluginSetRepoPathCommandExtension(),
-                new SetEnvCommandExtension(),
-            };
-            foreach (var command in commands)
-            {
-                command.Initialize(hostContext);
-            }
-            _extensionManager.Setup(x => x.GetExtensions<IActionCommandExtension>())
-                .Returns(new List<IActionCommandExtension>(commands));
-            hostContext.SetSingleton<IExtensionManager>(_extensionManager.Object);
-
-            // Mock pipeline directory manager
-            _pipelineDirectoryManager = new Mock<IPipelineDirectoryManager>();
-            hostContext.SetSingleton<IPipelineDirectoryManager>(_pipelineDirectoryManager.Object);
-
-            // Execution context
-            _ec = new Mock<IExecutionContext>();
-
-            // Command manager
-            _commandManager = new ActionCommandManager();
-            _commandManager.Initialize(hostContext);
-
-            return hostContext;
-        }
     }
 }

src/Test/L0/Worker/ActionManagerL0.cs

@@ -54,7 +54,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 };
 
                 //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
+                var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 //Assert
                 Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]);
@@ -164,7 +164,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 };
 
                 //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
+                var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 Assert.True(steps.Count == 0);
             }
@@ -203,7 +203,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 var actionDir = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang", "runner_L0", "repositoryactionwithdockerfile");
 
                 //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
+                var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
                 Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]);
                 Assert.Equal(actionDir, (steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory);
                 Assert.Equal(Path.Combine(actionDir, "Dockerfile"), (steps[0].Data as ContainerSetupInfo).Container.Dockerfile);
@@ -243,7 +243,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 var actionDir = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang", "runner_L0", "repositoryactionwithdockerfileinrelativepath");
 
                 //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
+                var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]);
                 Assert.Equal(actionDir, (steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory);
@@ -282,7 +282,7 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 var actionDir = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang", "runner_L0", "repositoryactionwithdockerfileinrelativepath");
                 //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
+                var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]);
                 Assert.Equal(actionDir, (steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory);
@@ -322,7 +322,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 var actionDir = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang", "runner_L0", "RepositoryActionWithActionfile_DockerfileRelativePath");
 
                 //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
+                var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]);
                 Assert.Equal(actionDir, (steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory);
@@ -362,7 +362,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 var actionDir = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang", "runner_L0", "RepositoryActionWithActionfile_DockerHubImage");
 
                 //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
+                var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]);
                 Assert.Equal("ubuntu:18.04", (steps[0].Data as ContainerSetupInfo).Container.Image);
@@ -373,45 +373,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithActionYamlFile_DockerHubImage()
-        {
-            try
-            {
-                //Arrange
-                Setup();
-                var actionId = Guid.NewGuid();
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action",
-                        Id = actionId,
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "RepositoryActionWithActionYamlFile_DockerHubImage",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                var actionDir = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang", "runner_L0", "RepositoryActionWithActionYamlFile_DockerHubImage");
-
-                //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
-
-                Assert.Equal((steps[0].Data as ContainerSetupInfo).StepIds[0], actionId);
-                Assert.Equal("ubuntu:18.04", (steps[0].Data as ContainerSetupInfo).Container.Image);
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
@@ -440,7 +401,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 var actionDir = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang", "runner_L0", "repositoryactionwithactionfileanddockerfile");
 
                 //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
+                var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]);
                 Assert.Equal(actionDir, (steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory);
@@ -557,7 +518,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 };
 
                 //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
+                var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 //Assert
                 Assert.Equal(actionId1, (steps[0].Data as ContainerSetupInfo).StepIds[0]);
@@ -618,7 +579,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 };
 
                 //Act
-                var steps = (await _actionManager.PrepareActionsAsync(_ec.Object, actions)).ContainerSetupSteps;
+                var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
 
                 // node.js based action doesn't need any extra steps to build/pull containers.
                 Assert.True(steps.Count == 0);
@@ -629,47 +590,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithInvalidWrapperActionfile_Node()
-        {
-            try
-            {
-                //Arrange
-                Setup();
-                var actionId = Guid.NewGuid();
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action",
-                        Id = actionId,
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "RepositoryActionWithInvalidWrapperActionfile_Node",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                //Act
-                try
-                {
-                    await _actionManager.PrepareActionsAsync(_ec.Object, actions);
-                }
-                catch (ArgumentNullException e)
-                {
-                    Assert.Contains("Entry javascript fils is not provided.", e.Message);
-                }
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
@@ -752,7 +672,7 @@ namespace GitHub.Runner.Common.Tests.Worker
 name: 'Hello World'
 description: 'Greet the world and record the time'
 author: 'GitHub'
-inputs: 
+inputs:
   greeting: # id of input
     description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
     required: true
@@ -852,7 +772,7 @@ runs:
 name: 'Hello World'
 description: 'Greet the world and record the time'
 author: 'GitHub'
-inputs: 
+inputs:
   greeting: # id of input
     description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
     required: true
@@ -951,7 +871,7 @@ runs:
 name: 'Hello World'
 description: 'Greet the world and record the time'
 author: 'GitHub'
-inputs: 
+inputs:
   greeting: # id of input
     description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
     required: true
@@ -1005,87 +925,6 @@ runs:
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void LoadsNodeActionDefinitionYaml()
-        {
-            try
-            {
-                // Arrange.
-                Setup();
-                const string Content = @"
-# Container action
-name: 'Hello World'
-description: 'Greet the world and record the time'
-author: 'GitHub'
-inputs: 
-  greeting: # id of input
-    description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
-    required: true
-    default: 'Hello'
-  entryPoint: # id of input
-    description: 'optional docker entrypoint overwrite.'
-    required: false
-outputs:
-  time: # id of output
-    description: 'The time we did the greeting'
-icon: 'hello.svg' # vector art to display in the GitHub Marketplace
-color: 'green' # optional, decorates the entry in the GitHub Marketplace
-runs:
-  using: 'node12'
-  main: 'task.js'
-";
-                Pipelines.ActionStep instance;
-                string directory;
-                directory = Path.Combine(_workFolder, Constants.Path.ActionsDirectory, "GitHub/actions".Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), "master");
-                string file = Path.Combine(directory, Constants.Path.ActionManifestYamlFile);
-                Directory.CreateDirectory(Path.GetDirectoryName(file));
-                File.WriteAllText(file, Content);
-                instance = new Pipelines.ActionStep()
-                {
-                    Id = Guid.NewGuid(),
-                    Reference = new Pipelines.RepositoryPathReference()
-                    {
-                        Name = "GitHub/actions",
-                        Ref = "master",
-                        RepositoryType = Pipelines.RepositoryTypes.GitHub
-                    }
-                };
-
-                // Act.
-                Definition definition = _actionManager.LoadAction(_ec.Object, instance);
-
-                // Assert.
-                Assert.NotNull(definition);
-                Assert.Equal(directory, definition.Directory);
-                Assert.NotNull(definition.Data);
-                Assert.NotNull(definition.Data.Inputs); // inputs
-                Dictionary<string, string> inputDefaults = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                foreach (var input in definition.Data.Inputs)
-                {
-                    var name = input.Key.AssertString("key").Value;
-                    var value = input.Value.AssertScalar("value").ToString();
-
-                    _hc.GetTrace().Info($"Default: {name} = {value}");
-                    inputDefaults[name] = value;
-                }
-
-                Assert.Equal(2, inputDefaults.Count);
-                Assert.True(inputDefaults.ContainsKey("greeting"));
-                Assert.Equal("Hello", inputDefaults["greeting"]);
-                Assert.True(string.IsNullOrEmpty(inputDefaults["entryPoint"]));
-                Assert.NotNull(definition.Data.Execution); // execution
-
-                Assert.NotNull((definition.Data.Execution as NodeJSActionExecutionData));
-                Assert.Equal("task.js", (definition.Data.Execution as NodeJSActionExecutionData).Script);
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
@@ -1101,7 +940,7 @@ runs:
 name: 'Hello World'
 description: 'Greet the world and record the time'
 author: 'GitHub'
-inputs: 
+inputs:
   greeting: # id of input
     description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
     required: true
@@ -1200,7 +1039,7 @@ runs:
 name: 'Hello World'
 description: 'Greet the world and record the time'
 author: 'GitHub'
-inputs: 
+inputs:
   greeting: # id of input
     description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
     required: true
@@ -1298,7 +1137,7 @@ runs:
 name: 'Hello World'
 description: 'Greet the world and record the time'
 author: 'GitHub'
-inputs: 
+inputs:
   greeting: # id of input
     description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
     required: true
@@ -1366,7 +1205,7 @@ runs:
 name: 'Hello World'
 description: 'Greet the world and record the time'
 author: 'GitHub'
-inputs: 
+inputs:
   greeting: # id of input
     description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
     required: true
@@ -1437,7 +1276,7 @@ runs:
 name: 'Hello World'
 description: 'Greet the world and record the time'
 author: 'GitHub'
-inputs: 
+inputs:
   greeting: # id of input
     description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
     required: true
@@ -1537,7 +1376,7 @@ runs:
 name: 'Hello World'
 description: 'Greet the world and record the time'
 author: 'Test Corporation'
-inputs: 
+inputs:
   greeting: # id of input
     description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
     required: true
@@ -1594,7 +1433,7 @@ runs:
         private void CreateAction(string yamlContent, out Pipelines.ActionStep instance, out string directory)
         {
             directory = Path.Combine(_workFolder, Constants.Path.ActionsDirectory, "GitHub/actions".Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), "master");
-            string file = Path.Combine(directory, Constants.Path.ActionManifestYmlFile);
+            string file = Path.Combine(directory, Constants.Path.ActionManifestFile);
             Directory.CreateDirectory(Path.GetDirectoryName(file));
             File.WriteAllText(file, yamlContent);
             instance = new Pipelines.ActionStep()
@@ -1612,7 +1451,7 @@ runs:
         private void CreateSelfRepoAction(string yamlContent, out Pipelines.ActionStep instance, out string directory)
         {
             directory = Path.Combine(_workFolder, "actions", "actions");
-            string file = Path.Combine(directory, Constants.Path.ActionManifestYmlFile);
+            string file = Path.Combine(directory, Constants.Path.ActionManifestFile);
             Directory.CreateDirectory(Path.GetDirectoryName(file));
             File.WriteAllText(file, yamlContent);
             instance = new Pipelines.ActionStep()

src/Test/L0/Worker/ActionManifestManagerL0.cs

@@ -63,52 +63,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Load_ContainerAction_Dockerfile_Pre()
-        {
-            try
-            {
-                //Arrange
-                Setup();
-
-                var actionManifest = new ActionManifestManager();
-                actionManifest.Initialize(_hc);
-
-                //Act
-                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "dockerfileaction_init.yml"));
-
-                //Assert
-
-                Assert.Equal("Hello World", result.Name);
-                Assert.Equal("Greet the world and record the time", result.Description);
-                Assert.Equal(2, result.Inputs.Count);
-                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
-                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
-                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
-                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);
-
-                Assert.Equal(ActionExecutionType.Container, result.Execution.ExecutionType);
-
-                var containerAction = result.Execution as ContainerActionExecutionData;
-
-                Assert.Equal("Dockerfile", containerAction.Image);
-                Assert.Equal("main.sh", containerAction.EntryPoint);
-                Assert.Equal("init.sh", containerAction.Init);
-                Assert.Equal("success()", containerAction.InitCondition);
-                Assert.Equal("bzz", containerAction.Arguments[0].ToString());
-                Assert.Equal("Token", containerAction.Environment[0].Key.ToString());
-                Assert.Equal("foo", containerAction.Environment[0].Value.ToString());
-                Assert.Equal("Url", containerAction.Environment[1].Key.ToString());
-                Assert.Equal("bar", containerAction.Environment[1].Value.ToString());
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
@@ -155,98 +109,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Load_ContainerAction_Dockerfile_Pre_DefaultCondition()
-        {
-            try
-            {
-                //Arrange
-                Setup();
-
-                var actionManifest = new ActionManifestManager();
-                actionManifest.Initialize(_hc);
-
-                //Act
-                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "dockerfileaction_init_default.yml"));
-
-                //Assert
-
-                Assert.Equal("Hello World", result.Name);
-                Assert.Equal("Greet the world and record the time", result.Description);
-                Assert.Equal(2, result.Inputs.Count);
-                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
-                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
-                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
-                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);
-
-                Assert.Equal(ActionExecutionType.Container, result.Execution.ExecutionType);
-
-                var containerAction = result.Execution as ContainerActionExecutionData;
-
-                Assert.Equal("Dockerfile", containerAction.Image);
-                Assert.Equal("main.sh", containerAction.EntryPoint);
-                Assert.Equal("init.sh", containerAction.Init);
-                Assert.Equal("always()", containerAction.InitCondition);
-                Assert.Equal("bzz", containerAction.Arguments[0].ToString());
-                Assert.Equal("Token", containerAction.Environment[0].Key.ToString());
-                Assert.Equal("foo", containerAction.Environment[0].Value.ToString());
-                Assert.Equal("Url", containerAction.Environment[1].Key.ToString());
-                Assert.Equal("bar", containerAction.Environment[1].Value.ToString());
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Load_ContainerAction_Dockerfile_Post_DefaultCondition()
-        {
-            try
-            {
-                //Arrange
-                Setup();
-
-                var actionManifest = new ActionManifestManager();
-                actionManifest.Initialize(_hc);
-
-                //Act
-                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "dockerfileaction_cleanup_default.yml"));
-
-                //Assert
-
-                Assert.Equal("Hello World", result.Name);
-                Assert.Equal("Greet the world and record the time", result.Description);
-                Assert.Equal(2, result.Inputs.Count);
-                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
-                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
-                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
-                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);
-
-                Assert.Equal(ActionExecutionType.Container, result.Execution.ExecutionType);
-
-                var containerAction = result.Execution as ContainerActionExecutionData;
-
-                Assert.Equal("Dockerfile", containerAction.Image);
-                Assert.Equal("main.sh", containerAction.EntryPoint);
-                Assert.Equal("cleanup.sh", containerAction.Cleanup);
-                Assert.Equal("always()", containerAction.CleanupCondition);
-                Assert.Equal("bzz", containerAction.Arguments[0].ToString());
-                Assert.Equal("Token", containerAction.Environment[0].Key.ToString());
-                Assert.Equal("foo", containerAction.Environment[0].Value.ToString());
-                Assert.Equal("Url", containerAction.Environment[1].Key.ToString());
-                Assert.Equal("bar", containerAction.Environment[1].Value.ToString());
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
@@ -413,94 +275,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Load_NodeAction_Pre()
-        {
-            try
-            {
-                //Arrange
-                Setup();
-
-                var actionManifest = new ActionManifestManager();
-                actionManifest.Initialize(_hc);
-
-                //Act
-                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "nodeaction_init.yml"));
-
-                //Assert
-                Assert.Equal("Hello World", result.Name);
-                Assert.Equal("Greet the world and record the time", result.Description);
-                Assert.Equal(2, result.Inputs.Count);
-                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
-                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
-                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
-                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);
-                Assert.Equal(1, result.Deprecated.Count);
-
-                Assert.True(result.Deprecated.ContainsKey("greeting"));
-                result.Deprecated.TryGetValue("greeting", out string value);
-                Assert.Equal("This property has been deprecated", value);
-
-                Assert.Equal(ActionExecutionType.NodeJS, result.Execution.ExecutionType);
-
-                var nodeAction = result.Execution as NodeJSActionExecutionData;
-
-                Assert.Equal("main.js", nodeAction.Script);
-                Assert.Equal("init.js", nodeAction.Init);
-                Assert.Equal("cancelled()", nodeAction.InitCondition);
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Load_NodeAction_Init_DefaultCondition()
-        {
-            try
-            {
-                //Arrange
-                Setup();
-
-                var actionManifest = new ActionManifestManager();
-                actionManifest.Initialize(_hc);
-
-                //Act
-                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "nodeaction_init_default.yml"));
-
-                //Assert
-                Assert.Equal("Hello World", result.Name);
-                Assert.Equal("Greet the world and record the time", result.Description);
-                Assert.Equal(2, result.Inputs.Count);
-                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
-                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
-                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
-                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);
-                Assert.Equal(1, result.Deprecated.Count);
-
-                Assert.True(result.Deprecated.ContainsKey("greeting"));
-                result.Deprecated.TryGetValue("greeting", out string value);
-                Assert.Equal("This property has been deprecated", value);
-
-                Assert.Equal(ActionExecutionType.NodeJS, result.Execution.ExecutionType);
-
-                var nodeAction = result.Execution as NodeJSActionExecutionData;
-
-                Assert.Equal("main.js", nodeAction.Script);
-                Assert.Equal("init.js", nodeAction.Init);
-                Assert.Equal("always()", nodeAction.InitCondition);
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
@@ -545,50 +319,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Load_NodeAction_Cleanup_DefaultCondition()
-        {
-            try
-            {
-                //Arrange
-                Setup();
-
-                var actionManifest = new ActionManifestManager();
-                actionManifest.Initialize(_hc);
-
-                //Act
-                var result = actionManifest.Load(_ec.Object, Path.Combine(TestUtil.GetTestDataPath(), "nodeaction_cleanup_default.yml"));
-
-                //Assert
-                Assert.Equal("Hello World", result.Name);
-                Assert.Equal("Greet the world and record the time", result.Description);
-                Assert.Equal(2, result.Inputs.Count);
-                Assert.Equal("greeting", result.Inputs[0].Key.AssertString("key").Value);
-                Assert.Equal("Hello", result.Inputs[0].Value.AssertString("value").Value);
-                Assert.Equal("entryPoint", result.Inputs[1].Key.AssertString("key").Value);
-                Assert.Equal("", result.Inputs[1].Value.AssertString("value").Value);
-                Assert.Equal(1, result.Deprecated.Count);
-
-                Assert.True(result.Deprecated.ContainsKey("greeting"));
-                result.Deprecated.TryGetValue("greeting", out string value);
-                Assert.Equal("This property has been deprecated", value);
-
-                Assert.Equal(ActionExecutionType.NodeJS, result.Execution.ExecutionType);
-
-                var nodeAction = result.Execution as NodeJSActionExecutionData;
-
-                Assert.Equal("main.js", nodeAction.Script);
-                Assert.Equal("cleanup.js", nodeAction.Cleanup);
-                Assert.Equal("always()", nodeAction.CleanupCondition);
-            }
-            finally
-            {
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]

src/Test/L0/Worker/ActionRunnerL0.cs

@@ -314,12 +314,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             githubContext.Add("event", JToken.Parse("{\"foo\":\"bar\"}").ToPipelineContextData());
             _context.Add("github", githubContext);
 
-#if OS_WINDOWS
-            _context["env"] = new DictionaryContextData();
-#else
-            _context["env"] = new CaseSensitiveDictionaryContextData();
-#endif
-
             _ec = new Mock<IExecutionContext>();
             _ec.Setup(x => x.ExpressionValues).Returns(_context);
             _ec.Setup(x => x.IntraActionState).Returns(new Dictionary<string, string>());

src/Test/L0/Worker/ExecutionContextL0.cs

@@ -199,20 +199,20 @@ namespace GitHub.Runner.Common.Tests.Worker
 
 
                 var postRunner1 = hc.CreateService<IActionRunner>();
-                postRunner1.Action = new Pipelines.ActionStep() { Id = Guid.NewGuid(), Name = "post1", DisplayName = "Test 1", Reference = new Pipelines.RepositoryPathReference() { Name = "actions/action" } };
+                postRunner1.Action = new Pipelines.ActionStep() { Name = "post1", DisplayName = "Test 1", Reference = new Pipelines.RepositoryPathReference() { Name = "actions/action" } };
                 postRunner1.Stage = ActionRunStage.Post;
                 postRunner1.Condition = "always()";
                 postRunner1.DisplayName = "post1";
 
 
                 var postRunner2 = hc.CreateService<IActionRunner>();
-                postRunner2.Action = new Pipelines.ActionStep() { Id = Guid.NewGuid(), Name = "post2", DisplayName = "Test 2", Reference = new Pipelines.RepositoryPathReference() { Name = "actions/action" } };
+                postRunner2.Action = new Pipelines.ActionStep() { Name = "post2", DisplayName = "Test 2", Reference = new Pipelines.RepositoryPathReference() { Name = "actions/action" } };
                 postRunner2.Stage = ActionRunStage.Post;
                 postRunner2.Condition = "always()";
                 postRunner2.DisplayName = "post2";
 
-                action1.RegisterPostJobStep(postRunner1);
+                action1.RegisterPostJobStep("post1", postRunner1);
-                action2.RegisterPostJobStep(postRunner2);
+                action2.RegisterPostJobStep("post2", postRunner2);
 
                 Assert.NotNull(jobContext.JobSteps);
                 Assert.NotNull(jobContext.PostJobSteps);

src/Test/L0/Worker/JobExtensionL0.cs

@@ -144,7 +144,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 jobExtension.Initialize(hc);
 
                 _actionManager.Setup(x => x.PrepareActionsAsync(It.IsAny<IExecutionContext>(), It.IsAny<IEnumerable<Pipelines.JobStep>>()))
-                              .Returns(Task.FromResult(new PrepareResult(new List<JobExtensionRunner>(), new Dictionary<Guid, IActionRunner>())));
+                              .Returns(Task.FromResult(new List<JobExtensionRunner>()));
 
                 List<IStep> result = await jobExtension.InitializeJob(_jobEc, _message);
 
@@ -179,7 +179,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 jobExtension.Initialize(hc);
 
                 _actionManager.Setup(x => x.PrepareActionsAsync(It.IsAny<IExecutionContext>(), It.IsAny<IEnumerable<Pipelines.JobStep>>()))
-                              .Returns(Task.FromResult(new PrepareResult(new List<JobExtensionRunner>() { new JobExtensionRunner(null, "", "prepare1", null), new JobExtensionRunner(null, "", "prepare2", null) }, new Dictionary<Guid, IActionRunner>())));
+                              .Returns(Task.FromResult(new List<JobExtensionRunner>() { new JobExtensionRunner(null, "", "prepare1", null), new JobExtensionRunner(null, "", "prepare2", null) }));
 
                 List<IStep> result = await jobExtension.InitializeJob(_jobEc, _message);
 

src/Test/L0/Worker/OutputManagerL0.cs

@@ -973,8 +973,8 @@ namespace GitHub.Runner.Common.Tests.Worker
                 });
 
             _commandManager = new Mock<IActionCommandManager>();
-            _commandManager.Setup(x => x.TryProcessCommand(It.IsAny<IExecutionContext>(), It.IsAny<string>(), It.IsAny<ContainerInfo>()))
+            _commandManager.Setup(x => x.TryProcessCommand(It.IsAny<IExecutionContext>(), It.IsAny<string>()))
-                .Returns((IExecutionContext executionContext, string line, ContainerInfo container) =>
+                .Returns((IExecutionContext executionContext, string line) =>
                 {
                     if (line.IndexOf("##[some-command]") >= 0)
                     {

src/Test/L0/Worker/StepsRunnerL0.cs

@@ -19,7 +19,6 @@ namespace GitHub.Runner.Common.Tests.Worker
         private Mock<IExecutionContext> _ec;
         private StepsRunner _stepsRunner;
         private Variables _variables;
-        private Dictionary<string, string> _env;
         private DictionaryContextData _contexts;
         private JobContext _jobContext;
         private StepsContext _stepContext;
@@ -33,11 +32,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             _variables = new Variables(
                 hostContext: hc,
                 copy: variablesToCopy);
-            _env = new Dictionary<string, string>()
-            {
-                {"env1", "1"},
-                {"test", "github_actions"}
-            };
             _ec = new Mock<IExecutionContext>();
             _ec.SetupAllProperties();
             _ec.Setup(x => x.Variables).Returns(_variables);
@@ -70,9 +64,9 @@ namespace GitHub.Runner.Common.Tests.Worker
                 // Arrange.
                 var variableSets = new[]
                 {
-                    new[] { CreateStep(hc, TaskResult.Succeeded, "success()"), CreateStep(hc, TaskResult.Succeeded, "success()")  },
+                    new[] { CreateStep(TaskResult.Succeeded, "success()"), CreateStep(TaskResult.Succeeded, "success()")  },
-                    new[] { CreateStep(hc, TaskResult.Succeeded, "success()"), CreateStep(hc, TaskResult.Succeeded, "success() || failure()") },
+                    new[] { CreateStep(TaskResult.Succeeded, "success()"), CreateStep(TaskResult.Succeeded, "success() || failure()") },
-                    new[] { CreateStep(hc, TaskResult.Succeeded, "success()"), CreateStep(hc, TaskResult.Succeeded, "always()") }
+                    new[] { CreateStep(TaskResult.Succeeded, "success()"), CreateStep(TaskResult.Succeeded, "always()") }
                 };
                 foreach (var variableSet in variableSets)
                 {
@@ -102,12 +96,12 @@ namespace GitHub.Runner.Common.Tests.Worker
                 // Arrange.
                 var variableSets = new[]
                 {
-                    new[] { CreateStep(hc, TaskResult.Failed, "success()", true), CreateStep(hc, TaskResult.Succeeded, "success()")  },
+                    new[] { CreateStep(TaskResult.Failed, "success()", true), CreateStep(TaskResult.Succeeded, "success()")  },
-                    new[] { CreateStep(hc, TaskResult.Failed, "success()", true), CreateStep(hc, TaskResult.Succeeded, "success() || failure()") },
+                    new[] { CreateStep(TaskResult.Failed, "success()", true), CreateStep(TaskResult.Succeeded, "success() || failure()") },
-                    new[] { CreateStep(hc, TaskResult.Failed, "success()", true), CreateStep(hc, TaskResult.Succeeded, "always()") },
+                    new[] { CreateStep(TaskResult.Failed, "success()", true), CreateStep(TaskResult.Succeeded, "always()") },
-                    new[] { CreateStep(hc, TaskResult.Failed, "success()", true), CreateStep(hc, TaskResult.Failed, "success()", true)  },
+                    new[] { CreateStep(TaskResult.Failed, "success()", true), CreateStep(TaskResult.Failed, "success()", true)  },
-                    new[] { CreateStep(hc, TaskResult.Failed, "success()", true), CreateStep(hc, TaskResult.Failed, "success() || failure()", true) },
+                    new[] { CreateStep(TaskResult.Failed, "success()", true), CreateStep(TaskResult.Failed, "success() || failure()", true) },
-                    new[] { CreateStep(hc, TaskResult.Failed, "success()", true), CreateStep(hc, TaskResult.Failed, "always()", true) }
+                    new[] { CreateStep(TaskResult.Failed, "success()", true), CreateStep(TaskResult.Failed, "always()", true) }
                 };
                 foreach (var variableSet in variableSets)
                 {
@@ -139,12 +133,12 @@ namespace GitHub.Runner.Common.Tests.Worker
                 {
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "success()") },
+                        Steps = new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "success()") },
                         Expected = false,
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "success() || failure()") },
+                        Steps = new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "success() || failure()") },
                         Expected = true,
                     },
                 };
@@ -178,27 +172,27 @@ namespace GitHub.Runner.Common.Tests.Worker
                 {
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Succeeded, "success()"), CreateStep(hc, TaskResult.Succeeded, "always()") },
+                        Steps = new[] { CreateStep(TaskResult.Succeeded, "success()"), CreateStep(TaskResult.Succeeded, "always()") },
                         Expected = TaskResult.Succeeded,
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "always()") },
+                        Steps = new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "always()") },
                         Expected = TaskResult.Failed,
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "always()") },
+                        Steps = new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "always()") },
                         Expected = TaskResult.Failed,
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Succeeded, "success()"), CreateStep(hc, TaskResult.Failed, "always()") },
+                        Steps = new[] { CreateStep(TaskResult.Succeeded, "success()"), CreateStep(TaskResult.Failed, "always()") },
                         Expected = TaskResult.Failed,
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Succeeded, "success()"), CreateStep(hc, TaskResult.Failed, "always()", true) },
+                        Steps = new[] { CreateStep(TaskResult.Succeeded, "success()"), CreateStep(TaskResult.Failed, "always()", true) },
                         Expected = TaskResult.Succeeded,
                     },
                 };
@@ -232,47 +226,47 @@ namespace GitHub.Runner.Common.Tests.Worker
                 {
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "success()") },
+                        Steps = new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "success()") },
                         Expected = TaskResult.Failed
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "success() || failure()") },
+                        Steps = new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "success() || failure()") },
                         Expected = TaskResult.Failed
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "always()") },
+                        Steps = new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "always()") },
                         Expected = TaskResult.Failed
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Failed, "success()", continueOnError: true), CreateStep(hc, TaskResult.Failed, "success()") },
+                        Steps = new[] { CreateStep(TaskResult.Failed, "success()", continueOnError: true), CreateStep(TaskResult.Failed, "success()") },
                         Expected = TaskResult.Failed
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Failed, "success()", continueOnError: true), CreateStep(hc, TaskResult.Succeeded, "success()") },
+                        Steps = new[] { CreateStep(TaskResult.Failed, "success()", continueOnError: true), CreateStep(TaskResult.Succeeded, "success()") },
                         Expected = TaskResult.Succeeded
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Failed, "success()", continueOnError: true), CreateStep(hc, TaskResult.Failed, "success()", continueOnError: true) },
+                        Steps = new[] { CreateStep(TaskResult.Failed, "success()", continueOnError: true), CreateStep(TaskResult.Failed, "success()", continueOnError: true) },
                         Expected = TaskResult.Succeeded
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Succeeded, "success() || failure()") },
+                        Steps = new[] { CreateStep(TaskResult.Succeeded, "success() || failure()") },
                         Expected = TaskResult.Succeeded
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Succeeded, "success()"), CreateStep(hc, TaskResult.Failed, "success()") },
+                        Steps = new[] { CreateStep(TaskResult.Succeeded, "success()"), CreateStep(TaskResult.Failed, "success()") },
                         Expected = TaskResult.Failed
                     },
                     new
                     {
-                        Steps = new[] { CreateStep(hc, TaskResult.Succeeded, "success()"), CreateStep(hc, TaskResult.Succeeded, "success()") },
+                        Steps = new[] { CreateStep(TaskResult.Succeeded, "success()"), CreateStep(TaskResult.Succeeded, "success()") },
                         Expected = TaskResult.Succeeded
                     },
                 //  Abandoned
@@ -310,17 +304,17 @@ namespace GitHub.Runner.Common.Tests.Worker
                 {
                     new
                     {
-                        Step = new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "success()") },
+                        Step = new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "success()") },
                         Expected = false
                     },
                     new
                     {
-                        Step = new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "success() || failure()") },
+                        Step = new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "success() || failure()") },
                         Expected = true
                     },
                     new
                     {
-                        Step = new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "always()") },
+                        Step = new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "always()") },
                         Expected = true
                     }
                 };
@@ -351,9 +345,9 @@ namespace GitHub.Runner.Common.Tests.Worker
                 // Arrange.
                 var variableSets = new[]
                 {
-                    new[] { CreateStep(hc, TaskResult.Succeeded, "success()"), CreateStep(hc, TaskResult.Succeeded, "always()") },
+                    new[] { CreateStep(TaskResult.Succeeded, "success()"), CreateStep(TaskResult.Succeeded, "always()") },
-                    new[] { CreateStep(hc, TaskResult.Failed, "success()"), CreateStep(hc, TaskResult.Succeeded, "always()") },
+                    new[] { CreateStep(TaskResult.Failed, "success()"), CreateStep(TaskResult.Succeeded, "always()") },
-                    new[] { CreateStep(hc, TaskResult.Canceled, "success()"), CreateStep(hc, TaskResult.Succeeded, "always()") }
+                    new[] { CreateStep(TaskResult.Canceled, "success()"), CreateStep(TaskResult.Succeeded, "always()") }
                 };
                 foreach (var variableSet in variableSets)
                 {
@@ -387,8 +381,8 @@ namespace GitHub.Runner.Common.Tests.Worker
                 // Arrange.
                 var variableSets = new[]
                 {
-                    new[] { CreateStep(hc, TaskResult.Succeeded, "success()") },
+                    new[] { CreateStep(TaskResult.Succeeded, "success()") },
-                    new[] { CreateStep(hc, TaskResult.Succeeded, "success()") },
+                    new[] { CreateStep(TaskResult.Succeeded, "success()") },
                 };
                 foreach (var variableSet in variableSets)
                 {
@@ -405,134 +399,18 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
+        private Mock<IStep> CreateStep(TaskResult result, string condition, Boolean continueOnError = false)
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task StepEnvOverrideJobEnvContext()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange.
-                var env1 = new MappingToken(null, null, null);
-                env1.Add(new StringToken(null, null, null, "env1"), new StringToken(null, null, null, "100"));
-                env1.Add(new StringToken(null, null, null, "env2"), new BasicExpressionToken(null, null, null, "env.test"));
-                var step1 = CreateStep(hc, TaskResult.Succeeded, "success()", env: env1);
-
-                _ec.Object.Result = null;
-
-                _ec.Setup(x => x.JobSteps).Returns(new Queue<IStep>(new[] { step1.Object }));
-
-                // Act.
-                await _stepsRunner.RunAsync(jobContext: _ec.Object);
-
-                // Assert.
-                Assert.Equal(TaskResult.Succeeded, _ec.Object.Result ?? TaskResult.Succeeded);
-
-#if OS_WINDOWS
-                Assert.Equal("100", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env1"].AssertString("100"));
-                Assert.Equal("github_actions", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env2"].AssertString("github_actions"));
-#else
-                Assert.Equal("100", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env1"].AssertString("100"));
-                Assert.Equal("github_actions", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env2"].AssertString("github_actions"));
-#endif
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task PopulateEnvContextForEachStep()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange.
-                var env1 = new MappingToken(null, null, null);
-                env1.Add(new StringToken(null, null, null, "env1"), new StringToken(null, null, null, "100"));
-                env1.Add(new StringToken(null, null, null, "env2"), new BasicExpressionToken(null, null, null, "env.test"));
-                var step1 = CreateStep(hc, TaskResult.Succeeded, "success()", env: env1);
-
-                var env2 = new MappingToken(null, null, null);
-                env2.Add(new StringToken(null, null, null, "env1"), new StringToken(null, null, null, "1000"));
-                env2.Add(new StringToken(null, null, null, "env3"), new BasicExpressionToken(null, null, null, "env.test"));
-                var step2 = CreateStep(hc, TaskResult.Succeeded, "success()", env: env2);
-
-                _ec.Object.Result = null;
-
-                _ec.Setup(x => x.JobSteps).Returns(new Queue<IStep>(new[] { step1.Object, step2.Object }));
-
-                // Act.
-                await _stepsRunner.RunAsync(jobContext: _ec.Object);
-
-                // Assert.
-                Assert.Equal(TaskResult.Succeeded, _ec.Object.Result ?? TaskResult.Succeeded);
-#if OS_WINDOWS
-                Assert.Equal("1000", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env1"].AssertString("1000"));
-                Assert.Equal("github_actions", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env3"].AssertString("github_actions"));
-                Assert.False(_ec.Object.ExpressionValues["env"].AssertDictionary("env").ContainsKey("env2"));
-#else
-                Assert.Equal("1000", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env1"].AssertString("1000"));
-                Assert.Equal("github_actions", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env3"].AssertString("github_actions"));
-                Assert.False(_ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env").ContainsKey("env2"));
-#endif
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task PopulateEnvContextAfterSetupStepsContext()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange.
-                var env1 = new MappingToken(null, null, null);
-                env1.Add(new StringToken(null, null, null, "env1"), new StringToken(null, null, null, "100"));
-                var step1 = CreateStep(hc, TaskResult.Succeeded, "success()", env: env1, name: "foo", setOutput: true);
-
-                var env2 = new MappingToken(null, null, null);
-                env2.Add(new StringToken(null, null, null, "env1"), new StringToken(null, null, null, "1000"));
-                env2.Add(new StringToken(null, null, null, "env2"), new BasicExpressionToken(null, null, null, "steps.foo.outputs.test"));
-                var step2 = CreateStep(hc, TaskResult.Succeeded, "success()", env: env2);
-
-                _ec.Object.Result = null;
-
-                _ec.Setup(x => x.JobSteps).Returns(new Queue<IStep>(new[] { step1.Object, step2.Object }));
-
-                // Act.
-                await _stepsRunner.RunAsync(jobContext: _ec.Object);
-
-                // Assert.
-                Assert.Equal(TaskResult.Succeeded, _ec.Object.Result ?? TaskResult.Succeeded);
-#if OS_WINDOWS
-                Assert.Equal("1000", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env1"].AssertString("1000"));
-                Assert.Equal("something", _ec.Object.ExpressionValues["env"].AssertDictionary("env")["env2"].AssertString("something"));
-#else
-                Assert.Equal("1000", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env1"].AssertString("1000"));
-                Assert.Equal("something", _ec.Object.ExpressionValues["env"].AssertCaseSensitiveDictionary("env")["env2"].AssertString("something"));
-#endif
-            }
-        }
-
-        private Mock<IActionRunner> CreateStep(TestHostContext hc, TaskResult result, string condition, Boolean continueOnError = false, MappingToken env = null, string name = "Test", bool setOutput = false)
         {
             // Setup the step.
-            var step = new Mock<IActionRunner>();
+            var step = new Mock<IStep>();
             step.Setup(x => x.Condition).Returns(condition);
             step.Setup(x => x.ContinueOnError).Returns(new BooleanToken(null, null, null, continueOnError));
-            step.Setup(x => x.Action)
+            step.Setup(x => x.RunAsync()).Returns(Task.CompletedTask);
-                .Returns(new DistributedTask.Pipelines.ActionStep()
-                {
-                    Name = name,
-                    Id = Guid.NewGuid(),
-                    Environment = env
-                });
 
             // Setup the step execution context.
             var stepContext = new Mock<IExecutionContext>();
             stepContext.SetupAllProperties();
-            stepContext.Setup(x => x.WriteDebug).Returns(true);
             stepContext.Setup(x => x.Variables).Returns(_variables);
-            stepContext.Setup(x => x.EnvironmentVariables).Returns(_env);
             stepContext.Setup(x => x.ExpressionValues).Returns(_contexts);
             stepContext.Setup(x => x.JobContext).Returns(_jobContext);
             stepContext.Setup(x => x.StepsContext).Returns(_stepContext);
@@ -544,24 +422,13 @@ namespace GitHub.Runner.Common.Tests.Worker
                         stepContext.Object.Result = r;
                     }
                 });
-            var trace = hc.GetTrace();
-            stepContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>())).Callback((string tag, string message) => { trace.Info($"[{tag}]{message}"); });
             stepContext.Object.Result = result;
             step.Setup(x => x.ExecutionContext).Returns(stepContext.Object);
 
-            if (setOutput)
-            {
-                step.Setup(x => x.RunAsync()).Callback(() => { _stepContext.SetOutput(null, name, "test", "something", out string reference); }).Returns(Task.CompletedTask);
-            }
-            else
-            {
-                step.Setup(x => x.RunAsync()).Returns(Task.CompletedTask);
-            }
-
             return step;
         }
 
-        private string FormatSteps(IEnumerable<Mock<IActionRunner>> steps)
+        private string FormatSteps(IEnumerable<Mock<IStep>> steps)
         {
             return String.Join(
                 " ; ",

src/Test/TestData/dockerfileaction_cleanup_default.yml

@@ -1,26 +0,0 @@
-name: 'Hello World'
-description: 'Greet the world and record the time'
-author: 'Test Corporation'
-inputs: 
-  greeting: # id of input
-    description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
-    required: true
-    default: 'Hello'
-  entryPoint: # id of input
-    description: 'optional docker entrypoint overwrite.'
-    required: false
-outputs:
-  time: # id of output
-    description: 'The time we did the greeting'
-icon: 'hello.svg' # vector art to display in the GitHub Marketplace
-color: 'green' # optional, decorates the entry in the GitHub Marketplace
-runs:
-  using: 'docker'
-  image: 'Dockerfile'
-  args:
-  - 'bzz'
-  entrypoint: 'main.sh'
-  env:
-    Token: foo
-    Url: bar
-  post-entrypoint: 'cleanup.sh'

src/Test/TestData/dockerfileaction_init.yml

@@ -1,27 +0,0 @@
-name: 'Hello World'
-description: 'Greet the world and record the time'
-author: 'Test Corporation'
-inputs: 
-  greeting: # id of input
-    description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
-    required: true
-    default: 'Hello'
-  entryPoint: # id of input
-    description: 'optional docker entrypoint overwrite.'
-    required: false
-outputs:
-  time: # id of output
-    description: 'The time we did the greeting'
-icon: 'hello.svg' # vector art to display in the GitHub Marketplace
-color: 'green' # optional, decorates the entry in the GitHub Marketplace
-runs:
-  using: 'docker'
-  image: 'Dockerfile'
-  args:
-  - 'bzz'
-  entrypoint: 'main.sh'
-  env:
-    Token: foo
-    Url: bar
-  pre-entrypoint: 'init.sh'
-  pre-if: 'success()'

src/Test/TestData/dockerfileaction_init_default.yml

@@ -1,26 +0,0 @@
-name: 'Hello World'
-description: 'Greet the world and record the time'
-author: 'Test Corporation'
-inputs: 
-  greeting: # id of input
-    description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
-    required: true
-    default: 'Hello'
-  entryPoint: # id of input
-    description: 'optional docker entrypoint overwrite.'
-    required: false
-outputs:
-  time: # id of output
-    description: 'The time we did the greeting'
-icon: 'hello.svg' # vector art to display in the GitHub Marketplace
-color: 'green' # optional, decorates the entry in the GitHub Marketplace
-runs:
-  using: 'docker'
-  image: 'Dockerfile'
-  args:
-  - 'bzz'
-  entrypoint: 'main.sh'
-  env:
-    Token: foo
-    Url: bar
-  pre-entrypoint: 'init.sh'

src/Test/TestData/nodeaction_cleanup_default.yml

@@ -1,21 +0,0 @@
-name: 'Hello World'
-description: 'Greet the world and record the time'
-author: 'Test Corporation'
-inputs: 
-  greeting: # id of input
-    description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
-    required: true
-    default: 'Hello'
-    deprecationMessage: 'This property has been deprecated'
-  entryPoint: # id of input
-    description: 'optional docker entrypoint overwrite.'
-    required: false
-outputs:
-  time: # id of output
-    description: 'The time we did the greeting'
-icon: 'hello.svg' # vector art to display in the GitHub Marketplace
-color: 'green' # optional, decorates the entry in the GitHub Marketplace
-runs:
-  using: 'node12'
-  main: 'main.js'
-  post: 'cleanup.js'

src/Test/TestData/nodeaction_init.yml

@@ -1,22 +0,0 @@
-name: 'Hello World'
-description: 'Greet the world and record the time'
-author: 'Test Corporation'
-inputs: 
-  greeting: # id of input
-    description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
-    required: true
-    default: 'Hello'
-    deprecationMessage: 'This property has been deprecated'
-  entryPoint: # id of input
-    description: 'optional docker entrypoint overwrite.'
-    required: false
-outputs:
-  time: # id of output
-    description: 'The time we did the greeting'
-icon: 'hello.svg' # vector art to display in the GitHub Marketplace
-color: 'green' # optional, decorates the entry in the GitHub Marketplace
-runs:
-  using: 'node12'
-  main: 'main.js'
-  pre: 'init.js'
-  pre-if: 'cancelled()'

src/Test/TestData/nodeaction_init_default.yml

@@ -1,21 +0,0 @@
-name: 'Hello World'
-description: 'Greet the world and record the time'
-author: 'Test Corporation'
-inputs: 
-  greeting: # id of input
-    description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout'
-    required: true
-    default: 'Hello'
-    deprecationMessage: 'This property has been deprecated'
-  entryPoint: # id of input
-    description: 'optional docker entrypoint overwrite.'
-    required: false
-outputs:
-  time: # id of output
-    description: 'The time we did the greeting'
-icon: 'hello.svg' # vector art to display in the GitHub Marketplace
-color: 'green' # optional, decorates the entry in the GitHub Marketplace
-runs:
-  using: 'node12'
-  main: 'main.js'
-  pre: 'init.js'

src/dev.cmd

@@ -1,16 +1,5 @@
 @setlocal
 @echo off
- rem add expected utils to path
-IF EXIST C:\Program Files\Git\usr\bin (
-  SET PATH=C:\Program Files\Git\usr\bin;%PATH%
-)
-IF EXIST C:\Program Files\Git\mingw64\bin (
-  SET PATH=C:\Program Files\Git\mingw64\bin;%PATH%
-)
-IF EXIST C:\Program Files\Git\bin (
-  SET PATH=C:\Program Files\Git\bin;%PATH%
-)
-
  rem Check if SH_PATH is defined.
 if defined SH_PATH (
   goto run

src/runnerversion

@@ -1 +1 @@
-2.165.2
+2.164.0