Update runnerversion

docs/adrs/0274-step-outcome-and-conclusion.md

@@ -1,62 +0,0 @@
-# ADR 0274: Step outcome and conclusion
-
-**Date**: 2020-01-13
-
-**Status**: Accepted
-
-## Context
-
-This ADR proposes adding `steps.<id>.outcome` and `steps.<id>.conclusion` to the steps context.
-
-This allows downstream a step to run based on whether a previous step succeeded or failed.
-
-Reminder, currently the steps contains `steps.<id>.outputs`.
-
-## Decision
-
-For steps that have completed, populate `steps.<id>.outcome` and `steps.<id>.conclusion` with one of the following values:
-
-- `success`
-- `failure`
-- `cancelled`
-- `skipped`
-
-When a continue-on-error step fails, the outcome will be `failure` even though the final conclusion is `success`.
-
-### Example
-
-```yaml
-steps:
-
-  - id: experimental
-    continue-on-error: true
-    run: ./build.sh experimental
-
-  - if: ${{ steps.experimental.outcome == 'success' }}
-    run: ./publish.sh experimental
-```
-
-### Terminology
-
-The runs API uses the term `conclusion`.
-
-Therefore we use a different term `outcome` for the value prior to continue-on-error.
-
-The following is a snippet from the runs API response payload:
-
-```json
-      "steps": [
-        {
-          "name": "Set up job",
-          "status": "completed",
-          "conclusion": "success",
-          "number": 1,
-          "started_at": "2020-01-09T11:06:16.000-05:00",
-          "completed_at": "2020-01-09T11:06:18.000-05:00"
-        },
-```
-
-## Consequences
-
-- Update runner
-- Update [docs](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#steps-context)

docs/adrs/0354-runner-machine-info.md

@@ -1,35 +0,0 @@
-# ADR 354: Expose runner machine info
-
-**Date**: 2020-03-02
-
-**Status**: Pending
-
-## Context
-
-- Provide a mechanism in the runner to include extra information in `Set up job` step's log.
-  Ex: Include OS/Software info from Hosted image.
-
-## Decision
-
-The runner will look for a file `.setup_info` under the runner's root directory, The file can be a JSON with a simple schema.
-```json
-[
-  {
-    "group": "OS Detail",
-    "detail": "........"
-  },
-  {
-    "group": "Software Detail",
-    "detail": "........"
-  }
-]
-```
-The runner will use `##[group]` and `##[endgroup]` to fold all detail info into an expandable group.
-
-Both [virtual-environments](https://github.com/actions/virtual-environments) and self-hosted runners can use this mechanism to add extra logging info to the `Set up job` step's log.
-
-## Consequences
-
-1. Change the runner to best effort read/parse `.extra_setup_info` file under runner root directory.
-2. [virtual-environments](https://github.com/actions/virtual-environments) generate the file during image generation.
-3. Change MMS provisioner to properly copy the file to runner root directory at runtime.

docs/contribute.md

@@ -44,7 +44,7 @@ Sample developer flow:
 ```bash
 git clone https://github.com/actions/runner
 cd ./src
-./dev.(sh/cmd) layout # the runner that built from source is in {root}/_layout
+./dev.(sh/cmd) layout # the runner that build from source is in {root}/_layout
 <make code changes>
 ./dev.(sh/cmd) build # {root}/_layout will get updated
 ./dev.(sh/cmd) test # run all unit tests before git commit/push

docs/design/auth.md

@@ -1,61 +0,0 @@
-# Runner Authentication and Authorization
-
-## Goals
-  - Support runner installs in untrusted domains.
-  - The account that configures or runs the runner process is not relevant for accessing GitHub resources.
-  - Accessing GitHub resources is done with a per-job token which expires when job completes.
-  - The token is granted to trusted parts of the system including the runner, actions and script steps specified by the workflow author as trusted.
-  - All OAuth tokens that come from the Token Service that the runner uses to access Actions Service resources are the same. It's just the scope and expiration of the token that may vary.
-
-## Configuration
-
-Configuring a self-hosted runner is [covered here in the documentation](https://help.github.com/en/actions/hosting-your-own-runners/adding-self-hosted-runners).
-
-Configuration is done with the user being authenticated via a time-limited, GitHub runner registration token.
-
-*Your credentials are never used for registering the runner with the service.*
-
-![Self-hosted runner config](../res/self-hosted-config.png)
-
-During configuration, an RSA public/private key pair is created, the private key is stored in file on disk. On Windows, the content is protected with DPAPI (machine level encrypted - runner only valid on that machine) and on Linux/OSX with `chmod` permissions.
-
-Using your credentials, the runner is registered with the service by sending the public key to the service which adds that runner to the pool and stores the public key, the Token Service will generate a `clientId` associated with the public key.
-
-## Start and Listen
-
-After configuring the runner, the runner can be started interactively (`./run.cmd` or `./run.sh`) or as a service.
-
-![Self-hosted runner start](../res/self-hosted-start.png)
-
-On start, the runner listener process loads the RSA private key (on Windows decrypting with machine key DPAPI), and asks the Token Service for an OAuth token which is signed with the RSA private key.
-The server then responds with an OAuth token that grants permission to access the message queue (HTTP long poll), allowing the runner to acquire the messages it will eventually run.
-
-## Run a workflow
-
-When a workflow is run, its labels are evaluated, it is matched to a runner and a message is placed in a queue of messages for that runner.  
-The runner then starts listening for jobs via the message queue HTTP long poll.  
-The message is encrypted with the runner's public key, stored during runner configuration.  
-
-![Runner workflow run](../res/workflow-run.png)
-
-A workflow is queued as a result of a triggered [event](https://help.github.com/en/actions/reference/events-that-trigger-workflows). Workflows can be scheduled to [run at specific UTC times](https://help.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule) using POSIX `cron` syntax.
-An [OAuth token](http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html) is generated, granting limited access to the host in Actions Service associated with the github.com repository/organization.
-The lifetime of the OAuth token is the lifetime of the run or at most the [job timeout (default: 6 hours)](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idtimeout-minutes), plus 10 additional minutes.
-
-## Accessing GitHub resources
-
-The job message sent to the runner contains the OAuth token to talk back to the Actions Service.
-The runner listener parent process will spawn a runner worker process for that job and send it the job message over IPC.
-The token is never persisted.
-
-Each action is run as a unique subprocess.
-The encrypted access token will be provided as an environment variable in each action subprocess.  
-The token is registered with the runner as a secret and scrubbed from the logs as they are written.
-
-Authentication in a workflow run to github.com can be accomplished by using the [`GITHUB_TOKEN`](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#about-the-github_token-secret)) secret. This token expires after 60 minutes. Please note that this token is different from the OAuth token that the runner uses to talk to the Actions Service.
-
-## Hosted runner authentication
-
-Hosted runner authentication differs from self-hosted authentication in that runners do not undergo a registration process, but instead, the hosted runners get the OAuth token directly by reading the `.credentials` file. The scope of this particular token is limited for a given workflow job execution, and the token is revoked as soon as the job is finished.
-
-![Hosted runner config and start](../res/hosted-config-start.png)

docs/res/runner-auth-diags.txt

@@ -1,52 +0,0 @@
-# Markup used to generate the runner auth diagrams: https://websequencediagrams.com
-
-title Runner Configuration (self-hosted only)
-
-note left of Runner: GitHub repo URL as input
-Runner->github.com: Retrieve Actions Service access using runner registration token
-github.com->Runner: Access token for Actions Service
-note left of Runner: Generate RSA key pair
-note left of Runner: Store encrypted RSA private key on disk
-Runner->Actions Service: Register runner using Actions Service access token
-note right of Runner: Runner name, RSA public key sent
-note right of Actions Service: Public key stored
-Actions Service->Token Service: Register runner as an app along with the RSA public key
-note right of Token Service: Public key stored
-Token Service->Actions Service: Client Id for the runner application
-Actions Service->Runner: Client Id and Token Endpoint URL
-note left of Runner: Store runner configuration info into .runner file
-note left of Runner: Store Token registration info into .credentials file
-
-title Runner Start and Running (self-hosted only)
-
-Runner.Listener->Runner.Listener: Start
-note left of Runner.Listener: Load config info from .runner
-note left of Runner.Listener: Load token registration from .credentials
-Runner.Listener->Token Service: Exchange OAuth token (happens every 50 mins)
-note right of Runner.Listener: Construct JWT token, use Client Id signed by RSA private key
-note left of Actions Service: Find corresponding RSA public key, use Client Id\nVerify JWT token's signature
-Token Service->Runner.Listener: OAuth token with limited permission and valid for 50 mins
-Runner.Listener->Actions Service: Connect to Actions Service with OAuth token
-Actions Service->Runner.Listener: Workflow job
-
-title Running workflow
-
-Runner.Listener->Service (Message Queue): Get message
-note right of Runner.Listener: Authenticate with exchanged OAuth token
-Event->Actions Service: Queue workflow
-Actions Service->Actions Service: Generate OAuth token per job
-Actions Service->Actions Service: Build job message with the OAuth token
-Actions Service->Actions Service: Encrypt job message with the target runner's public key
-Actions Service->Service (Message Queue): Send encrypted job message to runner
-Service (Message Queue)->Runner.Listener: Send job
-note right of Runner.Listener: Decrypt message with runner's private key
-Runner.Listener->Runner.Worker: Create worker process per job and run the job
-
-title Runner Configuration, Start and Running (hosted only)
-
-Machine Management Service->Runner.Listener: Construct .runner configuration file, store token in .credentials
-Runner.Listener->Runner.Listener: Start
-note left of Runner.Listener: Load config info from .runner
-note left of Runner.Listener: Load OAuth token from .credentials
-Runner.Listener->Actions Service: Connect to Actions Service with OAuth token in .credentials
-Actions Service->Runner.Listener: Workflow job

src/Runner.Common/ConfigurationStore.cs

@@ -78,10 +78,8 @@ namespace GitHub.Runner.Common
         bool IsServiceConfigured();
         bool HasCredentials();
         CredentialData GetCredentials();
-        CredentialData GetMigratedCredentials();
         RunnerSettings GetSettings();
         void SaveCredential(CredentialData credential);
-        void SaveMigratedCredential(CredentialData credential);
         void SaveSettings(RunnerSettings settings);
         void DeleteCredential();
         void DeleteSettings();
@@ -92,11 +90,9 @@ namespace GitHub.Runner.Common
         private string _binPath;
         private string _configFilePath;
         private string _credFilePath;
-        private string _migratedCredFilePath;
         private string _serviceConfigFilePath;
 
         private CredentialData _creds;
-        private CredentialData _migratedCreds;
         private RunnerSettings _settings;
 
         public override void Initialize(IHostContext hostContext)
@@ -118,9 +114,6 @@ namespace GitHub.Runner.Common
             _credFilePath = hostContext.GetConfigFile(WellKnownConfigFile.Credentials);
             Trace.Info("CredFilePath: {0}", _credFilePath);
 
-            _migratedCredFilePath = hostContext.GetConfigFile(WellKnownConfigFile.MigratedCredentials);
-            Trace.Info("MigratedCredFilePath: {0}", _migratedCredFilePath);
-
             _serviceConfigFilePath = hostContext.GetConfigFile(WellKnownConfigFile.Service);
             Trace.Info("ServiceConfigFilePath: {0}", _serviceConfigFilePath);
         }
@@ -130,7 +123,7 @@ namespace GitHub.Runner.Common
         public bool HasCredentials()
         {
             Trace.Info("HasCredentials()");
-            bool credsStored = (new FileInfo(_credFilePath)).Exists || (new FileInfo(_migratedCredFilePath)).Exists;
+            bool credsStored = (new FileInfo(_credFilePath)).Exists;
             Trace.Info("stored {0}", credsStored);
             return credsStored;
         }
@@ -161,16 +154,6 @@ namespace GitHub.Runner.Common
             return _creds;
         }
 
-        public CredentialData GetMigratedCredentials()
-        {
-            if (_migratedCreds == null && File.Exists(_migratedCredFilePath))
-            {
-                _migratedCreds = IOUtil.LoadObject<CredentialData>(_migratedCredFilePath);
-            }
-
-            return _migratedCreds;
-        }
-
         public RunnerSettings GetSettings()
         {
             if (_settings == null)
@@ -205,21 +188,6 @@ namespace GitHub.Runner.Common
             File.SetAttributes(_credFilePath, File.GetAttributes(_credFilePath) | FileAttributes.Hidden);
         }
 
-        public void SaveMigratedCredential(CredentialData credential)
-        {
-            Trace.Info("Saving {0} migrated credential @ {1}", credential.Scheme, _migratedCredFilePath);
-            if (File.Exists(_migratedCredFilePath))
-            {
-                // Delete existing credential file first, since the file is hidden and not able to overwrite.
-                Trace.Info("Delete exist runner migrated credential file.");
-                IOUtil.DeleteFile(_migratedCredFilePath);
-            }
-
-            IOUtil.SaveObject(credential, _migratedCredFilePath);
-            Trace.Info("Migrated Credentials Saved.");
-            File.SetAttributes(_migratedCredFilePath, File.GetAttributes(_migratedCredFilePath) | FileAttributes.Hidden);
-        }
-
         public void SaveSettings(RunnerSettings settings)
         {
             Trace.Info("Saving runner settings.");
@@ -238,7 +206,6 @@ namespace GitHub.Runner.Common
         public void DeleteCredential()
         {
             IOUtil.Delete(_credFilePath, default(CancellationToken));
-            IOUtil.Delete(_migratedCredFilePath, default(CancellationToken));
         }
 
         public void DeleteSettings()

src/Runner.Common/Constants.cs

@@ -19,13 +19,11 @@ namespace GitHub.Runner.Common
     {
         Runner,
         Credentials,
-        MigratedCredentials,
         RSACredentials,
         Service,
         CredentialStore,
         Certificates,
         Options,
-        SetupInfo,
     }
 
     public static class Constants
@@ -138,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

src/Runner.Common/HostContext.cs

@@ -281,12 +281,6 @@ namespace GitHub.Runner.Common
                         ".credentials");
                     break;
 
-                case WellKnownConfigFile.MigratedCredentials:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Root),
-                        ".credentials_migrated");
-                    break;
-
                 case WellKnownConfigFile.RSACredentials:
                     path = Path.Combine(
                         GetDirectory(WellKnownDirectory.Root),
@@ -322,13 +316,6 @@ namespace GitHub.Runner.Common
                         GetDirectory(WellKnownDirectory.Root),
                         ".options");
                     break;
-
-                case WellKnownConfigFile.SetupInfo:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Root),
-                        ".setup_info");
-                    break;
-
                 default:
                     throw new NotSupportedException($"Unexpected well known config file: '{configFile}'");
             }

src/Runner.Common/RunnerServer.cs

@@ -50,10 +50,6 @@ namespace GitHub.Runner.Common
 
         // agent update
         Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState);
-
-        // runner authorization url
-        Task<string> GetRunnerAuthUrlAsync(int runnerPoolId, int runnerId);
-        Task ReportRunnerAuthUrlErrorAsync(int runnerPoolId, int runnerId, string error);
     }
 
     public sealed class RunnerServer : RunnerService, IRunnerServer
@@ -338,20 +334,5 @@ namespace GitHub.Runner.Common
             CheckConnection(RunnerConnectionType.Generic);
             return _genericTaskAgentClient.UpdateAgentUpdateStateAsync(agentPoolId, agentId, currentState);
         }
-
-        //-----------------------------------------------------------------
-        // Runner Auth Url
-        //-----------------------------------------------------------------
-        public Task<string> GetRunnerAuthUrlAsync(int runnerPoolId, int runnerId)
-        {
-            CheckConnection(RunnerConnectionType.MessageQueue);
-            return _messageTaskAgentClient.GetAgentAuthUrlAsync(runnerPoolId, runnerId);
-        }
-
-        public Task ReportRunnerAuthUrlErrorAsync(int runnerPoolId, int runnerId, string error)
-        {
-            CheckConnection(RunnerConnectionType.MessageQueue);
-            return _messageTaskAgentClient.ReportAgentAuthUrlMigrationErrorAsync(runnerPoolId, runnerId, error);
-        }
     }
 }

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -108,7 +108,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");
@@ -375,7 +375,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,7 +519,7 @@ 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 githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/actions/runner-registration";
@@ -531,8 +531,7 @@ namespace GitHub.Runner.Listener.Configuration
 
                 var bodyObject = new Dictionary<string, string>()
                 {
-                    {"url", githubUrl},
+                    {"url", githubUrl}
-                    {"runner_event", runnerEvent}
                 };
 
                 var response = await httpClient.PostAsync(githubApiUrl, new StringContent(StringUtil.ConvertToJson(bodyObject), null, "application/json"));

src/Runner.Listener/Configuration/CredentialManager.cs

@@ -13,7 +13,7 @@ namespace GitHub.Runner.Listener.Configuration
     public interface ICredentialManager : IRunnerService
     {
         ICredentialProvider GetCredentialProvider(string credType);
-        VssCredentials LoadCredentials(bool preferMigrated = true);
+        VssCredentials LoadCredentials();
     }
 
     public class CredentialManager : RunnerService, ICredentialManager
@@ -40,7 +40,7 @@ namespace GitHub.Runner.Listener.Configuration
             return creds;
         }
 
-        public VssCredentials LoadCredentials(bool preferMigrated = true)
+        public VssCredentials LoadCredentials()
         {
             IConfigurationStore store = HostContext.GetService<IConfigurationStore>();
 
@@ -50,16 +50,6 @@ namespace GitHub.Runner.Listener.Configuration
             }
 
             CredentialData credData = store.GetCredentials();
-
-            if (preferMigrated)
-            {
-                var migratedCred = store.GetMigratedCredentials();
-                if (migratedCred != null)
-                {
-                    credData = migratedCred;
-                }
-            }
-
             ICredentialProvider credProv = GetCredentialProvider(credData.Scheme);
             credProv.CredentialData = credData;
 

src/Runner.Listener/Configuration/OAuthCredential.cs

@@ -1,5 +1,6 @@
 using System;
 using GitHub.Runner.Common;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.OAuth;
@@ -28,7 +29,7 @@ namespace GitHub.Runner.Listener.Configuration
             var authorizationUrl = this.CredentialData.Data.GetValueOrDefault("authorizationUrl", null);
 
             // For back compat with .credential file that doesn't has 'oauthEndpointUrl' section
-            var oauthEndpointUrl = this.CredentialData.Data.GetValueOrDefault("oauthEndpointUrl", authorizationUrl);
+            var oathEndpointUrl = this.CredentialData.Data.GetValueOrDefault("oauthEndpointUrl", authorizationUrl);
 
             ArgUtil.NotNullOrEmpty(clientId, nameof(clientId));
             ArgUtil.NotNullOrEmpty(authorizationUrl, nameof(authorizationUrl));
@@ -38,7 +39,7 @@ namespace GitHub.Runner.Listener.Configuration
             var keyManager = context.GetService<IRSAKeyManager>();
             var signingCredentials = VssSigningCredentials.Create(() => keyManager.GetKey());
             var clientCredential = new VssOAuthJwtBearerClientCredential(clientId, authorizationUrl, signingCredentials);
-            var agentCredential = new VssOAuthCredential(new Uri(oauthEndpointUrl, UriKind.Absolute), VssOAuthGrant.ClientCredentials, clientCredential);
+            var agentCredential = new VssOAuthCredential(new Uri(oathEndpointUrl, UriKind.Absolute), VssOAuthGrant.ClientCredentials, clientCredential);
 
             // Construct a credentials cache with a single OAuth credential for communication. The windows credential
             // is explicitly set to null to ensure we never do that negotiation.

src/Runner.Listener/JobDispatcher.cs

@@ -18,7 +18,6 @@ namespace GitHub.Runner.Listener
     [ServiceLocator(Default = typeof(JobDispatcher))]
     public interface IJobDispatcher : IRunnerService
     {
-        bool Busy { get; }
         TaskCompletionSource<bool> RunOnceJobCompleted { get; }
         void Run(Pipelines.AgentJobRequestMessage message, bool runOnce = false);
         bool Cancel(JobCancelMessage message);
@@ -70,8 +69,6 @@ namespace GitHub.Runner.Listener
 
         public TaskCompletionSource<bool> RunOnceJobCompleted => _runOnceJobCompleted;
 
-        public bool Busy { get; private set; }
-
         public void Run(Pipelines.AgentJobRequestMessage jobRequestMessage, bool runOnce = false)
         {
             Trace.Info($"Job request {jobRequestMessage.RequestId} for plan {jobRequestMessage.Plan.PlanId} job {jobRequestMessage.JobId} received.");
@@ -250,7 +247,7 @@ namespace GitHub.Runner.Listener
                     Task completedTask = await Task.WhenAny(jobDispatch.WorkerDispatch, Task.Delay(TimeSpan.FromSeconds(45)));
                     if (completedTask != jobDispatch.WorkerDispatch)
                     {
-                        // at this point, the job execution might encounter some dead lock and even not able to be cancelled.
+                        // at this point, the job exectuion might encounter some dead lock and even not able to be canclled.
                         // no need to localize the exception string should never happen.
                         throw new InvalidOperationException($"Job dispatch process for {jobDispatch.JobId} has encountered unexpected error, the dispatch task is not able to be canceled within 45 seconds.");
                     }
@@ -298,9 +295,6 @@ namespace GitHub.Runner.Listener
         }
 
         private async Task RunAsync(Pipelines.AgentJobRequestMessage message, WorkerDispatcher previousJobDispatch, CancellationToken jobRequestCancellationToken, CancellationToken workerCancelTimeoutKillToken)
-        {
-            Busy = true;
-            try
         {
             if (previousJobDispatch != null)
             {
@@ -601,11 +595,6 @@ namespace GitHub.Runner.Listener
                 }
             }
         }
-            finally
-            {
-                Busy = false;
-            }
-        }
 
         public async Task RenewJobRequestAsync(int poolId, long requestId, Guid lockToken, TaskCompletionSource<int> firstJobRequestRenewed, CancellationToken token)
         {

src/Runner.Listener/MessageListener.cs

@@ -13,10 +13,7 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
-using GitHub.Services.WebApi;
-using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Test")]
 namespace GitHub.Runner.Listener
 {
     [ServiceLocator(Default = typeof(MessageListener))]
@@ -35,30 +32,18 @@ namespace GitHub.Runner.Listener
         private ITerminal _term;
         private IRunnerServer _runnerServer;
         private TaskAgentSession _session;
-        private ICredentialManager _credMgr;
-        private IConfigurationStore _configStore;
         private TimeSpan _getNextMessageRetryInterval;
         private readonly TimeSpan _sessionCreationRetryInterval = TimeSpan.FromSeconds(30);
         private readonly TimeSpan _sessionConflictRetryLimit = TimeSpan.FromMinutes(4);
         private readonly TimeSpan _clockSkewRetryLimit = TimeSpan.FromMinutes(30);
         private readonly Dictionary<string, int> _sessionCreationExceptionTracker = new Dictionary<string, int>();
 
-        // Whether load credentials from .credentials_migrated file
-        internal bool _useMigratedCredentials;
-
-        // need to check auth url if there is only .credentials and auth schema is OAuth
-        internal bool _needToCheckAuthorizationUrlUpdate;
-        internal Task<VssCredentials> _authorizationUrlMigrationBackgroundTask;
-        internal Task _authorizationUrlRollbackReattemptDelayBackgroundTask;
-
         public override void Initialize(IHostContext hostContext)
         {
             base.Initialize(hostContext);
 
             _term = HostContext.GetService<ITerminal>();
             _runnerServer = HostContext.GetService<IRunnerServer>();
-            _credMgr = HostContext.GetService<ICredentialManager>();
-            _configStore = HostContext.GetService<IConfigurationStore>();
         }
 
         public async Task<Boolean> CreateSessionAsync(CancellationToken token)
@@ -73,8 +58,8 @@ namespace GitHub.Runner.Listener
 
             // Create connection.
             Trace.Info("Loading Credentials");
-            _useMigratedCredentials = !StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("GITHUB_ACTIONS_RUNNER_SPSAUTHURL"));
+            var credMgr = HostContext.GetService<ICredentialManager>();
-            VssCredentials creds = _credMgr.LoadCredentials(_useMigratedCredentials);
+            VssCredentials creds = credMgr.LoadCredentials();
 
             var agent = new TaskAgentReference
             {
@@ -89,17 +74,6 @@ namespace GitHub.Runner.Listener
             string errorMessage = string.Empty;
             bool encounteringError = false;
 
-            var originalCreds = _configStore.GetCredentials();
-            var migratedCreds = _configStore.GetMigratedCredentials();
-            if (migratedCreds == null)
-            {
-                _useMigratedCredentials = false;
-                if (originalCreds.Scheme == Constants.Configuration.OAuth)
-                {
-                    _needToCheckAuthorizationUrlUpdate = true;
-                }
-            }
-
             while (true)
             {
                 token.ThrowIfCancellationRequested();
@@ -127,12 +101,6 @@ namespace GitHub.Runner.Listener
                         encounteringError = false;
                     }
 
-                    if (_needToCheckAuthorizationUrlUpdate)
-                    {
-                        // start background task try to get new authorization url
-                        _authorizationUrlMigrationBackgroundTask = GetNewOAuthAuthorizationSetting(token);
-                    }
-
                     return true;
                 }
                 catch (OperationCanceledException) when (token.IsCancellationRequested)
@@ -151,23 +119,10 @@ namespace GitHub.Runner.Listener
                     Trace.Error(ex);
 
                     if (!IsSessionCreationExceptionRetriable(ex))
-                    {
-                        if (_useMigratedCredentials)
-                        {
-                            // migrated credentials might cause lose permission during permission check,
-                            // we will force to use original credential and try again
-                            _useMigratedCredentials = false;
-                            var reattemptBackoff = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromHours(24), TimeSpan.FromHours(36));
-                            _authorizationUrlRollbackReattemptDelayBackgroundTask = HostContext.Delay(reattemptBackoff, token); // retry migrated creds in 24-36 hours.
-                            creds = _credMgr.LoadCredentials(false);
-                            Trace.Error("Fallback to original credentials and try again.");
-                        }
-                        else
                     {
                         _term.WriteError($"Failed to create session. {ex.Message}");
                         return false;
                     }
-                    }
 
                     if (!encounteringError) //print the message only on the first error
                     {
@@ -227,51 +182,6 @@ namespace GitHub.Runner.Listener
                         encounteringError = false;
                         continuousError = 0;
                     }
-
-                    if (_needToCheckAuthorizationUrlUpdate &&
-                        _authorizationUrlMigrationBackgroundTask?.IsCompleted == true)
-                    {
-                        if (HostContext.GetService<IJobDispatcher>().Busy ||
-                            HostContext.GetService<ISelfUpdater>().Busy)
-                        {
-                            Trace.Info("Job or runner updates in progress, update credentials next time.");
-                        }
-                        else
-                        {
-                            try
-                            {
-                                var newCred = await _authorizationUrlMigrationBackgroundTask;
-                                await _runnerServer.ConnectAsync(new Uri(_settings.ServerUrl), newCred);
-                                Trace.Info("Updated connection to use migrated credential for next GetMessage call.");
-                                _useMigratedCredentials = true;
-                                _authorizationUrlMigrationBackgroundTask = null;
-                                _needToCheckAuthorizationUrlUpdate = false;
-                            }
-                            catch (Exception ex)
-                            {
-                                Trace.Error("Fail to refresh connection with new authorization url.");
-                                Trace.Error(ex);
-                            }
-                        }
-                    }
-
-                    if (_authorizationUrlRollbackReattemptDelayBackgroundTask?.IsCompleted == true)
-                    {
-                        try
-                        {
-                            // we rolled back to use original creds about 2 days before, now it's a good time to try migrated creds again.
-                            Trace.Info("Re-attempt to use migrated credential");
-                            var migratedCreds = _credMgr.LoadCredentials();
-                            await _runnerServer.ConnectAsync(new Uri(_settings.ServerUrl), migratedCreds);
-                            _useMigratedCredentials = true;
-                            _authorizationUrlRollbackReattemptDelayBackgroundTask = null;
-                        }
-                        catch (Exception ex)
-                        {
-                            Trace.Error("Fail to refresh connection with new authorization url on rollback reattempt.");
-                            Trace.Error(ex);
-                        }
-                    }
                 }
                 catch (OperationCanceledException) when (token.IsCancellationRequested)
                 {
@@ -294,23 +204,9 @@ namespace GitHub.Runner.Listener
                         Trace.Info($"{nameof(TaskAgentSessionExpiredException)} received, recovered by recreate session.");
                     }
                     else if (!IsGetNextMessageExceptionRetriable(ex))
-                    {
-                        if (_useMigratedCredentials)
-                        {
-                            // migrated credentials might cause lose permission during permission check,
-                            // we will force to use original credential and try again
-                            _useMigratedCredentials = false;
-                            var reattemptBackoff = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromHours(24), TimeSpan.FromHours(36));
-                            _authorizationUrlRollbackReattemptDelayBackgroundTask = HostContext.Delay(reattemptBackoff, token); // retry migrated creds in 24-36 hours.
-                            var originalCreds = _credMgr.LoadCredentials(false);
-                            await _runnerServer.ConnectAsync(new Uri(_settings.ServerUrl), originalCreds);
-                            Trace.Error("Fallback to original credentials and try again.");
-                        }
-                        else
                     {
                         throw;
                     }
-                    }
                     else
                     {
                         continuousError++;
@@ -501,80 +397,5 @@ namespace GitHub.Runner.Listener
                 return true;
             }
         }
-
-        private async Task<VssCredentials> GetNewOAuthAuthorizationSetting(CancellationToken token)
-        {
-            Trace.Info("Start checking oauth authorization url update.");
-            while (true)
-            {
-                var backoff = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromMinutes(30), TimeSpan.FromMinutes(45));
-                await HostContext.Delay(backoff, token);
-
-                try
-                {
-                    var migratedAuthorizationUrl = await _runnerServer.GetRunnerAuthUrlAsync(_settings.PoolId, _settings.AgentId);
-                    if (!string.IsNullOrEmpty(migratedAuthorizationUrl))
-                    {
-                        var credData = _configStore.GetCredentials();
-                        var clientId = credData.Data.GetValueOrDefault("clientId", null);
-                        var currentAuthorizationUrl = credData.Data.GetValueOrDefault("authorizationUrl", null);
-                        Trace.Info($"Current authorization url: {currentAuthorizationUrl}, new authorization url: {migratedAuthorizationUrl}");
-
-                        if (string.Equals(currentAuthorizationUrl, migratedAuthorizationUrl, StringComparison.OrdinalIgnoreCase))
-                        {
-                            // We don't need to update credentials.
-                            Trace.Info("No needs to update authorization url");
-                            await Task.Delay(TimeSpan.FromMilliseconds(-1), token);
-                        }
-
-                        var keyManager = HostContext.GetService<IRSAKeyManager>();
-                        var signingCredentials = VssSigningCredentials.Create(() => keyManager.GetKey());
-
-                        var migratedClientCredential = new VssOAuthJwtBearerClientCredential(clientId, migratedAuthorizationUrl, signingCredentials);
-                        var migratedRunnerCredential = new VssOAuthCredential(new Uri(migratedAuthorizationUrl, UriKind.Absolute), VssOAuthGrant.ClientCredentials, migratedClientCredential);
-
-                        Trace.Info("Try connect service with Token Service OAuth endpoint.");
-                        var runnerServer = HostContext.CreateService<IRunnerServer>();
-                        await runnerServer.ConnectAsync(new Uri(_settings.ServerUrl), migratedRunnerCredential);
-                        await runnerServer.GetAgentPoolsAsync();
-                        Trace.Info($"Successfully connected service with new authorization url.");
-
-                        var migratedCredData = new CredentialData
-                        {
-                            Scheme = Constants.Configuration.OAuth,
-                            Data =
-                            {
-                                { "clientId", clientId },
-                                { "authorizationUrl", migratedAuthorizationUrl },
-                                { "oauthEndpointUrl", migratedAuthorizationUrl },
-                            },
-                        };
-
-                        _configStore.SaveMigratedCredential(migratedCredData);
-                        return migratedRunnerCredential;
-                    }
-                    else
-                    {
-                        Trace.Verbose("No authorization url updates");
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Trace.Error("Fail to get/test new authorization url.");
-                    Trace.Error(ex);
-
-                    try
-                    {
-                        await _runnerServer.ReportRunnerAuthUrlErrorAsync(_settings.PoolId, _settings.AgentId, ex.ToString());
-                    }
-                    catch (Exception e)
-                    {
-                        // best effort
-                        Trace.Error("Fail to report the migration error");
-                        Trace.Error(e);
-                    }
-                }
-            }
-        }
     }
 }

src/Runner.Listener/SelfUpdater.cs

@@ -17,7 +17,6 @@ namespace GitHub.Runner.Listener
     [ServiceLocator(Default = typeof(SelfUpdater))]
     public interface ISelfUpdater : IRunnerService
     {
-        bool Busy { get; }
         Task<bool> SelfUpdate(AgentRefreshMessage updateMessage, IJobDispatcher jobDispatcher, bool restartInteractiveRunner, CancellationToken token);
     }
 
@@ -32,8 +31,6 @@ namespace GitHub.Runner.Listener
         private int _poolId;
         private int _agentId;
 
-        public bool Busy { get; private set; }
-
         public override void Initialize(IHostContext hostContext)
         {
             base.Initialize(hostContext);
@@ -47,9 +44,6 @@ namespace GitHub.Runner.Listener
         }
 
         public async Task<bool> SelfUpdate(AgentRefreshMessage updateMessage, IJobDispatcher jobDispatcher, bool restartInteractiveRunner, CancellationToken token)
-        {
-            Busy = true;
-            try
         {
             if (!await UpdateNeeded(updateMessage.TargetVersion, token))
             {
@@ -98,11 +92,6 @@ namespace GitHub.Runner.Listener
 
             return true;
         }
-            finally
-            {
-                Busy = false;
-            }
-        }
 
         private async Task<bool> UpdateNeeded(string targetVersion, CancellationToken token)
         {

src/Runner.Sdk/ProcessInvoker.cs

@@ -271,14 +271,6 @@ namespace GitHub.Runner.Sdk
             // Indicate GitHub Actions process.
             _proc.StartInfo.Environment["GITHUB_ACTIONS"] = "true";
 
-            // Set CI=true when no one else already set it.
-            // CI=true is common set in most CI provider in GitHub
-            if (!_proc.StartInfo.Environment.ContainsKey("CI") &&
-                Environment.GetEnvironmentVariable("CI") == null)
-            {
-                _proc.StartInfo.Environment["CI"] = "true";
-            }
-
             // Hook up the events.
             _proc.EnableRaisingEvents = true;
             _proc.Exited += ProcessExitedHandler;

src/Runner.Worker/ActionManifestManager.cs

@@ -32,7 +32,6 @@ namespace GitHub.Runner.Worker
     public sealed class ActionManifestManager : RunnerService, IActionManifestManager
     {
         private TemplateSchema _actionManifestSchema;
-        private IReadOnlyList<String> _fileTable;
 
         public override void Initialize(IHostContext hostContext)
         {
@@ -62,9 +61,6 @@ namespace GitHub.Runner.Worker
 
                 // Get the file ID
                 var fileId = context.GetFileId(manifestFile);
-                _fileTable = context.GetFileTable();
-
-                // Read the file
                 var fileContent = File.ReadAllText(manifestFile);
                 using (var stringReader = new StringReader(fileContent))
                 {
@@ -269,15 +265,6 @@ namespace GitHub.Runner.Worker
                 }
             }
 
-            // Add the file table
-            if (_fileTable?.Count > 0)
-            {
-                for (var i = 0 ; i < _fileTable.Count ; i++)
-                {
-                    result.GetFileId(_fileTable[i]);
-                }
-            }
-
             return result;
         }
 
@@ -428,5 +415,566 @@ namespace GitHub.Runner.Worker
             }
         }
     }
+
+    /// <summary>
+    /// Converts a YAML file into a TemplateToken
+    /// </summary>
+    internal sealed class YamlObjectReader : IObjectReader
+    {
+        internal YamlObjectReader(
+            Int32? fileId,
+            TextReader input)
+        {
+            m_fileId = fileId;
+            m_parser = new Parser(input);
+        }
+
+        public Boolean AllowLiteral(out LiteralToken value)
+        {
+            if (EvaluateCurrent() is Scalar scalar)
+            {
+                // Tag specified
+                if (!string.IsNullOrEmpty(scalar.Tag))
+                {
+                    // String tag
+                    if (string.Equals(scalar.Tag, c_stringTag, StringComparison.Ordinal))
+                    {
+                        value = new StringToken(m_fileId, scalar.Start.Line, scalar.Start.Column, scalar.Value);
+                        MoveNext();
+                        return true;
+                    }
+
+                    // Not plain style
+                    if (scalar.Style != ScalarStyle.Plain)
+                    {
+                        throw new NotSupportedException($"The scalar style '{scalar.Style}' on line {scalar.Start.Line} and column {scalar.Start.Column} is not valid with the tag '{scalar.Tag}'");
+                    }
+
+                    // Boolean, Float, Integer, or Null
+                    switch (scalar.Tag)
+                    {
+                        case c_booleanTag:
+                            value = ParseBoolean(scalar);
+                            break;
+                        case c_floatTag:
+                            value = ParseFloat(scalar);
+                            break;
+                        case c_integerTag:
+                            value = ParseInteger(scalar);
+                            break;
+                        case c_nullTag:
+                            value = ParseNull(scalar);
+                            break;
+                        default:
+                            throw new NotSupportedException($"Unexpected tag '{scalar.Tag}'");
+                    }
+
+                    MoveNext();
+                    return true;
+                }
+
+                // Plain style, determine type using YAML 1.2 "core" schema https://yaml.org/spec/1.2/spec.html#id2804923
+                if (scalar.Style == ScalarStyle.Plain)
+                {
+                    if (MatchNull(scalar, out var nullToken))
+                    {
+                        value = nullToken;
+                    }
+                    else if (MatchBoolean(scalar, out var booleanToken))
+                    {
+                        value = booleanToken;
+                    }
+                    else if (MatchInteger(scalar, out var numberToken) ||
+                        MatchFloat(scalar, out numberToken))
+                    {
+                        value = numberToken;
+                    }
+                    else
+                    {
+                        value = new StringToken(m_fileId, scalar.Start.Line, scalar.Start.Column, scalar.Value);
+                    }
+
+                    MoveNext();
+                    return true;
+                }
+
+                // Otherwise assume string
+                value = new StringToken(m_fileId, scalar.Start.Line, scalar.Start.Column, scalar.Value);
+                MoveNext();
+                return true;
+            }
+
+            value = default;
+            return false;
+        }
+
+        public Boolean AllowSequenceStart(out SequenceToken value)
+        {
+            if (EvaluateCurrent() is SequenceStart sequenceStart)
+            {
+                value = new SequenceToken(m_fileId, sequenceStart.Start.Line, sequenceStart.Start.Column);
+                MoveNext();
+                return true;
+            }
+
+            value = default;
+            return false;
+        }
+
+        public Boolean AllowSequenceEnd()
+        {
+            if (EvaluateCurrent() is SequenceEnd)
+            {
+                MoveNext();
+                return true;
+            }
+
+            return false;
+        }
+
+        public Boolean AllowMappingStart(out MappingToken value)
+        {
+            if (EvaluateCurrent() is MappingStart mappingStart)
+            {
+                value = new MappingToken(m_fileId, mappingStart.Start.Line, mappingStart.Start.Column);
+                MoveNext();
+                return true;
+            }
+
+            value = default;
+            return false;
+        }
+
+        public Boolean AllowMappingEnd()
+        {
+            if (EvaluateCurrent() is MappingEnd)
+            {
+                MoveNext();
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Consumes the last parsing events, which are expected to be DocumentEnd and StreamEnd.
+        /// </summary>
+        public void ValidateEnd()
+        {
+            if (EvaluateCurrent() is DocumentEnd)
+            {
+                MoveNext();
+            }
+            else
+            {
+                throw new InvalidOperationException("Expected document end parse event");
+            }
+
+            if (EvaluateCurrent() is StreamEnd)
+            {
+                MoveNext();
+            }
+            else
+            {
+                throw new InvalidOperationException("Expected stream end parse event");
+            }
+
+            if (MoveNext())
+            {
+                throw new InvalidOperationException("Expected end of parse events");
+            }
+        }
+
+        /// <summary>
+        /// Consumes the first parsing events, which are expected to be StreamStart and DocumentStart.
+        /// </summary>
+        public void ValidateStart()
+        {
+            if (EvaluateCurrent() != null)
+            {
+                throw new InvalidOperationException("Unexpected parser state");
+            }
+
+            if (!MoveNext())
+            {
+                throw new InvalidOperationException("Expected a parse event");
+            }
+
+            if (EvaluateCurrent() is StreamStart)
+            {
+                MoveNext();
+            }
+            else
+            {
+                throw new InvalidOperationException("Expected stream start parse event");
+            }
+
+            if (EvaluateCurrent() is DocumentStart)
+            {
+                MoveNext();
+            }
+            else
+            {
+                throw new InvalidOperationException("Expected document start parse event");
+            }
+        }
+
+        private ParsingEvent EvaluateCurrent()
+        {
+            if (m_current == null)
+            {
+                m_current = m_parser.Current;
+                if (m_current != null)
+                {
+                    if (m_current is Scalar scalar)
+                    {
+                        // Verify not using achors
+                        if (scalar.Anchor != null)
+                        {
+                            throw new InvalidOperationException($"Anchors are not currently supported. Remove the anchor '{scalar.Anchor}'");
+                        }
+                    }
+                    else if (m_current is MappingStart mappingStart)
+                    {
+                        // Verify not using achors
+                        if (mappingStart.Anchor != null)
+                        {
+                            throw new InvalidOperationException($"Anchors are not currently supported. Remove the anchor '{mappingStart.Anchor}'");
+                        }
+                    }
+                    else if (m_current is SequenceStart sequenceStart)
+                    {
+                        // Verify not using achors
+                        if (sequenceStart.Anchor != null)
+                        {
+                            throw new InvalidOperationException($"Anchors are not currently supported. Remove the anchor '{sequenceStart.Anchor}'");
+                        }
+                    }
+                    else if (!(m_current is MappingEnd) &&
+                        !(m_current is SequenceEnd) &&
+                        !(m_current is DocumentStart) &&
+                        !(m_current is DocumentEnd) &&
+                        !(m_current is StreamStart) &&
+                        !(m_current is StreamEnd))
+                    {
+                        throw new InvalidOperationException($"Unexpected parsing event type: {m_current.GetType().Name}");
+                    }
+                }
+            }
+
+            return m_current;
+        }
+
+        private Boolean MoveNext()
+        {
+            m_current = null;
+            return m_parser.MoveNext();
+        }
+
+        private BooleanToken ParseBoolean(Scalar scalar)
+        {
+            if (MatchBoolean(scalar, out var token))
+            {
+                return token;
+            }
+
+            ThrowInvalidValue(scalar, c_booleanTag); // throws
+            return default;
+        }
+
+        private NumberToken ParseFloat(Scalar scalar)
+        {
+            if (MatchFloat(scalar, out var token))
+            {
+                return token;
+            }
+
+            ThrowInvalidValue(scalar, c_floatTag); // throws
+            return default;
+        }
+
+        private NumberToken ParseInteger(Scalar scalar)
+        {
+            if (MatchInteger(scalar, out var token))
+            {
+                return token;
+            }
+
+            ThrowInvalidValue(scalar, c_integerTag); // throws
+            return default;
+        }
+
+        private NullToken ParseNull(Scalar scalar)
+        {
+            if (MatchNull(scalar, out var token))
+            {
+                return token;
+            }
+
+            ThrowInvalidValue(scalar, c_nullTag); // throws
+            return default;
+        }
+
+        private Boolean MatchBoolean(
+            Scalar scalar,
+            out BooleanToken value)
+        {
+            // YAML 1.2 "core" schema https://yaml.org/spec/1.2/spec.html#id2804923
+            switch (scalar.Value ?? string.Empty)
+            {
+                case "true":
+                case "True":
+                case "TRUE":
+                    value = new BooleanToken(m_fileId, scalar.Start.Line, scalar.Start.Column, true);
+                    return true;
+                case "false":
+                case "False":
+                case "FALSE":
+                    value = new BooleanToken(m_fileId, scalar.Start.Line, scalar.Start.Column, false);
+                    return true;
+            }
+
+            value = default;
+            return false;
+        }
+
+        private Boolean MatchFloat(
+            Scalar scalar,
+            out NumberToken value)
+        {
+            // YAML 1.2 "core" schema https://yaml.org/spec/1.2/spec.html#id2804923
+            var str = scalar.Value;
+            if (!string.IsNullOrEmpty(str))
+            {
+                // Check for [-+]?(\.inf|\.Inf|\.INF)|\.nan|\.NaN|\.NAN
+                switch (str)
+                {
+                    case ".inf":
+                    case ".Inf":
+                    case ".INF":
+                    case "+.inf":
+                    case "+.Inf":
+                    case "+.INF":
+                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, Double.PositiveInfinity);
+                        return true;
+                    case "-.inf":
+                    case "-.Inf":
+                    case "-.INF":
+                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, Double.NegativeInfinity);
+                        return true;
+                    case ".nan":
+                    case ".NaN":
+                    case ".NAN":
+                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, Double.NaN);
+                        return true;
+                }
+
+                // Otherwise check [-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?
+
+                // Skip leading sign
+                var index = str[0] == '-' || str[0] == '+' ? 1 : 0;
+
+                // Check for integer portion
+                var length = str.Length;
+                var hasInteger = false;
+                while (index < length && str[index] >= '0' && str[index] <= '9')
+                {
+                    hasInteger = true;
+                    index++;
+                }
+
+                // Check for decimal point
+                var hasDot = false;
+                if (index < length && str[index] == '.')
+                {
+                    hasDot = true;
+                    index++;
+                }
+
+                // Check for decimal portion
+                var hasDecimal = false;
+                while (index < length && str[index] >= '0' && str[index] <= '9')
+                {
+                    hasDecimal = true;
+                    index++;
+                }
+
+                // Check [-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)
+                if ((hasDot && hasDecimal) || hasInteger)
+                {
+                    // Check for end
+                    if (index == length)
+                    {
+                        // Try parse
+                        if (Double.TryParse(str, NumberStyles.AllowLeadingSign | NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var doubleValue))
+                        {
+                            value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, doubleValue);
+                            return true;
+                        }
+                        // Otherwise exceeds range
+                        else
+                        {
+                            ThrowInvalidValue(scalar, c_floatTag); // throws
+                        }
+                    }
+                    // Check [eE][-+]?[0-9]
+                    else if (index < length && (str[index] == 'e' || str[index] == 'E'))
+                    {
+                        index++;
+
+                        // Skip sign
+                        if (index < length && (str[index] == '-' || str[index] == '+'))
+                        {
+                            index++;
+                        }
+
+                        // Check for exponent
+                        var hasExponent = false;
+                        while (index < length && str[index] >= '0' && str[index] <= '9')
+                        {
+                            hasExponent = true;
+                            index++;
+                        }
+
+                        // Check for end
+                        if (hasExponent && index == length)
+                        {
+                            // Try parse
+                            if (Double.TryParse(str, NumberStyles.AllowLeadingSign | NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent, CultureInfo.InvariantCulture, out var doubleValue))
+                            {
+                                value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, (Double)doubleValue);
+                                return true;
+                            }
+                            // Otherwise exceeds range
+                            else
+                            {
+                                ThrowInvalidValue(scalar, c_floatTag); // throws
+                            }
+                        }
+                    }
+                }
+            }
+
+            value = default;
+            return false;
+        }
+
+        private Boolean MatchInteger(
+            Scalar scalar,
+            out NumberToken value)
+        {
+            // YAML 1.2 "core" schema https://yaml.org/spec/1.2/spec.html#id2804923
+            var str = scalar.Value;
+            if (!string.IsNullOrEmpty(str))
+            {
+                // Check for [0-9]+
+                var firstChar = str[0];
+                if (firstChar >= '0' && firstChar <= '9' &&
+                    str.Skip(1).All(x => x >= '0' && x <= '9'))
+                {
+                    // Try parse
+                    if (Double.TryParse(str, NumberStyles.None, CultureInfo.InvariantCulture, out var doubleValue))
+                    {
+                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, doubleValue);
+                        return true;
+                    }
+
+                    // Otherwise exceeds range
+                    ThrowInvalidValue(scalar, c_integerTag); // throws
+                }
+                // Check for (-|+)[0-9]+
+                else if ((firstChar == '-' || firstChar == '+') &&
+                    str.Length > 1 &&
+                    str.Skip(1).All(x => x >= '0' && x <= '9'))
+                {
+                    // Try parse
+                    if (Double.TryParse(str, NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out var doubleValue))
+                    {
+                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, doubleValue);
+                        return true;
+                    }
+
+                    // Otherwise exceeds range
+                    ThrowInvalidValue(scalar, c_integerTag); // throws
+                }
+                // Check for 0x[0-9a-fA-F]+
+                else if (firstChar == '0' &&
+                    str.Length > 2 &&
+                    str[1] == 'x' &&
+                    str.Skip(2).All(x => (x >= '0' && x <= '9') || (x >= 'a' && x <= 'f') || (x >= 'A' && x <= 'F')))
+                {
+                    // Try parse
+                    if (Int32.TryParse(str.Substring(2), NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture, out var integerValue))
+                    {
+                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, integerValue);
+                        return true;
+                    }
+
+                    // Otherwise exceeds range
+                    ThrowInvalidValue(scalar, c_integerTag); // throws
+                }
+                // Check for 0o[0-9]+
+                else if (firstChar == '0' &&
+                    str.Length > 2 &&
+                    str[1] == 'o' &&
+                    str.Skip(2).All(x => x >= '0' && x <= '7'))
+                {
+                    // Try parse
+                    var integerValue = default(Int32);
+                    try
+                    {
+                        integerValue = Convert.ToInt32(str.Substring(2), 8);
+                    }
+                    // Otherwise exceeds range
+                    catch (Exception)
+                    {
+                        ThrowInvalidValue(scalar, c_integerTag); // throws
+                    }
+
+                    value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, integerValue);
+                    return true;
+                }
+            }
+
+            value = default;
+            return false;
+        }
+
+        private Boolean MatchNull(
+            Scalar scalar,
+            out NullToken value)
+        {
+            // YAML 1.2 "core" schema https://yaml.org/spec/1.2/spec.html#id2804923
+            switch (scalar.Value ?? string.Empty)
+            {
+                case "":
+                case "null":
+                case "Null":
+                case "NULL":
+                case "~":
+                    value = new NullToken(m_fileId, scalar.Start.Line, scalar.Start.Column);
+                    return true;
+            }
+
+            value = default;
+            return false;
+        }
+
+        private void ThrowInvalidValue(
+            Scalar scalar,
+            String tag)
+        {
+            throw new NotSupportedException($"The value '{scalar.Value}' on line {scalar.Start.Line} and column {scalar.Start.Column} is invalid for the type '{scalar.Tag}'");
+        }
+
+        private const String c_booleanTag = "tag:yaml.org,2002:bool";
+        private const String c_floatTag = "tag:yaml.org,2002:float";
+        private const String c_integerTag = "tag:yaml.org,2002:int";
+        private const String c_nullTag = "tag:yaml.org,2002:null";
+        private const String c_stringTag = "tag:yaml.org,2002:string";
+        private readonly Int32? m_fileId;
+        private readonly Parser m_parser;
+        private ParsingEvent m_current;
+    }
 }
 

src/Runner.Worker/ActionRunner.cs

@@ -141,7 +141,9 @@ namespace GitHub.Runner.Worker
 
             // Load the inputs.
             ExecutionContext.Debug("Loading inputs");
-            var templateEvaluator = ExecutionContext.ToPipelineTemplateEvaluator();
+            var templateTrace = ExecutionContext.ToTemplateTraceWriter();
+            var schema = new PipelineTemplateSchemaFactory().CreateSchema();
+            var templateEvaluator = new PipelineTemplateEvaluator(templateTrace, schema);
             var inputs = templateEvaluator.EvaluateStepInputs(Action.Inputs, ExecutionContext.ExpressionValues);
 
             foreach (KeyValuePair<string, string> input in inputs)
@@ -293,7 +295,8 @@ namespace GitHub.Runner.Worker
                 return displayName;
             }
             // Try evaluating fully
-            var templateEvaluator = context.ToPipelineTemplateEvaluator();
+            var schema = new PipelineTemplateSchemaFactory().CreateSchema();
+            var templateEvaluator = new PipelineTemplateEvaluator(context.ToTemplateTraceWriter(), schema);
             try
             {
                 didFullyEvaluate = templateEvaluator.TryEvaluateStepDisplayName(tokenToParse, contextData, out displayName);

src/Runner.Worker/ExecutionContext.cs

@@ -11,7 +11,6 @@ using GitHub.Runner.Worker.Container;
 using GitHub.Services.WebApi;
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.Pipelines.ContextData;
-using GitHub.DistributedTask.Pipelines.ObjectTemplating;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Common;
@@ -39,7 +38,6 @@ namespace GitHub.Runner.Worker
         string ContextName { get; }
         Task ForceCompleted { get; }
         TaskResult? Result { get; set; }
-        TaskResult? Outcome { get; set; }
         string ResultCode { get; set; }
         TaskResult? CommandResult { get; set; }
         CancellationToken CancellationToken { get; }
@@ -48,11 +46,9 @@ namespace GitHub.Runner.Worker
         PlanFeatures Features { get; }
         Variables Variables { get; }
         Dictionary<string, string> IntraActionState { get; }
-        IDictionary<String, IDictionary<String, String>> JobDefaults { get; }
+        HashSet<string> OutputVariables { get; }
-        Dictionary<string, VariableValue> JobOutputs { get; }
         IDictionary<String, String> EnvironmentVariables { get; }
         IDictionary<String, ContextScope> Scopes { get; }
-        IList<String> FileTable { get; }
         StepsContext StepsContext { get; }
         DictionaryContextData ExpressionValues { get; }
         List<string> PrependPath { get; }
@@ -112,6 +108,7 @@ namespace GitHub.Runner.Worker
         private readonly TimelineRecord _record = new TimelineRecord();
         private readonly Dictionary<Guid, TimelineRecord> _detailRecords = new Dictionary<Guid, TimelineRecord>();
         private readonly object _loggerLock = new object();
+        private readonly HashSet<string> _outputvariables = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         private readonly object _matchersLock = new object();
 
         private event OnMatcherChanged _onMatcherChanged;
@@ -141,11 +138,9 @@ namespace GitHub.Runner.Worker
         public List<ServiceEndpoint> Endpoints { get; private set; }
         public Variables Variables { get; private set; }
         public Dictionary<string, string> IntraActionState { get; private set; }
-        public IDictionary<String, IDictionary<String, String>> JobDefaults { get; private set; }
+        public HashSet<string> OutputVariables => _outputvariables;
-        public Dictionary<string, VariableValue> JobOutputs { get; private set; }
         public IDictionary<String, String> EnvironmentVariables { get; private set; }
         public IDictionary<String, ContextScope> Scopes { get; private set; }
-        public IList<String> FileTable { get; private set; }
         public StepsContext StepsContext { get; private set; }
         public DictionaryContextData ExpressionValues { get; } = new DictionaryContextData();
         public bool WriteDebug { get; private set; }
@@ -174,8 +169,6 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        public TaskResult? Outcome { get; set; }
-
         public TaskResult? CommandResult { get; set; }
 
         private string ContextType => _record.RecordType;
@@ -272,9 +265,7 @@ namespace GitHub.Runner.Worker
                 child.IntraActionState = intraActionState;
             }
             child.EnvironmentVariables = EnvironmentVariables;
-            child.JobDefaults = JobDefaults;
             child.Scopes = Scopes;
-            child.FileTable = FileTable;
             child.StepsContext = StepsContext;
             foreach (var pair in ExpressionValues)
             {
@@ -352,12 +343,6 @@ namespace GitHub.Runner.Worker
 
             _logger.End();
 
-            if (!string.IsNullOrEmpty(ContextName))
-            {
-                StepsContext.SetOutcome(ScopeName, ContextName, (Outcome ?? Result ?? TaskResult.Succeeded).ToActionResult().ToString());
-                StepsContext.SetConclusion(ScopeName, ContextName, (Result ?? TaskResult.Succeeded).ToActionResult().ToString());
-            }
-
             return Result.Value;
         }
 
@@ -568,12 +553,6 @@ namespace GitHub.Runner.Worker
             // Environment variables shared across all actions
             EnvironmentVariables = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer);
 
-            // Job defaults shared across all actions
-            JobDefaults = new Dictionary<string, IDictionary<string, string>>(StringComparer.OrdinalIgnoreCase);
-
-            // Job Outputs
-            JobOutputs = new Dictionary<string, VariableValue>(StringComparer.OrdinalIgnoreCase);
-
             // Service container info
             ServiceContainers = new List<ContainerInfo>();
 
@@ -590,9 +569,6 @@ namespace GitHub.Runner.Worker
                 }
             }
 
-            // File table
-            FileTable = new List<String>(message.FileTable ?? new string[0]);
-
             // Expression functions
             if (Variables.GetBoolean("System.HashFilesV2") == true)
             {
@@ -616,13 +592,8 @@ namespace GitHub.Runner.Worker
             var githubAccessToken = new StringContextData(Variables.Get("system.github.token"));
             var base64EncodedToken = Convert.ToBase64String(Encoding.UTF8.GetBytes($"x-access-token:{githubAccessToken}"));
             HostContext.SecretMasker.AddValue(base64EncodedToken);
-            var githubJob = Variables.Get("system.github.job");
             var githubContext = new GitHubContext();
             githubContext["token"] = githubAccessToken;
-            if (!string.IsNullOrEmpty(githubJob))
-            {
-                githubContext["job"] = new StringContextData(githubJob);
-            }
             var githubDictionary = ExpressionValues["github"].AssertDictionary("github");
             foreach (var pair in githubDictionary)
             {
@@ -758,7 +729,7 @@ namespace GitHub.Runner.Worker
                 var owners = config.Matchers.Select(x => $"'{x.Owner}'");
                 var joinedOwners = string.Join(", ", owners);
                 // todo: loc
-                this.Debug($"Added matchers: {joinedOwners}. Problem matchers scan action output for known warning or error strings and report these inline.");
+                this.Output($"Added matchers: {joinedOwners}. Problem matchers scan action output for known warning or error strings and report these inline.");
             }
         }
 
@@ -800,7 +771,7 @@ namespace GitHub.Runner.Worker
                 owners = removedMatchers.Select(x => $"'{x.Owner}'");
                 var joinedOwners = string.Join(", ", owners);
                 // todo: loc
-                this.Debug($"Removed matchers: {joinedOwners}");
+                this.Output($"Removed matchers: {joinedOwners}");
             }
         }
 
@@ -915,13 +886,6 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        public static PipelineTemplateEvaluator ToPipelineTemplateEvaluator(this IExecutionContext context)
-        {
-            var templateTrace = context.ToTemplateTraceWriter();
-            var schema = new PipelineTemplateSchemaFactory().CreateSchema();
-            return new PipelineTemplateEvaluator(templateTrace, schema, context.FileTable);
-        }
-
         public static ObjectTemplating.ITraceWriter ToTemplateTraceWriter(this IExecutionContext context)
         {
             return new TemplateTraceWriter(context);

src/Runner.Worker/GitHubContext.cs

@@ -14,7 +14,6 @@ namespace GitHub.Runner.Worker
             "event_name",
             "event_path",
             "head_ref",
-            "job",
             "ref",
             "repository",
             "run_id",

src/Runner.Worker/Handlers/ScriptHandler.cs

@@ -58,21 +58,12 @@ namespace GitHub.Runner.Worker.Handlers
             string shellCommandPath = null;
             bool validateShellOnHost = !(StepHost is ContainerStepHost);
             string prependPath = string.Join(Path.PathSeparator.ToString(), ExecutionContext.PrependPath.Reverse<string>());
-            string shell = null;
+            Inputs.TryGetValue("shell", out var shell);
-            if (!Inputs.TryGetValue("shell", out shell) || string.IsNullOrEmpty(shell))
-            {
-                // TODO: figure out how defaults interact with template later
-                // for now, we won't check job.defaults if we are inside a template.
-                if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.JobDefaults.TryGetValue("run", out var runDefaults))
-                {
-                    runDefaults.TryGetValue("shell", out shell);
-                }
-            }
             if (string.IsNullOrEmpty(shell))
             {
 #if OS_WINDOWS
                 shellCommand = "pwsh";
-                if (validateShellOnHost)
+                if(validateShellOnHost)
                 {
                     shellCommandPath = WhichUtil.Which(shellCommand, require: false, Trace, prependPath);
                     if (string.IsNullOrEmpty(shellCommandPath))
@@ -148,36 +139,11 @@ namespace GitHub.Runner.Worker.Handlers
             Inputs.TryGetValue("script", out var contents);
             contents = contents ?? string.Empty;
 
-            string workingDirectory = null;
+            Inputs.TryGetValue("workingDirectory", out var workingDirectory);
-            if (!Inputs.TryGetValue("workingDirectory", out workingDirectory))
-            {
-                // TODO: figure out how defaults interact with template later
-                // for now, we won't check job.defaults if we are inside a template.
-                if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.JobDefaults.TryGetValue("run", out var runDefaults))
-                {
-                    if (runDefaults.TryGetValue("working-directory", out workingDirectory))
-                    {
-                        ExecutionContext.Debug("Overwrite 'working-directory' base on job defaults.");
-                    }
-                }
-            }
             var workspaceDir = githubContext["workspace"] as StringContextData;
             workingDirectory = Path.Combine(workspaceDir, workingDirectory ?? string.Empty);
 
-            string shell = null;
+            Inputs.TryGetValue("shell", out var shell);
-            if (!Inputs.TryGetValue("shell", out shell) || string.IsNullOrEmpty(shell))
-            {
-                // TODO: figure out how defaults interact with template later
-                // for now, we won't check job.defaults if we are inside a template.
-                if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.JobDefaults.TryGetValue("run", out var runDefaults))
-                {
-                    if (runDefaults.TryGetValue("shell", out shell))
-                    {
-                        ExecutionContext.Debug("Overwrite 'shell' base on job defaults.");
-                    }
-                }
-            }
-
             var isContainerStepHost = StepHost is ContainerStepHost;
 
             string prependPath = string.Join(Path.PathSeparator.ToString(), ExecutionContext.PrependPath.Reverse<string>());

src/Runner.Worker/JobExtension.cs

@@ -3,11 +3,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.Expressions2;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.Pipelines.ObjectTemplating;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
@@ -17,16 +14,6 @@ using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Worker
 {
-    [DataContract]
-    public class SetupInfo
-    {
-        [DataMember]
-        public string Group { get; set; }
-
-        [DataMember]
-        public string Detail { get; set; }
-    }
-
     [ServiceLocator(Default = typeof(JobExtension))]
 
     public interface IJobExtension : IRunnerService
@@ -62,44 +49,6 @@ namespace GitHub.Runner.Worker
                     context.Start();
                     context.Debug($"Starting: Set up job");
                     context.Output($"Current runner version: '{BuildConstants.RunnerPackage.Version}'");
-
-                    var setupInfoFile = HostContext.GetConfigFile(WellKnownConfigFile.SetupInfo);
-                    if (File.Exists(setupInfoFile))
-                    {
-                        Trace.Info($"Load machine setup info from {setupInfoFile}");
-                        try
-                        {
-                            var setupInfo = IOUtil.LoadObject<List<SetupInfo>>(setupInfoFile);
-                            if (setupInfo?.Count > 0)
-                            {
-                                foreach (var info in setupInfo)
-                                {
-                                    if (!string.IsNullOrEmpty(info?.Detail))
-                                    {
-                                        var groupName = info.Group;
-                                        if (string.IsNullOrEmpty(groupName))
-                                        {
-                                            groupName = "Machine Setup Info";
-                                        }
-
-                                        context.Output($"##[group]{groupName}");
-                                        var multiLines = info.Detail.Replace("\r\n", "\n").TrimEnd('\n').Split('\n');
-                                        foreach (var line in multiLines)
-                                        {
-                                            context.Output(line);
-                                        }
-                                        context.Output("##[endgroup]");
-                                    }
-                                }
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            context.Output($"Fail to load and print machine setup info: {ex.Message}");
-                            Trace.Error(ex);
-                        }
-                    }
-
                     var repoFullName = context.GetGitHubContext("repository");
                     ArgUtil.NotNull(repoFullName, nameof(repoFullName));
                     context.Debug($"Primary repository: {repoFullName}");
@@ -129,7 +78,9 @@ namespace GitHub.Runner.Worker
 
                     // Evaluate the job-level environment variables
                     context.Debug("Evaluating job-level environment variables");
-                    var templateEvaluator = context.ToPipelineTemplateEvaluator();
+                    var templateTrace = context.ToTemplateTraceWriter();
+                    var schema = new PipelineTemplateSchemaFactory().CreateSchema();
+                    var templateEvaluator = new PipelineTemplateEvaluator(templateTrace, schema);
                     foreach (var token in message.EnvironmentVariables)
                     {
                         var environmentVariables = templateEvaluator.EvaluateStepEnvironment(token, jobContext.ExpressionValues, VarUtil.EnvironmentVariableKeyComparer);
@@ -161,26 +112,6 @@ namespace GitHub.Runner.Worker
                         }
                     }
 
-                    // Evaluate the job defaults
-                    context.Debug("Evaluating job defaults");
-                    foreach (var token in message.Defaults)
-                    {
-                        var defaults = token.AssertMapping("defaults");
-                        if (defaults.Any(x => string.Equals(x.Key.AssertString("defaults key").Value, "run", StringComparison.OrdinalIgnoreCase)))
-                        {
-                            context.JobDefaults["run"] = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                            var defaultsRun = defaults.First(x => string.Equals(x.Key.AssertString("defaults key").Value, "run", StringComparison.OrdinalIgnoreCase));
-                            var jobDefaults = templateEvaluator.EvaluateJobDefaultsRun(defaultsRun.Value, jobContext.ExpressionValues);
-                            foreach (var pair in jobDefaults)
-                            {
-                                if (!string.IsNullOrEmpty(pair.Value))
-                                {
-                                    context.JobDefaults["run"][pair.Key] = pair.Value;
-                                }
-                            }
-                        }
-                    }
-
                     // Build up 2 lists of steps, pre-job, job
                     // Download actions not already in the cache
                     Trace.Info("Downloading actions");
@@ -313,58 +244,6 @@ namespace GitHub.Runner.Worker
                     context.Start();
                     context.Debug("Starting: Complete job");
 
-                    // Evaluate job outputs
-                    if (message.JobOutputs != null && message.JobOutputs.Type != TokenType.Null)
-                    {
-                        try
-                        {
-                            context.Output($"Evaluate and set job outputs");
-
-                            // Populate env context for each step
-                            Trace.Info("Initialize Env context for evaluating job outputs");
-#if OS_WINDOWS
-                            var envContext = new DictionaryContextData();
-#else
-                            var envContext = new CaseSensitiveDictionaryContextData();
-#endif
-                            context.ExpressionValues["env"] = envContext;
-                            foreach (var pair in context.EnvironmentVariables)
-                            {
-                                envContext[pair.Key] = new StringContextData(pair.Value ?? string.Empty);
-                            }
-
-                            Trace.Info("Initialize steps context for evaluating job outputs");
-                            context.ExpressionValues["steps"] = context.StepsContext.GetScope(context.ScopeName);
-
-                            var templateEvaluator = context.ToPipelineTemplateEvaluator();
-                            var outputs = templateEvaluator.EvaluateJobOutput(message.JobOutputs, context.ExpressionValues);
-                            foreach (var output in outputs)
-                            {
-                                if (string.IsNullOrEmpty(output.Value))
-                                {
-                                    context.Debug($"Skip output '{output.Key}' since it's empty");
-                                    continue;
-                                }
-
-                                if (!string.Equals(output.Value, HostContext.SecretMasker.MaskSecrets(output.Value)))
-                                {
-                                    context.Warning($"Skip output '{output.Key}' since it may contain secret.");
-                                    continue;
-                                }
-
-                                context.Output($"Set output '{output.Key}'");
-                                jobContext.JobOutputs[output.Key] = output.Value;
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            context.Result = TaskResult.Failed;
-                            context.Error($"Fail to evaluate job outputs");
-                            context.Error(ex);
-                            jobContext.Result = TaskResultUtil.MergeTaskResults(jobContext.Result, TaskResult.Failed);
-                        }
-                    }
-
                     if (context.Variables.GetBoolean(Constants.Variables.Actions.RunnerDebug) ?? false)
                     {
                         Trace.Info("Support log upload starting.");

src/Runner.Worker/JobRunner.cs

@@ -231,7 +231,7 @@ namespace GitHub.Runner.Worker
             }
 
             Trace.Info("Raising job completed event.");
-            var jobCompletedEvent = new JobCompletedEvent(message.RequestId, message.JobId, result, jobContext.JobOutputs);
+            var jobCompletedEvent = new JobCompletedEvent(message.RequestId, message.JobId, result);
 
             var completeJobRetryLimit = 5;
             var exceptions = new List<Exception>();

src/Runner.Worker/StepsContext.cs

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

src/Runner.Worker/StepsRunner.cs

@@ -98,7 +98,9 @@ namespace GitHub.Runner.Worker
                         step.ExecutionContext.SetGitHubContext("action", actionStep.Action.Name);
 
                         // Evaluate and merge action's env block to env context
-                        var templateEvaluator = step.ExecutionContext.ToPipelineTemplateEvaluator();
+                        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)
                         {
@@ -245,7 +247,7 @@ namespace GitHub.Runner.Worker
 
             // Set the timeout
             var timeoutMinutes = 0;
-            var templateEvaluator = step.ExecutionContext.ToPipelineTemplateEvaluator();
+            var templateEvaluator = CreateTemplateEvaluator(step.ExecutionContext);
             try
             {
                 timeoutMinutes = templateEvaluator.EvaluateStepTimeout(step.Timeout, step.ExecutionContext.ExpressionValues);
@@ -351,7 +353,6 @@ namespace GitHub.Runner.Worker
 
                 if (continueOnError)
                 {
-                    step.ExecutionContext.Outcome = step.ExecutionContext.Result;
                     step.ExecutionContext.Result = TaskResult.Succeeded;
                     Trace.Info($"Updated step result (continue on error)");
                 }
@@ -388,7 +389,7 @@ namespace GitHub.Runner.Worker
                     executionContext.Debug($"Initializing scope '{scope.Name}'");
                     executionContext.ExpressionValues["steps"] = stepsContext.GetScope(scope.ParentName);
                     executionContext.ExpressionValues["inputs"] = !String.IsNullOrEmpty(scope.ParentName) ? scopeInputs[scope.ParentName] : null;
-                    var templateEvaluator = executionContext.ToPipelineTemplateEvaluator();
+                    var templateEvaluator = CreateTemplateEvaluator(executionContext);
                     var inputs = default(DictionaryContextData);
                     try
                     {
@@ -444,7 +445,7 @@ namespace GitHub.Runner.Worker
                     executionContext.Debug($"Finalizing scope '{scope.Name}'");
                     executionContext.ExpressionValues["steps"] = stepsContext.GetScope(scope.Name);
                     executionContext.ExpressionValues["inputs"] = null;
-                    var templateEvaluator = executionContext.ToPipelineTemplateEvaluator();
+                    var templateEvaluator = CreateTemplateEvaluator(executionContext);
                     var outputs = default(DictionaryContextData);
                     try
                     {
@@ -476,5 +477,12 @@ namespace GitHub.Runner.Worker
 
             executionContext.Complete(result, resultCode: resultCode);
         }
+
+        private PipelineTemplateEvaluator CreateTemplateEvaluator(IExecutionContext executionContext)
+        {
+            var templateTrace = executionContext.ToTemplateTraceWriter();
+            var schema = new PipelineTemplateSchemaFactory().CreateSchema();
+            return new PipelineTemplateEvaluator(templateTrace, schema);
+        }
     }
 }

src/Runner.Worker/action_yaml.json

@@ -90,8 +90,10 @@
                 "github",
                 "strategy",
                 "matrix",
+                "steps",
                 "job",
-                "runner"
+                "runner",
+                "env"
             ],
             "string": {}
         },

src/Sdk/DTExpressions2/Expressions2/ExpressionConstants.cs

@@ -15,7 +15,6 @@ namespace GitHub.DistributedTask.Expressions2
             AddFunction<Join>("join", 1, 2);
             AddFunction<StartsWith>("startsWith", 2, 2);
             AddFunction<ToJson>("toJson", 1, 1);
-            AddFunction<FromJson>("fromJson", 1, 1);
             AddFunction<HashFiles>("hashFiles", 1, 1);
         }
 

src/Sdk/DTExpressions2/Expressions2/Sdk/Functions/FromJson.cs

@@ -1,24 +0,0 @@
-using System;
-using System.IO;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace GitHub.DistributedTask.Expressions2.Sdk.Functions
-{
-    internal sealed class FromJson : Function
-    {
-        protected sealed override Object EvaluateCore(
-            EvaluationContext context,
-            out ResultMemory resultMemory)
-        {
-            resultMemory = null;
-            var json = Parameters[0].Evaluate(context).ConvertToString();
-            using (var stringReader = new StringReader(json))
-            using (var jsonReader = new JsonTextReader(stringReader) { DateParseHandling = DateParseHandling.None, FloatParseHandling = FloatParseHandling.Double })
-            {
-                var token = JToken.ReadFrom(jsonReader);
-                return token.ToPipelineContextData();
-            }
-        }
-    }}

src/Sdk/DTGenerated/Generated/TaskAgentHttpClientBase.cs

@@ -779,65 +779,5 @@ namespace GitHub.DistributedTask.WebApi
                 userState: userState,
                 cancellationToken: cancellationToken);
         }
-
-        /// <summary>
-        /// [Preview API]
-        /// </summary>
-        /// <param name="poolId"></param>
-        /// <param name="agentId"></param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        public Task<String> GetAgentAuthUrlAsync(
-            int poolId,
-            int agentId,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("GET");
-            Guid locationId = new Guid("a82a119c-1e46-44b6-8d75-c82a79cf975b");
-            object routeValues = new { poolId = poolId, agentId = agentId };
-
-            return SendAsync<String>(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                userState: userState,
-                cancellationToken: cancellationToken);
-        }
-
-        /// <summary>
-        /// [Preview API]
-        /// </summary>
-        /// <param name="poolId"></param>
-        /// <param name="agentId"></param>
-        /// <param name="error"></param>
-        /// <param name="userState"></param>
-        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public virtual async Task ReportAgentAuthUrlMigrationErrorAsync(
-            int poolId,
-            int agentId,
-            string error,
-            object userState = null,
-            CancellationToken cancellationToken = default)
-        {
-            HttpMethod httpMethod = new HttpMethod("POST");
-            Guid locationId = new Guid("a82a119c-1e46-44b6-8d75-c82a79cf975b");
-            object routeValues = new { poolId = poolId, agentId = agentId };
-            HttpContent content = new ObjectContent<string>(error, new VssJsonMediaTypeFormatter(true));
-
-            using (HttpResponseMessage response = await SendAsync(
-                httpMethod,
-                locationId,
-                routeValues: routeValues,
-                version: new ApiResourceVersion(6.0, 1),
-                userState: userState,
-                cancellationToken: cancellationToken,
-                content: content).ConfigureAwait(false))
-            {
-                return;
-            }
-        }
     }
 }

src/Sdk/DTObjectTemplating/ObjectTemplating/Schema/MappingDefinition.cs

@@ -30,7 +30,8 @@ namespace GitHub.DistributedTask.ObjectTemplating.Schema
                                     foreach (var propertiesPair in properties)
                                     {
                                         var propertyName = propertiesPair.Key.AssertString($"{TemplateConstants.Definition} {TemplateConstants.Mapping} {TemplateConstants.Properties} key");
-                                        Properties.Add(propertyName.Value, new PropertyValue(propertiesPair.Value));
+                                        var propertyValue = propertiesPair.Value.AssertString($"{TemplateConstants.Definition} {TemplateConstants.Mapping} {TemplateConstants.Properties} value");
+                                        Properties.Add(propertyName.Value, new PropertyValue(propertyValue.Value));
                                     }
                                     break;
 
@@ -84,7 +85,7 @@ namespace GitHub.DistributedTask.ObjectTemplating.Schema
                 }
                 else
                 {
-                    throw new ArgumentException($"Property '{TemplateConstants.LooseKeyType}' is defined but '{TemplateConstants.LooseValueType}' is not defined on '{name}'");
+                    throw new ArgumentException($"Property '{TemplateConstants.LooseKeyType}' is defined but '{TemplateConstants.LooseValueType}' is not defined");
                 }
             }
             // Otherwise validate loose value type not be defined
@@ -94,14 +95,9 @@ namespace GitHub.DistributedTask.ObjectTemplating.Schema
             }
 
             // Lookup each property
-            foreach (var property in Properties)
+            foreach (var property in Properties.Values)
             {
-                if (String.IsNullOrEmpty(property.Value.Type))
+                schema.GetDefinition(property.Type);
-                {
-                    throw new ArgumentException($"Type not specified for the '{property.Key}' property on the '{name}' type");
-                }
-
-                schema.GetDefinition(property.Value.Type);
             }
 
             if (!String.IsNullOrEmpty(Inherits))

src/Sdk/DTObjectTemplating/ObjectTemplating/Schema/PropertyValue.cs

@@ -1,40 +1,18 @@
 using System;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
 
 namespace GitHub.DistributedTask.ObjectTemplating.Schema
 {
     internal sealed class PropertyValue
     {
-        internal PropertyValue(TemplateToken token)
+        internal PropertyValue()
         {
-            if (token is StringToken stringToken)
-            {
-                Type = stringToken.Value;
         }
-            else
+
+        internal PropertyValue(String type)
         {
-                var mapping = token.AssertMapping($"{TemplateConstants.MappingPropertyValue}");
+            Type = type;
-                foreach (var mappingPair in mapping)
-                {
-                    var mappingKey = mappingPair.Key.AssertString($"{TemplateConstants.MappingPropertyValue} key");
-                    switch (mappingKey.Value)
-                    {
-                        case TemplateConstants.Type:
-                            Type = mappingPair.Value.AssertString($"{TemplateConstants.MappingPropertyValue} {TemplateConstants.Type}").Value;
-                            break;
-                        case TemplateConstants.Required:
-                            Required = mappingPair.Value.AssertBoolean($"{TemplateConstants.MappingPropertyValue} {TemplateConstants.Required}").Value;
-                            break;
-                        default:
-                            mappingKey.AssertUnexpectedValue($"{TemplateConstants.MappingPropertyValue} key");
-                            break;
-                    }
-                }
-            }
         }
 
         internal String Type { get; set; }
-
-        internal Boolean Required { get; set; }
     }
 }

src/Sdk/DTObjectTemplating/ObjectTemplating/Schema/TemplateSchema.cs

@@ -312,8 +312,8 @@ namespace GitHub.DistributedTask.ObjectTemplating.Schema
 
                     // template-schema
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Version, new PropertyValue(new StringToken(null, null, null, TemplateConstants.NonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Version, new PropertyValue(TemplateConstants.NonEmptyString));
-                    mappingDefinition.Properties.Add(TemplateConstants.Definitions, new PropertyValue(new StringToken(null, null, null, TemplateConstants.Definitions)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Definitions, new PropertyValue(TemplateConstants.Definitions));
                     schema.Definitions.Add(TemplateConstants.TemplateSchema, mappingDefinition);
 
                     // definitions
@@ -335,9 +335,9 @@ namespace GitHub.DistributedTask.ObjectTemplating.Schema
 
                     // null-definition
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(new StringToken(null, null, null, TemplateConstants.String)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(TemplateConstants.String));
-                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(new StringToken(null, null, null, TemplateConstants.SequenceOfNonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(TemplateConstants.SequenceOfNonEmptyString));
-                    mappingDefinition.Properties.Add(TemplateConstants.Null, new PropertyValue(new StringToken(null, null, null, TemplateConstants.NullDefinitionProperties)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Null, new PropertyValue(TemplateConstants.NullDefinitionProperties));
                     schema.Definitions.Add(TemplateConstants.NullDefinition, mappingDefinition);
 
                     // null-definition-properties
@@ -346,9 +346,9 @@ namespace GitHub.DistributedTask.ObjectTemplating.Schema
 
                     // boolean-definition
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(new StringToken(null, null, null, TemplateConstants.String)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(TemplateConstants.String));
-                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(new StringToken(null, null, null, TemplateConstants.SequenceOfNonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(TemplateConstants.SequenceOfNonEmptyString));
-                    mappingDefinition.Properties.Add(TemplateConstants.Boolean, new PropertyValue(new StringToken(null, null, null, TemplateConstants.BooleanDefinitionProperties)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Boolean, new PropertyValue(TemplateConstants.BooleanDefinitionProperties));
                     schema.Definitions.Add(TemplateConstants.BooleanDefinition, mappingDefinition);
 
                     // boolean-definition-properties
@@ -357,9 +357,9 @@ namespace GitHub.DistributedTask.ObjectTemplating.Schema
 
                     // number-definition
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(new StringToken(null, null, null, TemplateConstants.String)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(TemplateConstants.String));
-                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(new StringToken(null, null, null, TemplateConstants.SequenceOfNonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(TemplateConstants.SequenceOfNonEmptyString));
-                    mappingDefinition.Properties.Add(TemplateConstants.Number, new PropertyValue(new StringToken(null, null, null, TemplateConstants.NumberDefinitionProperties)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Number, new PropertyValue(TemplateConstants.NumberDefinitionProperties));
                     schema.Definitions.Add(TemplateConstants.NumberDefinition, mappingDefinition);
 
                     // number-definition-properties
@@ -368,68 +368,55 @@ namespace GitHub.DistributedTask.ObjectTemplating.Schema
 
                     // string-definition
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(new StringToken(null, null, null, TemplateConstants.String)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(TemplateConstants.String));
-                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(new StringToken(null, null, null, TemplateConstants.SequenceOfNonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(TemplateConstants.SequenceOfNonEmptyString));
-                    mappingDefinition.Properties.Add(TemplateConstants.String, new PropertyValue(new StringToken(null, null, null, TemplateConstants.StringDefinitionProperties)));
+                    mappingDefinition.Properties.Add(TemplateConstants.String, new PropertyValue(TemplateConstants.StringDefinitionProperties));
                     schema.Definitions.Add(TemplateConstants.StringDefinition, mappingDefinition);
 
                     // string-definition-properties
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Constant, new PropertyValue(new StringToken(null, null, null, TemplateConstants.NonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Constant, new PropertyValue(TemplateConstants.NonEmptyString));
-                    mappingDefinition.Properties.Add(TemplateConstants.IgnoreCase, new PropertyValue(new StringToken(null, null, null,TemplateConstants.Boolean)));
+                    mappingDefinition.Properties.Add(TemplateConstants.IgnoreCase, new PropertyValue(TemplateConstants.Boolean));
-                    mappingDefinition.Properties.Add(TemplateConstants.RequireNonEmpty, new PropertyValue(new StringToken(null, null, null, TemplateConstants.Boolean)));
+                    mappingDefinition.Properties.Add(TemplateConstants.RequireNonEmpty, new PropertyValue(TemplateConstants.Boolean));
                     schema.Definitions.Add(TemplateConstants.StringDefinitionProperties, mappingDefinition);
 
                     // sequence-definition
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(new StringToken(null, null, null, TemplateConstants.String)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(TemplateConstants.String));
-                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(new StringToken(null, null, null, TemplateConstants.SequenceOfNonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(TemplateConstants.SequenceOfNonEmptyString));
-                    mappingDefinition.Properties.Add(TemplateConstants.Sequence, new PropertyValue(new StringToken(null, null, null, TemplateConstants.SequenceDefinitionProperties)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Sequence, new PropertyValue(TemplateConstants.SequenceDefinitionProperties));
                     schema.Definitions.Add(TemplateConstants.SequenceDefinition, mappingDefinition);
 
                     // sequence-definition-properties
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.ItemType, new PropertyValue(new StringToken(null, null, null, TemplateConstants.NonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.ItemType, new PropertyValue(TemplateConstants.NonEmptyString));
                     schema.Definitions.Add(TemplateConstants.SequenceDefinitionProperties, mappingDefinition);
 
                     // mapping-definition
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(new StringToken(null, null, null, TemplateConstants.String)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(TemplateConstants.String));
-                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(new StringToken(null, null, null, TemplateConstants.SequenceOfNonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(TemplateConstants.SequenceOfNonEmptyString));
-                    mappingDefinition.Properties.Add(TemplateConstants.Mapping, new PropertyValue(new StringToken(null, null, null, TemplateConstants.MappingDefinitionProperties)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Mapping, new PropertyValue(TemplateConstants.MappingDefinitionProperties));
                     schema.Definitions.Add(TemplateConstants.MappingDefinition, mappingDefinition);
 
                     // mapping-definition-properties
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Properties, new PropertyValue(new StringToken(null, null, null, TemplateConstants.Properties)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Properties, new PropertyValue(TemplateConstants.Properties));
-                    mappingDefinition.Properties.Add(TemplateConstants.LooseKeyType, new PropertyValue(new StringToken(null, null, null, TemplateConstants.NonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.LooseKeyType, new PropertyValue(TemplateConstants.NonEmptyString));
-                    mappingDefinition.Properties.Add(TemplateConstants.LooseValueType, new PropertyValue(new StringToken(null, null, null, TemplateConstants.NonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.LooseValueType, new PropertyValue(TemplateConstants.NonEmptyString));
                     schema.Definitions.Add(TemplateConstants.MappingDefinitionProperties, mappingDefinition);
 
                     // properties
                     mappingDefinition = new MappingDefinition();
                     mappingDefinition.LooseKeyType = TemplateConstants.NonEmptyString;
-                    mappingDefinition.LooseValueType = TemplateConstants.PropertyValue;
+                    mappingDefinition.LooseValueType = TemplateConstants.NonEmptyString;
                     schema.Definitions.Add(TemplateConstants.Properties, mappingDefinition);
 
-                    // property-value
-                    oneOfDefinition = new OneOfDefinition();
-                    oneOfDefinition.OneOf.Add(TemplateConstants.NonEmptyString);
-                    oneOfDefinition.OneOf.Add(TemplateConstants.MappingPropertyValue);
-                    schema.Definitions.Add(TemplateConstants.PropertyValue, oneOfDefinition);
-
-                    // mapping-property-value
-                    mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Type, new PropertyValue(new StringToken(null, null, null, TemplateConstants.NonEmptyString)));
-                    mappingDefinition.Properties.Add(TemplateConstants.Required, new PropertyValue(new StringToken(null, null, null, TemplateConstants.Boolean)));
-                    schema.Definitions.Add(TemplateConstants.MappingPropertyValue, mappingDefinition);
-
-
                     // one-of-definition
                     mappingDefinition = new MappingDefinition();
-                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(new StringToken(null, null, null, TemplateConstants.String)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Description, new PropertyValue(TemplateConstants.String));
-                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(new StringToken(null, null, null, TemplateConstants.SequenceOfNonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.Context, new PropertyValue(TemplateConstants.SequenceOfNonEmptyString));
-                    mappingDefinition.Properties.Add(TemplateConstants.OneOf, new PropertyValue(new StringToken(null, null, null, TemplateConstants.SequenceOfNonEmptyString)));
+                    mappingDefinition.Properties.Add(TemplateConstants.OneOf, new PropertyValue(TemplateConstants.SequenceOfNonEmptyString));
                     schema.Definitions.Add(TemplateConstants.OneOfDefinition, mappingDefinition);
 
                     // non-empty-string

src/Sdk/DTObjectTemplating/ObjectTemplating/TemplateConstants.cs

@@ -22,11 +22,9 @@ namespace GitHub.DistributedTask.ObjectTemplating
         internal const String ItemType = "item-type";
         internal const String LooseKeyType = "loose-key-type";
         internal const String LooseValueType = "loose-value-type";
-        internal const String MaxConstant = "MAX";
         internal const String Mapping = "mapping";
         internal const String MappingDefinition = "mapping-definition";
         internal const String MappingDefinitionProperties = "mapping-definition-properties";
-        internal const String MappingPropertyValue = "mapping-property-value";
         internal const String NonEmptyString = "non-empty-string";
         internal const String Null = "null";
         internal const String NullDefinition = "null-definition";
@@ -37,9 +35,7 @@ namespace GitHub.DistributedTask.ObjectTemplating
         internal const String OneOf = "one-of";
         internal const String OneOfDefinition = "one-of-definition";
         internal const String OpenExpression = "${{";
-        internal const String PropertyValue = "property-value";
         internal const String Properties = "properties";
-        internal const String Required = "required";
         internal const String RequireNonEmpty = "require-non-empty";
         internal const String Scalar = "scalar";
         internal const String ScalarDefinition = "scalar-definition";
@@ -47,7 +43,6 @@ namespace GitHub.DistributedTask.ObjectTemplating
         internal const String Sequence = "sequence";
         internal const String SequenceDefinition = "sequence-definition";
         internal const String SequenceDefinitionProperties = "sequence-definition-properties";
-        internal const String Type = "type";
         internal const String SequenceOfNonEmptyString = "sequence-of-non-empty-string";
         internal const String String = "string";
         internal const String StringDefinition = "string-definition";

src/Sdk/DTObjectTemplating/ObjectTemplating/TemplateContext.cs

@@ -184,7 +184,6 @@ namespace GitHub.DistributedTask.ObjectTemplating
                 id = FileIds.Count + 1;
                 FileIds.Add(file, id);
                 FileNames.Add(file);
-                Memory.AddBytes(file);
             }
 
             return id;
@@ -192,12 +191,7 @@ namespace GitHub.DistributedTask.ObjectTemplating
 
         internal String GetFileName(Int32 fileId)
         {
-            return FileNames.Count >= fileId ? FileNames[fileId - 1] : null;
+            return FileNames[fileId - 1];
-        }
-
-        internal IReadOnlyList<String> GetFileTable()
-        {
-            return FileNames.AsReadOnly();
         }
 
         private String GetErrorPrefix(
@@ -205,9 +199,9 @@ namespace GitHub.DistributedTask.ObjectTemplating
             Int32? line,
             Int32? column)
         {
-            var fileName = fileId.HasValue ? GetFileName(fileId.Value) : null;
+            if (fileId != null)
-            if (!String.IsNullOrEmpty(fileName))
             {
+                var fileName = GetFileName(fileId.Value);
                 if (line != null && column != null)
                 {
                     return $"{fileName} {TemplateStrings.LineColumn(line, column)}:";

src/Sdk/DTObjectTemplating/ObjectTemplating/TemplateEvaluator.cs

@@ -47,7 +47,7 @@ namespace GitHub.DistributedTask.ObjectTemplating
             var evaluator = new TemplateEvaluator(context, template, removeBytes);
             try
             {
-                var availableContext = new HashSet<String>(context.ExpressionValues.Keys.Concat(context.ExpressionFunctions.Select(x => $"{x.Name}({x.MinParameters},{x.MaxParameters})")));
+                var availableContext = new HashSet<String>(context.ExpressionValues.Keys);
                 var definitionInfo = new DefinitionInfo(context.Schema, type, availableContext);
                 result = evaluator.Evaluate(definitionInfo);
 
@@ -182,14 +182,12 @@ namespace GitHub.DistributedTask.ObjectTemplating
             }
 
             var keys = new HashSet<String>(StringComparer.OrdinalIgnoreCase);
-            var hasExpressionKey = false;
 
             while (m_unraveler.AllowScalar(definition.Expand, out ScalarToken nextKeyScalar))
             {
                 // Expression
                 if (nextKeyScalar is ExpressionToken)
                 {
-                    hasExpressionKey = true;
                     var anyDefinition = new DefinitionInfo(definition, TemplateConstants.Any);
                     mapping.Add(nextKeyScalar, Evaluate(anyDefinition));
                     continue;
@@ -270,19 +268,6 @@ namespace GitHub.DistributedTask.ObjectTemplating
                 String listToDeDuplicate = String.Join(", ", nonDuplicates);
                 m_context.Error(mapping, TemplateStrings.UnableToDetermineOneOf(listToDeDuplicate));
             }
-            else if (mappingDefinitions.Count == 1 && !hasExpressionKey)
-            {
-                foreach (var property in mappingDefinitions[0].Properties)
-                {
-                    if (property.Value.Required)
-                    {
-                        if (!keys.Contains(property.Key))
-                        {
-                            m_context.Error(mapping, $"Required property is missing: {property.Key}");
-                        }
-                    }
-                }
-            }
 
             m_unraveler.ReadMappingEnd();
         }

src/Sdk/DTObjectTemplating/ObjectTemplating/TemplateReader.cs

@@ -178,15 +178,14 @@ namespace GitHub.DistributedTask.ObjectTemplating
             }
 
             var keys = new HashSet<String>(StringComparer.OrdinalIgnoreCase);
-            var hasExpressionKey = false;
 
             while (m_objectReader.AllowLiteral(out LiteralToken rawLiteral))
             {
                 var nextKeyScalar = ParseScalar(rawLiteral, definition.AllowedContext);
+
                 // Expression
                 if (nextKeyScalar is ExpressionToken)
                 {
-                    hasExpressionKey = true;
                     // Legal
                     if (definition.AllowedContext.Length > 0)
                     {
@@ -281,19 +280,7 @@ namespace GitHub.DistributedTask.ObjectTemplating
                 String listToDeDuplicate = String.Join(", ", nonDuplicates);
                 m_context.Error(mapping, TemplateStrings.UnableToDetermineOneOf(listToDeDuplicate));
             }
-            else if (mappingDefinitions.Count == 1 && !hasExpressionKey)
+
-            {
-                foreach (var property in mappingDefinitions[0].Properties)
-                {
-                    if (property.Value.Required)
-                    {
-                        if (!keys.Contains(property.Key))
-                        {
-                            m_context.Error(mapping, $"Required property is missing: {property.Key}");
-                        }
-                    }
-                }
-            }
             ExpectMappingEnd();
         }
 

src/Sdk/DTObjectTemplating/ObjectTemplating/Tokens/TemplateToken.cs

@@ -30,14 +30,14 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
             Column = column;
         }
 
-        [DataMember(Name = "file", EmitDefaultValue = false)]
+        [IgnoreDataMember]
-        internal Int32? FileId { get; private set; }
+        internal Int32? FileId { get; set; }
 
         [DataMember(Name = "line", EmitDefaultValue = false)]
-        internal Int32? Line { get; private set; }
+        internal Int32? Line { get; }
 
         [DataMember(Name = "col", EmitDefaultValue = false)]
-        internal Int32? Column { get; private set; }
+        internal Int32? Column { get; }
 
         [DataMember(Name = "type", EmitDefaultValue = false)]
         internal Int32 Type { get; }

src/Sdk/DTObjectTemplating/ObjectTemplating/Tokens/TemplateTokenJsonConverter.cs

@@ -115,12 +115,13 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
             Object value,
             JsonSerializer serializer)
         {
+            base.WriteJson(writer, value, serializer);
             if (value is TemplateToken token)
             {
                 switch (token.Type)
                 {
                     case TokenType.Null:
-                        if (token.FileId == null && token.Line == null && token.Column == null)
+                        if (token.Line == null && token.Column == null)
                         {
                             writer.WriteNull();
                         }
@@ -129,17 +130,12 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
                             writer.WriteStartObject();
                             writer.WritePropertyName("type");
                             writer.WriteValue(token.Type);
-                            if (token.FileId != null)
-                            {
-                                writer.WritePropertyName("file");
-                                writer.WriteValue(token.FileId);
-                            }
                             if (token.Line != null)
                             {
                                 writer.WritePropertyName("line");
                                 writer.WriteValue(token.Line);
                             }
-                            if (token.Column != null)
+                            if (token.Line != null)
                             {
                                 writer.WritePropertyName("col");
                                 writer.WriteValue(token.Column);
@@ -150,7 +146,7 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
 
                     case TokenType.Boolean:
                         var booleanToken = token as BooleanToken;
-                        if (token.FileId == null && token.Line == null && token.Column == null)
+                        if (token.Line == null && token.Column == null)
                         {
                             writer.WriteValue(booleanToken.Value);
                         }
@@ -159,17 +155,12 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
                             writer.WriteStartObject();
                             writer.WritePropertyName("type");
                             writer.WriteValue(token.Type);
-                            if (token.FileId != null)
-                            {
-                                writer.WritePropertyName("file");
-                                writer.WriteValue(token.FileId);
-                            }
                             if (token.Line != null)
                             {
                                 writer.WritePropertyName("line");
                                 writer.WriteValue(token.Line);
                             }
-                            if (token.Column != null)
+                            if (token.Line != null)
                             {
                                 writer.WritePropertyName("col");
                                 writer.WriteValue(token.Column);
@@ -182,7 +173,7 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
 
                     case TokenType.Number:
                         var numberToken = token as NumberToken;
-                        if (token.FileId == null && token.Line == null && token.Column == null)
+                        if (token.Line == null && token.Column == null)
                         {
                             writer.WriteValue(numberToken.Value);
                         }
@@ -191,17 +182,12 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
                             writer.WriteStartObject();
                             writer.WritePropertyName("type");
                             writer.WriteValue(token.Type);
-                            if (token.FileId != null)
-                            {
-                                writer.WritePropertyName("file");
-                                writer.WriteValue(token.FileId);
-                            }
                             if (token.Line != null)
                             {
                                 writer.WritePropertyName("line");
                                 writer.WriteValue(token.Line);
                             }
-                            if (token.Column != null)
+                            if (token.Line != null)
                             {
                                 writer.WritePropertyName("col");
                                 writer.WriteValue(token.Column);
@@ -214,7 +200,7 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
 
                     case TokenType.String:
                         var stringToken = token as StringToken;
-                        if (token.FileId == null && token.Line == null && token.Column == null)
+                        if (token.Line == null && token.Column == null)
                         {
                             writer.WriteValue(stringToken.Value);
                         }
@@ -223,17 +209,12 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
                             writer.WriteStartObject();
                             writer.WritePropertyName("type");
                             writer.WriteValue(token.Type);
-                            if (token.FileId != null)
-                            {
-                                writer.WritePropertyName("file");
-                                writer.WriteValue(token.FileId);
-                            }
                             if (token.Line != null)
                             {
                                 writer.WritePropertyName("line");
                                 writer.WriteValue(token.Line);
                             }
-                            if (token.Column != null)
+                            if (token.Line != null)
                             {
                                 writer.WritePropertyName("col");
                                 writer.WriteValue(token.Column);
@@ -249,17 +230,12 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
                         writer.WriteStartObject();
                         writer.WritePropertyName("type");
                         writer.WriteValue(token.Type);
-                        if (token.FileId != null)
-                        {
-                            writer.WritePropertyName("file");
-                            writer.WriteValue(token.FileId);
-                        }
                         if (token.Line != null)
                         {
                             writer.WritePropertyName("line");
                             writer.WriteValue(token.Line);
                         }
-                        if (token.Column != null)
+                        if (token.Line != null)
                         {
                             writer.WritePropertyName("col");
                             writer.WriteValue(token.Column);
@@ -277,17 +253,12 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
                         writer.WriteStartObject();
                         writer.WritePropertyName("type");
                         writer.WriteValue(token.Type);
-                        if (token.FileId != null)
-                        {
-                            writer.WritePropertyName("file");
-                            writer.WriteValue(token.FileId);
-                        }
                         if (token.Line != null)
                         {
                             writer.WritePropertyName("line");
                             writer.WriteValue(token.Line);
                         }
-                        if (token.Column != null)
+                        if (token.Line != null)
                         {
                             writer.WritePropertyName("col");
                             writer.WriteValue(token.Column);
@@ -302,17 +273,12 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
                         writer.WriteStartObject();
                         writer.WritePropertyName("type");
                         writer.WriteValue(token.Type);
-                        if (token.FileId != null)
-                        {
-                            writer.WritePropertyName("file");
-                            writer.WriteValue(token.FileId);
-                        }
                         if (token.Line != null)
                         {
                             writer.WritePropertyName("line");
                             writer.WriteValue(token.Line);
                         }
-                        if (token.Column != null)
+                        if (token.Line != null)
                         {
                             writer.WritePropertyName("col");
                             writer.WriteValue(token.Column);
@@ -335,17 +301,12 @@ namespace GitHub.DistributedTask.ObjectTemplating.Tokens
                         writer.WriteStartObject();
                         writer.WritePropertyName("type");
                         writer.WriteValue(token.Type);
-                        if (token.FileId != null)
-                        {
-                            writer.WritePropertyName("file");
-                            writer.WriteValue(token.FileId);
-                        }
                         if (token.Line != null)
                         {
                             writer.WritePropertyName("line");
                             writer.WriteValue(token.Line);
                         }
-                        if (token.Column != null)
+                        if (token.Line != null)
                         {
                             writer.WritePropertyName("col");
                             writer.WriteValue(token.Column);

src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs

@@ -39,10 +39,7 @@ namespace GitHub.DistributedTask.Pipelines
             DictionaryContextData contextData,
             WorkspaceOptions workspaceOptions,
             IEnumerable<JobStep> steps,
-            IEnumerable<ContextScope> scopes,
+            IEnumerable<ContextScope> scopes)
-            IList<String> fileTable,
-            TemplateToken jobOutputs,
-            IList<TemplateToken> defaults)
         {
             this.MessageType = JobRequestMessageTypes.PipelineAgentJobRequest;
             this.Plan = plan;
@@ -54,7 +51,6 @@ namespace GitHub.DistributedTask.Pipelines
             this.Timeline = timeline;
             this.Resources = jobResources;
             this.Workspace = workspaceOptions;
-            this.JobOutputs = jobOutputs;
 
             m_variables = new Dictionary<String, VariableValue>(variables, StringComparer.OrdinalIgnoreCase);
             m_maskHints = new List<MaskHint>(maskHints);
@@ -70,11 +66,6 @@ namespace GitHub.DistributedTask.Pipelines
                 m_environmentVariables = new List<TemplateToken>(environmentVariables);
             }
 
-            if (defaults?.Count > 0)
-            {
-                m_defaults = new List<TemplateToken>(defaults);
-            }
-
             this.ContextData = new Dictionary<String, PipelineContextData>(StringComparer.OrdinalIgnoreCase);
             if (contextData?.Count > 0)
             {
@@ -83,11 +74,6 @@ namespace GitHub.DistributedTask.Pipelines
                     this.ContextData[pair.Key] = pair.Value;
                 }
             }
-
-            if (fileTable?.Count > 0)
-            {
-                m_fileTable = new List<String>(fileTable);
-            }
         }
 
         [DataMember]
@@ -146,13 +132,6 @@ namespace GitHub.DistributedTask.Pipelines
             private set;
         }
 
-        [DataMember(EmitDefaultValue = false)]
-        public TemplateToken JobOutputs
-        {
-            get;
-            private set;
-        }
-
         [DataMember]
         public Int64 RequestId
         {
@@ -219,21 +198,6 @@ namespace GitHub.DistributedTask.Pipelines
             }
         }
 
-        /// <summary>
-        /// Gets the hierarchy of defaults to overlay, last wins.
-        /// </summary>
-        public IList<TemplateToken> Defaults
-        {
-            get
-            {
-                if (m_defaults == null)
-                {
-                    m_defaults = new List<TemplateToken>();
-                }
-                return m_defaults;
-            }
-        }
-
         /// <summary>
         /// Gets the collection of variables associated with the current context.
         /// </summary>
@@ -273,21 +237,6 @@ namespace GitHub.DistributedTask.Pipelines
             }
         }
 
-        /// <summary>
-        /// Gets the table of files used when parsing the pipeline (e.g. yaml files)
-        /// </summary>
-        public IList<String> FileTable
-        {
-            get
-            {
-                if (m_fileTable == null)
-                {
-                    m_fileTable = new List<String>();
-                }
-                return m_fileTable;
-            }
-        }
-
         // todo: remove after feature-flag DistributedTask.EvaluateContainerOnRunner is enabled everywhere
         public void SetJobSidecarContainers(IDictionary<String, String> value)
         {
@@ -396,16 +345,6 @@ namespace GitHub.DistributedTask.Pipelines
                 m_environmentVariables = null;
             }
 
-            if (m_defaults?.Count == 0)
-            {
-                m_defaults = null;
-            }
-
-            if (m_fileTable?.Count == 0)
-            {
-                m_fileTable = null;
-            }
-
             if (m_maskHints?.Count == 0)
             {
                 m_maskHints = null;
@@ -435,12 +374,6 @@ namespace GitHub.DistributedTask.Pipelines
         [DataMember(Name = "EnvironmentVariables", EmitDefaultValue = false)]
         private List<TemplateToken> m_environmentVariables;
 
-        [DataMember(Name = "Defaults", EmitDefaultValue = false)]
-        private List<TemplateToken> m_defaults;
-
-        [DataMember(Name = "FileTable", EmitDefaultValue = false)]
-        private List<String> m_fileTable;
-
         [DataMember(Name = "Mask", EmitDefaultValue = false)]
         private List<MaskHint> m_maskHints;
 

src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConstants.cs

@@ -14,7 +14,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
         public const String Clean = "clean";
         public const String Container = "container";
         public const String ContinueOnError = "continue-on-error";
-        public const String Defaults = "defaults";
         public const String Env = "env";
         public const String Event = "event";
         public const String EventPattern = "github.event";
@@ -30,10 +29,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
         public const String Include = "include";
         public const String Inputs = "inputs";
         public const String Job = "job";
-        public const String JobDefaultsRun = "job-defaults-run";
-        public const String JobOutputs = "job-outputs";
         public const String Jobs = "jobs";
-        public const String Labels = "labels";
         public const String Lfs = "lfs";
         public const String Matrix = "matrix";
         public const String MaxParallel = "max-parallel";

src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateEvaluator.cs

@@ -19,8 +19,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
     {
         public PipelineTemplateEvaluator(
             ITraceWriter trace,
-            TemplateSchema schema,
+            TemplateSchema schema)
-            IList<String> fileTable)
         {
             if (!String.Equals(schema.Version, PipelineTemplateConstants.Workflow_1_0, StringComparison.Ordinal))
             {
@@ -29,7 +28,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
 
             m_trace = trace;
             m_schema = schema;
-            m_fileTable = fileTable;
         }
 
         public Int32 MaxDepth => 50;
@@ -231,78 +229,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
             return result;
         }
 
-        public Dictionary<String, String> EvaluateJobOutput(
-            TemplateToken token,
-            DictionaryContextData contextData)
-        {
-            var result = default(Dictionary<String, String>);
-
-            if (token != null && token.Type != TokenType.Null)
-            {
-                var context = CreateContext(contextData);
-                try
-                {
-                    token = TemplateEvaluator.Evaluate(context, PipelineTemplateConstants.JobOutputs, token, 0, null, omitHeader: true);
-                    context.Errors.Check();
-                    result = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase);
-                    var mapping = token.AssertMapping("outputs");
-                    foreach (var pair in mapping)
-                    {
-                        // Literal key
-                        var key = pair.Key.AssertString("output key");
-
-                        // Literal value
-                        var value = pair.Value.AssertString("output value");
-                        result[key.Value] = value.Value;
-                    }
-                }
-                catch (Exception ex) when (!(ex is TemplateValidationException))
-                {
-                    context.Errors.Add(ex);
-                }
-
-                context.Errors.Check();
-            }
-
-            return result;
-        }
-
-        public Dictionary<String, String> EvaluateJobDefaultsRun(
-            TemplateToken token,
-            DictionaryContextData contextData)
-        {
-            var result = default(Dictionary<String, String>);
-
-            if (token != null && token.Type != TokenType.Null)
-            {
-                var context = CreateContext(contextData);
-                try
-                {
-                    token = TemplateEvaluator.Evaluate(context, PipelineTemplateConstants.JobDefaultsRun, token, 0, null, omitHeader: true);
-                    context.Errors.Check();
-                    result = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase);
-                    var mapping = token.AssertMapping("defaults run");
-                    foreach (var pair in mapping)
-                    {
-                        // Literal key
-                        var key = pair.Key.AssertString("defaults run key");
-
-                        // Literal value
-                        var value = pair.Value.AssertString("defaults run value");
-                        result[key.Value] = value.Value;
-                    }
-                }
-                catch (Exception ex) when (!(ex is TemplateValidationException))
-                {
-                    context.Errors.Add(ex);
-                }
-
-                context.Errors.Check();
-            }
-
-            return result;
-        }
-
         public IList<KeyValuePair<String, JobContainer>> EvaluateJobServiceContainers(
             TemplateToken token,
             DictionaryContextData contextData)
@@ -398,16 +324,6 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
                 TraceWriter = m_trace,
             };
 
-            // Add the file table
-            if (m_fileTable?.Count > 0)
-            {
-                foreach (var file in m_fileTable)
-                {
-                    result.GetFileId(file);
-                }
-            }
-
-            // Add named context
             if (contextData != null)
             {
                 foreach (var pair in contextData)
@@ -430,13 +346,11 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
 
         private readonly ITraceWriter m_trace;
         private readonly TemplateSchema m_schema;
-        private readonly IList<String> m_fileTable;
         private readonly String[] s_contextNames = new[]
         {
             PipelineTemplateConstants.GitHub,
             PipelineTemplateConstants.Strategy,
             PipelineTemplateConstants.Matrix,
-            PipelineTemplateConstants.Needs,
             PipelineTemplateConstants.Secrets,
             PipelineTemplateConstants.Steps,
             PipelineTemplateConstants.Inputs,

src/Sdk/DTPipelines/Pipelines/ObjectTemplating/YamlObjectReader.cs

@@ -1,572 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using GitHub.DistributedTask.ObjectTemplating;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using YamlDotNet.Core;
-using YamlDotNet.Core.Events;
-
-namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
-{
-    /// <summary>
-    /// Converts a YAML file into a TemplateToken
-    /// </summary>
-    public sealed class YamlObjectReader : IObjectReader
-    {
-        internal YamlObjectReader(
-            Int32? fileId,
-            TextReader input)
-        {
-            m_fileId = fileId;
-            m_parser = new Parser(input);
-        }
-
-        public Boolean AllowLiteral(out LiteralToken value)
-        {
-            if (EvaluateCurrent() is Scalar scalar)
-            {
-                // Tag specified
-                if (!String.IsNullOrEmpty(scalar.Tag))
-                {
-                    // String tag
-                    if (String.Equals(scalar.Tag, c_stringTag, StringComparison.Ordinal))
-                    {
-                        value = new StringToken(m_fileId, scalar.Start.Line, scalar.Start.Column, scalar.Value);
-                        MoveNext();
-                        return true;
-                    }
-
-                    // Not plain style
-                    if (scalar.Style != ScalarStyle.Plain)
-                    {
-                        throw new NotSupportedException($"The scalar style '{scalar.Style}' on line {scalar.Start.Line} and column {scalar.Start.Column} is not valid with the tag '{scalar.Tag}'");
-                    }
-
-                    // Boolean, Float, Integer, or Null
-                    switch (scalar.Tag)
-                    {
-                        case c_booleanTag:
-                            value = ParseBoolean(scalar);
-                            break;
-                        case c_floatTag:
-                            value = ParseFloat(scalar);
-                            break;
-                        case c_integerTag:
-                            value = ParseInteger(scalar);
-                            break;
-                        case c_nullTag:
-                            value = ParseNull(scalar);
-                            break;
-                        default:
-                            throw new NotSupportedException($"Unexpected tag '{scalar.Tag}'");
-                    }
-
-                    MoveNext();
-                    return true;
-                }
-
-                // Plain style, determine type using YAML 1.2 "core" schema https://yaml.org/spec/1.2/spec.html#id2804923
-                if (scalar.Style == ScalarStyle.Plain)
-                {
-                    if (MatchNull(scalar, out var nullToken))
-                    {
-                        value = nullToken;
-                    }
-                    else if (MatchBoolean(scalar, out var booleanToken))
-                    {
-                        value = booleanToken;
-                    }
-                    else if (MatchInteger(scalar, out var numberToken) ||
-                        MatchFloat(scalar, out numberToken))
-                    {
-                        value = numberToken;
-                    }
-                    else
-                    {
-                        value = new StringToken(m_fileId, scalar.Start.Line, scalar.Start.Column, scalar.Value);
-                    }
-
-                    MoveNext();
-                    return true;
-                }
-
-                // Otherwise assume string
-                value = new StringToken(m_fileId, scalar.Start.Line, scalar.Start.Column, scalar.Value);
-                MoveNext();
-                return true;
-            }
-
-            value = default;
-            return false;
-        }
-
-        public Boolean AllowSequenceStart(out SequenceToken value)
-        {
-            if (EvaluateCurrent() is SequenceStart sequenceStart)
-            {
-                value = new SequenceToken(m_fileId, sequenceStart.Start.Line, sequenceStart.Start.Column);
-                MoveNext();
-                return true;
-            }
-
-            value = default;
-            return false;
-        }
-
-        public Boolean AllowSequenceEnd()
-        {
-            if (EvaluateCurrent() is SequenceEnd)
-            {
-                MoveNext();
-                return true;
-            }
-
-            return false;
-        }
-
-        public Boolean AllowMappingStart(out MappingToken value)
-        {
-            if (EvaluateCurrent() is MappingStart mappingStart)
-            {
-                value = new MappingToken(m_fileId, mappingStart.Start.Line, mappingStart.Start.Column);
-                MoveNext();
-                return true;
-            }
-
-            value = default;
-            return false;
-        }
-
-        public Boolean AllowMappingEnd()
-        {
-            if (EvaluateCurrent() is MappingEnd)
-            {
-                MoveNext();
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Consumes the last parsing events, which are expected to be DocumentEnd and StreamEnd.
-        /// </summary>
-        public void ValidateEnd()
-        {
-            if (EvaluateCurrent() is DocumentEnd)
-            {
-                MoveNext();
-            }
-            else
-            {
-                throw new InvalidOperationException("Expected document end parse event");
-            }
-
-            if (EvaluateCurrent() is StreamEnd)
-            {
-                MoveNext();
-            }
-            else
-            {
-                throw new InvalidOperationException("Expected stream end parse event");
-            }
-
-            if (MoveNext())
-            {
-                throw new InvalidOperationException("Expected end of parse events");
-            }
-        }
-
-        /// <summary>
-        /// Consumes the first parsing events, which are expected to be StreamStart and DocumentStart.
-        /// </summary>
-        public void ValidateStart()
-        {
-            if (EvaluateCurrent() != null)
-            {
-                throw new InvalidOperationException("Unexpected parser state");
-            }
-
-            if (!MoveNext())
-            {
-                throw new InvalidOperationException("Expected a parse event");
-            }
-
-            if (EvaluateCurrent() is StreamStart)
-            {
-                MoveNext();
-            }
-            else
-            {
-                throw new InvalidOperationException("Expected stream start parse event");
-            }
-
-            if (EvaluateCurrent() is DocumentStart)
-            {
-                MoveNext();
-            }
-            else
-            {
-                throw new InvalidOperationException("Expected document start parse event");
-            }
-        }
-
-        private ParsingEvent EvaluateCurrent()
-        {
-            if (m_current == null)
-            {
-                m_current = m_parser.Current;
-                if (m_current != null)
-                {
-                    if (m_current is Scalar scalar)
-                    {
-                        // Verify not using achors
-                        if (scalar.Anchor != null)
-                        {
-                            throw new InvalidOperationException($"Anchors are not currently supported. Remove the anchor '{scalar.Anchor}'");
-                        }
-                    }
-                    else if (m_current is MappingStart mappingStart)
-                    {
-                        // Verify not using achors
-                        if (mappingStart.Anchor != null)
-                        {
-                            throw new InvalidOperationException($"Anchors are not currently supported. Remove the anchor '{mappingStart.Anchor}'");
-                        }
-                    }
-                    else if (m_current is SequenceStart sequenceStart)
-                    {
-                        // Verify not using achors
-                        if (sequenceStart.Anchor != null)
-                        {
-                            throw new InvalidOperationException($"Anchors are not currently supported. Remove the anchor '{sequenceStart.Anchor}'");
-                        }
-                    }
-                    else if (!(m_current is MappingEnd) &&
-                        !(m_current is SequenceEnd) &&
-                        !(m_current is DocumentStart) &&
-                        !(m_current is DocumentEnd) &&
-                        !(m_current is StreamStart) &&
-                        !(m_current is StreamEnd))
-                    {
-                        throw new InvalidOperationException($"Unexpected parsing event type: {m_current.GetType().Name}");
-                    }
-                }
-            }
-
-            return m_current;
-        }
-
-        private Boolean MoveNext()
-        {
-            m_current = null;
-            return m_parser.MoveNext();
-        }
-
-        private BooleanToken ParseBoolean(Scalar scalar)
-        {
-            if (MatchBoolean(scalar, out var token))
-            {
-                return token;
-            }
-
-            ThrowInvalidValue(scalar, c_booleanTag); // throws
-            return default;
-        }
-
-        private NumberToken ParseFloat(Scalar scalar)
-        {
-            if (MatchFloat(scalar, out var token))
-            {
-                return token;
-            }
-
-            ThrowInvalidValue(scalar, c_floatTag); // throws
-            return default;
-        }
-
-        private NumberToken ParseInteger(Scalar scalar)
-        {
-            if (MatchInteger(scalar, out var token))
-            {
-                return token;
-            }
-
-            ThrowInvalidValue(scalar, c_integerTag); // throws
-            return default;
-        }
-
-        private NullToken ParseNull(Scalar scalar)
-        {
-            if (MatchNull(scalar, out var token))
-            {
-                return token;
-            }
-
-            ThrowInvalidValue(scalar, c_nullTag); // throws
-            return default;
-        }
-
-        private Boolean MatchBoolean(
-            Scalar scalar,
-            out BooleanToken value)
-        {
-            // YAML 1.2 "core" schema https://yaml.org/spec/1.2/spec.html#id2804923
-            switch (scalar.Value ?? String.Empty)
-            {
-                case "true":
-                case "True":
-                case "TRUE":
-                    value = new BooleanToken(m_fileId, scalar.Start.Line, scalar.Start.Column, true);
-                    return true;
-                case "false":
-                case "False":
-                case "FALSE":
-                    value = new BooleanToken(m_fileId, scalar.Start.Line, scalar.Start.Column, false);
-                    return true;
-            }
-
-            value = default;
-            return false;
-        }
-
-        private Boolean MatchFloat(
-            Scalar scalar,
-            out NumberToken value)
-        {
-            // YAML 1.2 "core" schema https://yaml.org/spec/1.2/spec.html#id2804923
-            var str = scalar.Value;
-            if (!String.IsNullOrEmpty(str))
-            {
-                // Check for [-+]?(\.inf|\.Inf|\.INF)|\.nan|\.NaN|\.NAN
-                switch (str)
-                {
-                    case ".inf":
-                    case ".Inf":
-                    case ".INF":
-                    case "+.inf":
-                    case "+.Inf":
-                    case "+.INF":
-                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, Double.PositiveInfinity);
-                        return true;
-                    case "-.inf":
-                    case "-.Inf":
-                    case "-.INF":
-                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, Double.NegativeInfinity);
-                        return true;
-                    case ".nan":
-                    case ".NaN":
-                    case ".NAN":
-                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, Double.NaN);
-                        return true;
-                }
-
-                // Otherwise check [-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?
-
-                // Skip leading sign
-                var index = str[0] == '-' || str[0] == '+' ? 1 : 0;
-
-                // Check for integer portion
-                var length = str.Length;
-                var hasInteger = false;
-                while (index < length && str[index] >= '0' && str[index] <= '9')
-                {
-                    hasInteger = true;
-                    index++;
-                }
-
-                // Check for decimal point
-                var hasDot = false;
-                if (index < length && str[index] == '.')
-                {
-                    hasDot = true;
-                    index++;
-                }
-
-                // Check for decimal portion
-                var hasDecimal = false;
-                while (index < length && str[index] >= '0' && str[index] <= '9')
-                {
-                    hasDecimal = true;
-                    index++;
-                }
-
-                // Check [-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)
-                if ((hasDot && hasDecimal) || hasInteger)
-                {
-                    // Check for end
-                    if (index == length)
-                    {
-                        // Try parse
-                        if (Double.TryParse(str, NumberStyles.AllowLeadingSign | NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var doubleValue))
-                        {
-                            value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, doubleValue);
-                            return true;
-                        }
-                        // Otherwise exceeds range
-                        else
-                        {
-                            ThrowInvalidValue(scalar, c_floatTag); // throws
-                        }
-                    }
-                    // Check [eE][-+]?[0-9]
-                    else if (index < length && (str[index] == 'e' || str[index] == 'E'))
-                    {
-                        index++;
-
-                        // Skip sign
-                        if (index < length && (str[index] == '-' || str[index] == '+'))
-                        {
-                            index++;
-                        }
-
-                        // Check for exponent
-                        var hasExponent = false;
-                        while (index < length && str[index] >= '0' && str[index] <= '9')
-                        {
-                            hasExponent = true;
-                            index++;
-                        }
-
-                        // Check for end
-                        if (hasExponent && index == length)
-                        {
-                            // Try parse
-                            if (Double.TryParse(str, NumberStyles.AllowLeadingSign | NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent, CultureInfo.InvariantCulture, out var doubleValue))
-                            {
-                                value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, (Double)doubleValue);
-                                return true;
-                            }
-                            // Otherwise exceeds range
-                            else
-                            {
-                                ThrowInvalidValue(scalar, c_floatTag); // throws
-                            }
-                        }
-                    }
-                }
-            }
-
-            value = default;
-            return false;
-        }
-
-        private Boolean MatchInteger(
-            Scalar scalar,
-            out NumberToken value)
-        {
-            // YAML 1.2 "core" schema https://yaml.org/spec/1.2/spec.html#id2804923
-            var str = scalar.Value;
-            if (!String.IsNullOrEmpty(str))
-            {
-                // Check for [0-9]+
-                var firstChar = str[0];
-                if (firstChar >= '0' && firstChar <= '9' &&
-                    str.Skip(1).All(x => x >= '0' && x <= '9'))
-                {
-                    // Try parse
-                    if (Double.TryParse(str, NumberStyles.None, CultureInfo.InvariantCulture, out var doubleValue))
-                    {
-                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, doubleValue);
-                        return true;
-                    }
-
-                    // Otherwise exceeds range
-                    ThrowInvalidValue(scalar, c_integerTag); // throws
-                }
-                // Check for (-|+)[0-9]+
-                else if ((firstChar == '-' || firstChar == '+') &&
-                    str.Length > 1 &&
-                    str.Skip(1).All(x => x >= '0' && x <= '9'))
-                {
-                    // Try parse
-                    if (Double.TryParse(str, NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out var doubleValue))
-                    {
-                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, doubleValue);
-                        return true;
-                    }
-
-                    // Otherwise exceeds range
-                    ThrowInvalidValue(scalar, c_integerTag); // throws
-                }
-                // Check for 0x[0-9a-fA-F]+
-                else if (firstChar == '0' &&
-                    str.Length > 2 &&
-                    str[1] == 'x' &&
-                    str.Skip(2).All(x => (x >= '0' && x <= '9') || (x >= 'a' && x <= 'f') || (x >= 'A' && x <= 'F')))
-                {
-                    // Try parse
-                    if (Int32.TryParse(str.Substring(2), NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture, out var integerValue))
-                    {
-                        value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, integerValue);
-                        return true;
-                    }
-
-                    // Otherwise exceeds range
-                    ThrowInvalidValue(scalar, c_integerTag); // throws
-                }
-                // Check for 0o[0-9]+
-                else if (firstChar == '0' &&
-                    str.Length > 2 &&
-                    str[1] == 'o' &&
-                    str.Skip(2).All(x => x >= '0' && x <= '7'))
-                {
-                    // Try parse
-                    var integerValue = default(Int32);
-                    try
-                    {
-                        integerValue = Convert.ToInt32(str.Substring(2), 8);
-                    }
-                    // Otherwise exceeds range
-                    catch (Exception)
-                    {
-                        ThrowInvalidValue(scalar, c_integerTag); // throws
-                    }
-
-                    value = new NumberToken(m_fileId, scalar.Start.Line, scalar.Start.Column, integerValue);
-                    return true;
-                }
-            }
-
-            value = default;
-            return false;
-        }
-
-        private Boolean MatchNull(
-            Scalar scalar,
-            out NullToken value)
-        {
-            // YAML 1.2 "core" schema https://yaml.org/spec/1.2/spec.html#id2804923
-            switch (scalar.Value ?? String.Empty)
-            {
-                case "":
-                case "null":
-                case "Null":
-                case "NULL":
-                case "~":
-                    value = new NullToken(m_fileId, scalar.Start.Line, scalar.Start.Column);
-                    return true;
-            }
-
-            value = default;
-            return false;
-        }
-
-        private void ThrowInvalidValue(
-            Scalar scalar,
-            String tag)
-        {
-            throw new NotSupportedException($"The value '{scalar.Value}' on line {scalar.Start.Line} and column {scalar.Start.Column} is invalid for the type '{scalar.Tag}'");
-        }
-
-        private const String c_booleanTag = "tag:yaml.org,2002:bool";
-        private const String c_floatTag = "tag:yaml.org,2002:float";
-        private const String c_integerTag = "tag:yaml.org,2002:int";
-        private const String c_nullTag = "tag:yaml.org,2002:null";
-        private const String c_stringTag = "tag:yaml.org,2002:string";
-        private readonly Int32? m_fileId;
-        private readonly Parser m_parser;
-        private ParsingEvent m_current;
-    }
-}

src/Sdk/DTPipelines/workflow-v1.0.json

@@ -9,7 +9,6 @@
         "properties": {
           "on": "any",
           "name": "string",
-          "defaults": "workflow-defaults",
           "env": "workflow-env",
           "jobs": "jobs"
         }
@@ -39,7 +38,6 @@
       "context": [
         "github",
         "strategy",
-        "needs",
         "matrix",
         "secrets",
         "steps",
@@ -68,7 +66,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "inputs",
@@ -92,8 +89,7 @@
       "context": [
         "github",
         "strategy",
-        "matrix",
+        "matrix"
-        "needs"
       ],
       "one-of": [
         "string",
@@ -116,7 +112,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "job",
@@ -126,23 +121,6 @@
       "string": {}
     },
 
-    "workflow-defaults": {
-      "mapping": {
-        "properties": {
-          "run": "workflow-defaults-run"
-        }
-      }
-    },
-
-    "workflow-defaults-run": {
-      "mapping": {
-        "properties": {
-          "shell": "non-empty-string",
-          "working-directory": "non-empty-string"
-        }
-      }
-    },
-
     "workflow-env": {
       "context": [
         "github",
@@ -165,21 +143,16 @@
       "mapping": {
         "properties": {
           "needs": "needs",
-          "if": "job-if",
+          "if": "string",
           "strategy": "strategy",
           "name": "string-strategy-context",
-          "runs-on": {
+          "runs-on": "runs-on",
-            "type": "runs-on",
-            "required": true
-          },
           "timeout-minutes": "number-strategy-context",
           "cancel-timeout-minutes": "number-strategy-context",
-          "continue-on-error": "boolean-strategy-context",
+          "continue-on-error": "boolean",
           "container": "container",
           "services": "services",
           "env": "job-env",
-          "outputs": "job-outputs",
-          "defaults": "job-defaults",
           "steps": "steps"
         }
       }
@@ -192,22 +165,9 @@
       ]
     },
 
-    "job-if": {
-      "context": [
-        "github",
-        "needs",
-        "always(0,0)",
-        "failure(0,MAX)",
-        "cancelled(0,0)",
-        "success(0,MAX)"
-      ],
-      "string": {}
-    },
-
     "strategy": {
       "context": [
-        "github",
+        "github"
-        "needs"
       ],
       "mapping": {
         "properties": {
@@ -273,23 +233,24 @@
       "context": [
         "github",
         "strategy",
-        "matrix",
+        "matrix"
-        "needs"
       ],
       "one-of": [
-        "non-empty-string",
+        "runs-on-string",
-        "sequence-of-non-empty-string",
         "runs-on-mapping"
       ]
     },
 
+    "runs-on-string": {
+      "string": {
+        "require-non-empty": true
+      }
+    },
+
     "runs-on-mapping": {
       "mapping": {
         "properties": {
-          "pool": {
+          "pool": "non-empty-string"
-            "type": "non-empty-string",
-            "required": true
-          }
         }
       }
     },
@@ -299,8 +260,7 @@
         "github",
         "secrets",
         "strategy",
-        "matrix",
+        "matrix"
-        "needs"
       ],
       "mapping": {
         "loose-key-type": "non-empty-string",
@@ -308,37 +268,6 @@
       }
     },
 
-    "job-defaults": {
-      "mapping": {
-        "properties": {
-          "run": "job-defaults-run"
-        }
-      }
-    },
-
-    "job-defaults-run": {
-      "context": [
-        "github",
-        "strategy",
-        "matrix",
-        "needs",
-        "env"
-      ],
-      "mapping": {
-        "properties": {
-          "shell": "non-empty-string",
-          "working-directory": "non-empty-string"
-        }
-      }
-    },
-
-    "job-outputs": {
-      "mapping": {
-        "loose-key-type": "non-empty-string",
-        "loose-value-type": "string-runner-context"
-      }
-    },
-
     "steps": {
       "sequence": {
         "item-type": "steps-item"
@@ -372,12 +301,9 @@
         "properties": {
           "name": "string-steps-context",
           "id": "non-empty-string",
-          "if": "step-if",
+          "if": "string",
           "timeout-minutes": "number-steps-context",
-          "run": {
+          "run": "string-steps-context",
-            "type": "string-steps-context",
-            "required": true
-          },
           "continue-on-error": "boolean-steps-context",
           "env": "step-env",
           "working-directory": "string-steps-context",
@@ -391,12 +317,9 @@
         "properties": {
           "name": "string-steps-context-in-template",
           "id": "non-empty-string",
-          "if": "step-if-in-template",
+          "if": "string",
           "timeout-minutes": "number-steps-context-in-template",
-          "run": {
+          "run": "string-steps-context-in-template",
-            "type": "string-steps-context-in-template",
-            "required": true
-          },
           "continue-on-error": "boolean-steps-context-in-template",
           "env": "step-env-in-template",
           "working-directory": "string-steps-context-in-template",
@@ -410,13 +333,10 @@
         "properties": {
           "name": "string-steps-context",
           "id": "non-empty-string",
-          "if": "step-if",
+          "if": "string",
           "continue-on-error": "boolean-steps-context",
           "timeout-minutes": "number-steps-context",
-          "uses": {
+          "uses": "non-empty-string",
-            "type": "non-empty-string",
-            "required": true
-          },
           "with": "step-with",
           "env": "step-env"
         }
@@ -428,56 +348,16 @@
         "properties": {
           "name": "string-steps-context-in-template",
           "id": "non-empty-string",
-          "if": "step-if-in-template",
+          "if": "string",
           "continue-on-error": "boolean-steps-context-in-template",
           "timeout-minutes": "number-steps-context-in-template",
-          "uses": {
+          "uses": "non-empty-string",
-            "type": "non-empty-string",
-            "required": true
-          },
           "with": "step-with-in-template",
           "env": "step-env-in-template"
         }
       }
     },
 
-    "step-if": {
-      "context": [
-        "github",
-        "strategy",
-        "matrix",
-        "needs",
-        "steps",
-        "job",
-        "runner",
-        "env",
-        "always(0,0)",
-        "failure(0,0)",
-        "cancelled(0,0)",
-        "success(0,0)"
-      ],
-      "string": {}
-    },
-
-    "step-if-in-template": {
-      "context": [
-        "github",
-        "strategy",
-        "matrix",
-        "needs",
-        "steps",
-        "inputs",
-        "job",
-        "runner",
-        "env",
-        "always(0,0)",
-        "failure(0,0)",
-        "cancelled(0,0)",
-        "success(0,0)"
-      ],
-      "string": {}
-    },
-
     "steps-template-reference": {
       "mapping": {
         "properties": {
@@ -503,7 +383,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "job",
@@ -521,7 +400,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "inputs",
@@ -540,7 +418,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "job",
@@ -558,7 +435,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "inputs",
@@ -577,7 +453,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "job",
@@ -594,8 +469,7 @@
       "context": [
         "github",
         "strategy",
-        "matrix",
+        "matrix"
-        "needs"
       ],
       "one-of": [
         "string",
@@ -619,8 +493,7 @@
       "context": [
         "github",
         "strategy",
-        "matrix",
+        "matrix"
-        "needs"
       ],
       "mapping": {
         "loose-key-type": "non-empty-string",
@@ -632,8 +505,7 @@
       "context": [
         "github",
         "strategy",
-        "matrix",
+        "matrix"
-        "needs"
       ],
       "one-of": [
         "non-empty-string",
@@ -653,7 +525,6 @@
         "github",
         "strategy",
         "matrix",
-          "needs",
         "secrets",
         "steps",
         "inputs",
@@ -679,22 +550,11 @@
       }
     },
 
-    "boolean-strategy-context": {
-      "context": [
-        "github",
-        "strategy",
-        "matrix",
-        "needs"
-      ],
-      "boolean": {}
-    },
-
     "number-strategy-context": {
       "context": [
         "github",
         "strategy",
-        "matrix",
+        "matrix"
-        "needs"
       ],
       "number": {}
     },
@@ -703,8 +563,7 @@
       "context": [
         "github",
         "strategy",
-        "matrix",
+        "matrix"
-        "needs"
       ],
       "string": {}
     },
@@ -714,7 +573,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "job",
@@ -729,7 +587,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "inputs",
@@ -745,7 +602,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "job",
@@ -760,7 +616,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "inputs",
@@ -771,27 +626,11 @@
       "number": {}
     },
 
-    "string-runner-context": {
-      "context": [
-        "github",
-        "strategy",
-        "matrix",
-        "needs",
-        "secrets",
-        "steps",
-        "job",
-        "runner",
-        "env"
-      ],
-      "string": {}
-    },
-
     "string-steps-context": {
       "context": [
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "job",
@@ -806,7 +645,6 @@
         "github",
         "strategy",
         "matrix",
-        "needs",
         "secrets",
         "steps",
         "inputs",

src/Sdk/DTWebApi/WebApi/JobEvent.cs

@@ -123,12 +123,11 @@ namespace GitHub.DistributedTask.WebApi
             Int64 requestId,
             Guid jobId,
             TaskResult result,
-            Dictionary<String, VariableValue> outputs)
+            IDictionary<String, VariableValue> outputVariables)
             : base(JobEventTypes.JobCompleted, jobId)
         {
             this.RequestId = requestId;
             this.Result = result;
-            this.Outputs = outputs;
         }
 
         [DataMember(EmitDefaultValue = false)]
@@ -144,13 +143,6 @@ namespace GitHub.DistributedTask.WebApi
             get;
             set;
         }
-
-        [DataMember(EmitDefaultValue = false)]
-        public IDictionary<String, VariableValue> Outputs
-        {
-            get;
-            set;
-        }
     }
 
     [DataContract]

src/Sdk/DTWebApi/WebApi/TaskResourceIds.cs

@@ -260,8 +260,5 @@ namespace GitHub.DistributedTask.WebApi
         public static readonly Guid CheckpointResourcesLocationId = new Guid(CheckpointResourcesLocationIdString);
         public const String CheckpointResourcesResource = "references";
 
-        public static readonly Guid RunnerAuthUrl = new Guid("{A82A119C-1E46-44B6-8D75-C82A79CF975B}");
-        public const string RunnerAuthUrlResource = "authurl";
-
     }
 }

src/Test/L0/Listener/JobDispatcherL0.cs

@@ -33,7 +33,7 @@ namespace GitHub.Runner.Common.Tests.Listener
             TaskOrchestrationPlanReference plan = new TaskOrchestrationPlanReference();
             TimelineReference timeline = null;
             Guid jobId = Guid.NewGuid();
-            var result = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, "someJob", "someJob", null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null);
+            var result = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, "someJob", "someJob", null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null);
             result.ContextData["github"] = new Pipelines.ContextData.DictionaryContextData();
             return result;
         }

src/Test/L0/Listener/RunnerL0.cs

@@ -43,7 +43,7 @@ namespace GitHub.Runner.Common.Tests.Listener
             TaskOrchestrationPlanReference plan = new TaskOrchestrationPlanReference();
             TimelineReference timeline = null;
             Guid jobId = Guid.NewGuid();
-            return new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, "test", "test", null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null);
+            return new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, "test", "test", null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null);
         }
 
         private JobCancelMessage CreateJobCancelMessage()

src/Test/L0/ProcessInvokerL0.cs

@@ -8,7 +8,6 @@ using Xunit;
 using GitHub.Runner.Common.Util;
 using System.Threading.Channels;
 using GitHub.Runner.Sdk;
-using System.Linq;
 
 namespace GitHub.Runner.Common.Tests
 {
@@ -82,102 +81,6 @@ namespace GitHub.Runner.Common.Tests
             }
         }
 
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public async Task SetCIEnv()
-        {
-            using (TestHostContext hc = new TestHostContext(this))
-            {
-                var existingCI = Environment.GetEnvironmentVariable("CI");
-                try
-                {
-                    // Clear out CI and make sure process invoker sets it.
-                    Environment.SetEnvironmentVariable("CI", null);
-
-                    Tracing trace = hc.GetTrace();
-
-                    Int32 exitCode = -1;
-                    var processInvoker = new ProcessInvokerWrapper();
-                    processInvoker.Initialize(hc);
-                    var stdout = new List<string>();
-                    var stderr = new List<string>();
-                    processInvoker.OutputDataReceived += (object sender, ProcessDataReceivedEventArgs e) =>
-                    {
-                        trace.Info(e.Data);
-                        stdout.Add(e.Data);
-                    };
-                    processInvoker.ErrorDataReceived += (object sender, ProcessDataReceivedEventArgs e) =>
-                    {
-                        trace.Info(e.Data);
-                        stderr.Add(e.Data);
-                    };
-#if OS_WINDOWS
-                    exitCode = await processInvoker.ExecuteAsync("", "cmd.exe", "/c \"echo %CI%\"", null, CancellationToken.None);
-#else
-                    exitCode = await processInvoker.ExecuteAsync("", "bash", "-c \"echo $CI\"", null, CancellationToken.None);
-#endif
-
-                    trace.Info("Exit Code: {0}", exitCode);
-                    Assert.Equal(0, exitCode);
-
-                    Assert.Equal("true", stdout.First(x => !string.IsNullOrWhiteSpace(x)));
-                }
-                finally
-                {
-                    Environment.SetEnvironmentVariable("CI", existingCI);
-                }
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Common")]
-        public async Task KeepExistingCIEnv()
-        {
-            using (TestHostContext hc = new TestHostContext(this))
-            {
-                var existingCI = Environment.GetEnvironmentVariable("CI");
-                try
-                {
-                    // Clear out CI and make sure process invoker sets it.
-                    Environment.SetEnvironmentVariable("CI", null);
-
-                    Tracing trace = hc.GetTrace();
-
-                    Int32 exitCode = -1;
-                    var processInvoker = new ProcessInvokerWrapper();
-                    processInvoker.Initialize(hc);
-                    var stdout = new List<string>();
-                    var stderr = new List<string>();
-                    processInvoker.OutputDataReceived += (object sender, ProcessDataReceivedEventArgs e) =>
-                    {
-                        trace.Info(e.Data);
-                        stdout.Add(e.Data);
-                    };
-                    processInvoker.ErrorDataReceived += (object sender, ProcessDataReceivedEventArgs e) =>
-                    {
-                        trace.Info(e.Data);
-                        stderr.Add(e.Data);
-                    };
-#if OS_WINDOWS
-                    exitCode = await processInvoker.ExecuteAsync("", "cmd.exe", "/c \"echo %CI%\"", new Dictionary<string, string>() { { "CI", "false" } }, CancellationToken.None);
-#else
-                    exitCode = await processInvoker.ExecuteAsync("", "bash", "-c \"echo $CI\"", new Dictionary<string, string>() { { "CI", "false" } }, CancellationToken.None);
-#endif
-
-                    trace.Info("Exit Code: {0}", exitCode);
-                    Assert.Equal(0, exitCode);
-
-                    Assert.Equal("false", stdout.First(x => !string.IsNullOrWhiteSpace(x)));
-                }
-                finally
-                {
-                    Environment.SetEnvironmentVariable("CI", existingCI);
-                }
-            }
-        }
-
 #if !OS_WINDOWS
         //Run a process that normally takes 20sec to finish and cancel it.
         [Fact]

src/Test/L0/TestHostContext.cs

@@ -279,13 +279,6 @@ namespace GitHub.Runner.Common.Tests
                         GetDirectory(WellKnownDirectory.Root),
                         ".options");
                     break;
-
-                case WellKnownConfigFile.SetupInfo:
-                    path = Path.Combine(
-                        GetDirectory(WellKnownDirectory.Root),
-                        ".setup_info");
-                    break;
-
                 default:
                     throw new NotSupportedException($"Unexpected well known config file: '{configFile}'");
             }

src/Test/L0/Worker/ActionCommandManagerL0.cs

@@ -150,7 +150,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 TimelineReference timeline = new TimelineReference();
                 Guid jobId = Guid.NewGuid();
                 string jobName = "some job name";
-                var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, jobName, jobName, null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null);
+                var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, jobName, jobName, null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null);
                 jobRequest.Resources.Repositories.Add(new Pipelines.RepositoryResource()
                 {
                     Alias = Pipelines.PipelineConstants.SelfAlias,

src/Test/L0/Worker/ExecutionContextL0.cs

@@ -25,7 +25,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 TimelineReference timeline = new TimelineReference();
                 Guid jobId = Guid.NewGuid();
                 string jobName = "some job name";
-                var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, jobName, jobName, null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null);
+                var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, jobName, jobName, null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null);
                 jobRequest.Resources.Repositories.Add(new Pipelines.RepositoryResource()
                 {
                     Alias = Pipelines.PipelineConstants.SelfAlias,
@@ -101,7 +101,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 TimelineReference timeline = new TimelineReference();
                 Guid jobId = Guid.NewGuid();
                 string jobName = "some job name";
-                var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, jobName, jobName, null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null);
+                var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, jobName, jobName, null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null);
                 jobRequest.Resources.Repositories.Add(new Pipelines.RepositoryResource()
                 {
                     Alias = Pipelines.PipelineConstants.SelfAlias,
@@ -152,7 +152,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 TimelineReference timeline = new TimelineReference();
                 Guid jobId = Guid.NewGuid();
                 string jobName = "some job name";
-                var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, jobName, jobName, null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null);
+                var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, jobName, jobName, null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null);
                 jobRequest.Resources.Repositories.Add(new Pipelines.RepositoryResource()
                 {
                     Alias = Pipelines.PipelineConstants.SelfAlias,

src/Test/L0/Worker/JobExtensionL0.cs

@@ -100,7 +100,7 @@ namespace GitHub.Runner.Common.Tests.Worker
             };
 
             Guid jobId = Guid.NewGuid();
-            _message = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, "test", "test", null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), steps, null, null, null, null);
+            _message = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, "test", "test", null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), steps, null);
             GitHubContext github = new GitHubContext();
             github["repository"] = new Pipelines.ContextData.StringContextData("actions/runner");
             _message.ContextData.Add("github", github);

src/Test/L0/Worker/JobRunnerL0.cs

@@ -63,7 +63,7 @@ namespace GitHub.Runner.Common.Tests.Worker
             TaskOrchestrationPlanReference plan = new TaskOrchestrationPlanReference();
             TimelineReference timeline = new Timeline(Guid.NewGuid());
             Guid jobId = Guid.NewGuid();
-            _message = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, testName, testName, null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null);
+            _message = new Pipelines.AgentJobRequestMessage(plan, timeline, jobId, testName, testName, null, null, null, new Dictionary<string, VariableValue>(), new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null);
             _message.Variables[Constants.Variables.System.Culture] = "en-US";
             _message.Resources.Endpoints.Add(new ServiceEndpoint()
             {

src/Test/L0/Worker/StepsRunnerL0.cs

@@ -11,7 +11,6 @@ using Xunit;
 using GitHub.DistributedTask.Expressions2;
 using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using GitHub.Runner.Common.Util;
 
 namespace GitHub.Runner.Common.Tests.Worker
 {
@@ -56,9 +55,6 @@ namespace GitHub.Runner.Common.Tests.Worker
 
             _ec.Setup(x => x.PostJobSteps).Returns(new Stack<IStep>());
 
-            var trace = hc.GetTrace();
-            _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>())).Callback((string tag, string message) => { trace.Info($"[{tag}]{message}"); });
-
             _stepsRunner = new StepsRunner();
             _stepsRunner.Initialize(hc);
             return hc;
@@ -517,78 +513,7 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        [Fact]
+        private Mock<IActionRunner> CreateStep(TestHostContext hc, TaskResult result, string condition, Boolean continueOnError = false, MappingToken env = null, string name = "Test", bool setOutput = false)
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task StepContextOutcome()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange.
-                var step1 = CreateStep(hc, TaskResult.Succeeded, "success()", contextName: "step1");
-                var step2 = CreateStep(hc, TaskResult.Failed, "steps.step1.outcome == 'success'", continueOnError: true, contextName: "step2");
-                var step3 = CreateStep(hc, TaskResult.Succeeded, "steps.step1.outcome == 'success' && steps.step2.outcome == 'failure'", contextName: "step3");
-
-                _ec.Object.Result = null;
-
-                _ec.Setup(x => x.JobSteps).Returns(new Queue<IStep>(new[] { step1.Object, step2.Object, step3.Object }));
-
-                // Act.
-                await _stepsRunner.RunAsync(jobContext: _ec.Object);
-
-                // Assert.
-                Assert.Equal(TaskResult.Succeeded, _ec.Object.Result ?? TaskResult.Succeeded);
-
-                step1.Verify(x => x.RunAsync(), Times.Once);
-                step2.Verify(x => x.RunAsync(), Times.Once);
-                step3.Verify(x => x.RunAsync(), Times.Once);
-
-                Assert.Equal(TaskResult.Succeeded.ToActionResult().ToString(), _stepContext.GetScope(null)["step1"].AssertDictionary("")["outcome"].AssertString(""));
-                Assert.Equal(TaskResult.Succeeded.ToActionResult().ToString(), _stepContext.GetScope(null)["step1"].AssertDictionary("")["conclusion"].AssertString(""));
-                Assert.Equal(TaskResult.Failed.ToActionResult().ToString(), _stepContext.GetScope(null)["step2"].AssertDictionary("")["outcome"].AssertString(""));
-                Assert.Equal(TaskResult.Succeeded.ToActionResult().ToString(), _stepContext.GetScope(null)["step2"].AssertDictionary("")["conclusion"].AssertString(""));
-                Assert.Equal(TaskResult.Succeeded.ToActionResult().ToString(), _stepContext.GetScope(null)["step3"].AssertDictionary("")["outcome"].AssertString(""));
-                Assert.Equal(TaskResult.Succeeded.ToActionResult().ToString(), _stepContext.GetScope(null)["step3"].AssertDictionary("")["conclusion"].AssertString(""));
-
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task StepContextConclusion()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange.
-                var step1 = CreateStep(hc, TaskResult.Succeeded, "false", contextName: "step1");
-                var step2 = CreateStep(hc, TaskResult.Failed, "steps.step1.conclusion == 'skipped'", continueOnError: true, contextName: "step2");
-                var step3 = CreateStep(hc, TaskResult.Succeeded, "steps.step1.outcome == 'skipped' && steps.step2.outcome == 'failure' && steps.step2.conclusion == 'success'", contextName: "step3");
-
-                _ec.Object.Result = null;
-
-                _ec.Setup(x => x.JobSteps).Returns(new Queue<IStep>(new[] { step1.Object, step2.Object, step3.Object }));
-
-                // Act.
-                await _stepsRunner.RunAsync(jobContext: _ec.Object);
-
-                // Assert.
-                Assert.Equal(TaskResult.Succeeded, _ec.Object.Result ?? TaskResult.Succeeded);
-
-                step1.Verify(x => x.RunAsync(), Times.Never);
-                step2.Verify(x => x.RunAsync(), Times.Once);
-                step3.Verify(x => x.RunAsync(), Times.Once);
-
-                Assert.Equal(TaskResult.Skipped.ToActionResult().ToString(), _stepContext.GetScope(null)["step1"].AssertDictionary("")["outcome"].AssertString(""));
-                Assert.Equal(TaskResult.Skipped.ToActionResult().ToString(), _stepContext.GetScope(null)["step1"].AssertDictionary("")["conclusion"].AssertString(""));
-                Assert.Equal(TaskResult.Failed.ToActionResult().ToString(), _stepContext.GetScope(null)["step2"].AssertDictionary("")["outcome"].AssertString(""));
-                Assert.Equal(TaskResult.Succeeded.ToActionResult().ToString(), _stepContext.GetScope(null)["step2"].AssertDictionary("")["conclusion"].AssertString(""));
-                Assert.Equal(TaskResult.Succeeded.ToActionResult().ToString(), _stepContext.GetScope(null)["step3"].AssertDictionary("")["outcome"].AssertString(""));
-                Assert.Equal(TaskResult.Succeeded.ToActionResult().ToString(), _stepContext.GetScope(null)["step3"].AssertDictionary("")["conclusion"].AssertString(""));
-            }
-        }
-
-        private Mock<IActionRunner> CreateStep(TestHostContext hc, TaskResult result, string condition, Boolean continueOnError = false, MappingToken env = null, string name = "Test", bool setOutput = false, string contextName = null)
         {
             // Setup the step.
             var step = new Mock<IActionRunner>();
@@ -599,8 +524,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 {
                     Name = name,
                     Id = Guid.NewGuid(),
-                    Environment = env,
+                    Environment = env
-                    ContextName = contextName ?? "Test"
                 });
 
             // Setup the step execution context.
@@ -612,7 +536,6 @@ namespace GitHub.Runner.Common.Tests.Worker
             stepContext.Setup(x => x.ExpressionValues).Returns(_contexts);
             stepContext.Setup(x => x.JobContext).Returns(_jobContext);
             stepContext.Setup(x => x.StepsContext).Returns(_stepContext);
-            stepContext.Setup(x => x.ContextName).Returns(step.Object.Action.ContextName);
             stepContext.Setup(x => x.Complete(It.IsAny<TaskResult?>(), It.IsAny<string>(), It.IsAny<string>()))
                 .Callback((TaskResult? r, string currentOperation, string resultCode) =>
                 {
@@ -620,9 +543,6 @@ namespace GitHub.Runner.Common.Tests.Worker
                     {
                         stepContext.Object.Result = r;
                     }
-
-                    _stepContext.SetOutcome("", stepContext.Object.ContextName, (stepContext.Object.Outcome ?? stepContext.Object.Result ?? TaskResult.Succeeded).ToActionResult().ToString());
-                    _stepContext.SetConclusion("", stepContext.Object.ContextName, (stepContext.Object.Result ?? TaskResult.Succeeded).ToActionResult().ToString());
                 });
             var trace = hc.GetTrace();
             stepContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>())).Callback((string tag, string message) => { trace.Info($"[{tag}]{message}"); });

src/Test/L0/Worker/WorkerL0.cs

@@ -67,7 +67,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                     new Pipelines.ContextData.DictionaryContextData()
                 },
             };
-            var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, JobId, jobName, jobName, new StringToken(null, null, null, "ubuntu"), sidecarContainers, null, variables, new List<MaskHint>(), resources, context, null, actions, null, null, null, null);
+            var jobRequest = new Pipelines.AgentJobRequestMessage(plan, timeline, JobId, jobName, jobName, new StringToken(null, null, null, "ubuntu"), sidecarContainers, null, variables, new List<MaskHint>(), resources, context, null, actions, null);
             return jobRequest;
         }