diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 00000000000..af555c6a0cb
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "microsoft.dnceng.secretmanager": {
+      "version": "1.1.0-beta.21380.2",
+      "commands": [
+        "secret-manager"
+      ]
+    }
+  }
+}
diff --git a/.editorconfig b/.editorconfig
index 746feabd043..c2ca9d7d0e2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,11 +14,155 @@ tab_width = 2
 indent_size = 2
 tab_width = 2
 
+[*.{*proj,xml,props,targets,tasks}]
+indent_size = 2
+tab_width = 2
+
 [*.{cs}]
 indent_size = 4
 tab_width = 4
 
-[*.{*proj,xml,props,targets,tasks}]
-indent_size = 2
-tab_width = 2
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = one_less_than_current
+
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+
+# avoid this. unless absolutely necessary
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+
+# Types: use keywords instead of BCL types, and permit var only when the type is clear
+csharp_style_var_for_built_in_types = false:suggestion
+csharp_style_var_when_type_is_apparent = false:none
+csharp_style_var_elsewhere = false:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# name all constant fields using PascalCase
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds   = field
+dotnet_naming_symbols.constant_fields.required_modifiers = const
+dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+
+# static fields should have s_ prefix
+dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
+dotnet_naming_rule.static_fields_should_have_prefix.symbols  = static_fields
+dotnet_naming_rule.static_fields_should_have_prefix.style    = static_prefix_style
+dotnet_naming_symbols.static_fields.applicable_kinds   = field
+dotnet_naming_symbols.static_fields.required_modifiers = static
+dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
+dotnet_naming_style.static_prefix_style.required_prefix = s_
+dotnet_naming_style.static_prefix_style.capitalization = camel_case
+
+# internal and private fields should be _camelCase
+dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
+dotnet_naming_rule.camel_case_for_private_internal_fields.symbols  = private_internal_fields
+dotnet_naming_rule.camel_case_for_private_internal_fields.style    = camel_case_underscore_style
+dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
+dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
+dotnet_naming_style.camel_case_underscore_style.required_prefix = _
+dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
+
+# Code style defaults
+csharp_using_directive_placement = outside_namespace:suggestion
+dotnet_sort_system_directives_first = true
+csharp_prefer_braces = true:silent
+csharp_preserve_single_line_blocks = true:none
+csharp_preserve_single_line_statements = false:none
+csharp_prefer_static_local_function = true:suggestion
+csharp_prefer_simple_using_statement = false:none
+csharp_style_prefer_switch_expression = true:suggestion
+
+# Code quality
+dotnet_style_readonly_field = true:suggestion
+dotnet_code_quality_unused_parameters = non_public:suggestion
+
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+csharp_prefer_simple_default_expression = true:suggestion
+
+# Expression-bodied members
+csharp_style_expression_bodied_methods = true:silent
+csharp_style_expression_bodied_constructors = true:silent
+csharp_style_expression_bodied_operators = true:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = true:silent
+
+# Pattern matching
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+
+# Null checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Other features
+csharp_style_prefer_index_operator = false:none
+csharp_style_prefer_range_operator = false:none
+csharp_style_pattern_local_over_anonymous_function = false:none
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = do_not_ignore
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# Analyzers
+dotnet_code_quality.CA1052.api_surface = private, internal
+dotnet_code_quality.CA1802.api_surface = private, internal
+dotnet_code_quality.CA1822.api_surface = private, internal
+dotnet_code_quality.CA2208.api_surface = public
 
+# License header
+file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
diff --git a/.gitignore b/.gitignore
index 19c954ea8f3..9c26a6609e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ x86/ !eng/common/cross/x86/
 msbuild.log
 msbuild.err
 msbuild.wrn
-msbuild.binlog
+*.binlog
 
 # Visual Studio 2015
 .vs/
@@ -131,3 +131,9 @@ node_modules/
 # Python Compile Outputs
 
 *.pyc
+
+# IntelliJ
+.idea/
+
+# vscode python env files
+.env
\ No newline at end of file
diff --git a/.vault-config/dotnetbuildskeys.yaml b/.vault-config/dotnetbuildskeys.yaml
new file mode 100644
index 00000000000..90a841b6763
--- /dev/null
+++ b/.vault-config/dotnetbuildskeys.yaml
@@ -0,0 +1,18 @@
+storageLocation:
+  type: azure-key-vault
+  parameters:
+    subscription: 11c6037b-227b-4d63-bee1-18c7b68c3a40
+    name: dotnetbuildskeys
+
+secrets:
+  dotnetbuilds-access-key:
+    type: azure-storage-key
+    parameters:
+      subscription: 11c6037b-227b-4d63-bee1-18c7b68c3a40
+      account: dotnetbuilds
+
+  dotnetbuilds-connection-string:
+    type: azure-storage-connection-string
+    parameters:
+      storageKeySecret: dotnetbuilds-access-key
+      account: dotnetbuilds
diff --git a/.vault-config/dotnetbuildstokens.yaml b/.vault-config/dotnetbuildstokens.yaml
new file mode 100644
index 00000000000..cdeb02190c4
--- /dev/null
+++ b/.vault-config/dotnetbuildstokens.yaml
@@ -0,0 +1,111 @@
+storageLocation:
+  type: azure-key-vault
+  parameters:
+    subscription: 11c6037b-227b-4d63-bee1-18c7b68c3a40
+    name: dotnetbuildstokens
+
+references:
+  dotnetbuildskeys:
+    type: azure-key-vault
+    parameters:
+      subscription: 11c6037b-227b-4d63-bee1-18c7b68c3a40
+      name: dotnetbuildskeys
+
+secrets:
+  dotnetbuilds-internal-container-read-uri:
+    type: azure-storage-container-sas-uri
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rl
+      container: internal
+
+  dotnetbuilds-internal-container-read-uri-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetbuilds-internal-container-read-uri
+
+  dotnetbuilds-internal-container-read-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rl
+      container: internal
+
+  dotnetbuilds-internal-container-read-token-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetbuilds-internal-container-read-token
+
+  dotnetbuilds-internal-checksums-container-read-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rl
+      container: internal-checksums
+
+  dotnetbuilds-internal-checksums-container-read-token-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetbuilds-internal-checksums-container-read-token
+
+  dotnetbuilds-internal-container-uri:
+    type: azure-storage-container-sas-uri
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rlwc
+      container: internal
+
+  dotnetbuilds-internal-container-uri-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetbuilds-internal-container-uri
+
+  dotnetbuilds-internal-container-checksum-uri:
+    type: azure-storage-container-sas-uri
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rlwc
+      container: internal-checksums
+
+  dotnetbuilds-internal-container-checksum-uri-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetbuilds-internal-container-checksum-uri
+
+  dotnetbuilds-public-container-uri:
+    type: azure-storage-container-sas-uri
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rlwc
+      container: public
+
+  dotnetbuilds-public-container-uri-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetbuilds-public-container-uri
+
+  dotnetbuilds-public-container-checksum-uri:
+    type: azure-storage-container-sas-uri
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rlwc
+      container: public-checksums
+
+  dotnetbuilds-public-container-checksum-uri-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetbuilds-public-container-checksum-uri
diff --git a/.vault-config/product-builds-dnceng-pipeline-secrets.yaml b/.vault-config/product-builds-dnceng-pipeline-secrets.yaml
new file mode 100644
index 00000000000..6c0b90ce500
--- /dev/null
+++ b/.vault-config/product-builds-dnceng-pipeline-secrets.yaml
@@ -0,0 +1,84 @@
+storageLocation:
+  type: azure-key-vault
+  parameters:
+    subscription: a4fc5514-21a9-4296-bfaf-5c7ee7fa35d1
+    name: dnceng-pipeline-secrets
+
+secrets:
+  #DotNet-DotNetCli-Storage
+  dotnetcli-storage-key:
+    type: text
+    parameters:
+      description: set to never expire
+
+  dotnetclichecksums-storage-key:
+    type: text
+    parameters:
+      description: set to never expire
+
+  #DotNet-MSRC-Storage
+  dotnetbuilddropsmsrc-access-key:
+    type: text
+    parameters:
+      description: set to never expire
+
+  dotnetclichecksumsmsrc-storage-key:
+    type: text
+    parameters:
+      description: set to never expire
+
+  dotnetclimsrc-access-key:
+    type: text
+    parameters:
+      description: set to never expire
+
+  dotnetclimsrc-private-feed-url:
+    type: text
+    parameters:
+      description: created manually from SAS in the format https://dotnetclimsrc.azurewebsites.net/sig/{sig}/se{se}
+
+  dotnetclimsrc-connection-string:
+    type: azure-storage-connection-string
+    parameters:
+      storageKeySecret: dotnetclimsrc-access-key
+      account: dotnetclimsrc
+
+  dotnetclimsrc-read-sas-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString: dotnetclimsrc-connection-string
+      permissions: rl
+      container: dotnet
+
+  dotnetclimsrc-read-sas-token-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetclimsrc-read-sas-token
+
+  dotnetfeedmsrc-private-feed-url:
+    type: text
+    parameters:
+      description: created manually from SAS in the format https://dotnetfeedmsrc.azurewebsites.net/sig/{sig}/se{se}
+
+  dotnetfeedmsrc-storage-access-key-1:
+    type: text
+    parameters:
+      description: set to never expire
+
+  dotnetfeedmsrc-connection-string:
+    type: azure-storage-connection-string
+    parameters:
+      storageKeySecret: dotnetfeedmsrc-storage-access-key-1
+      account: dotnetfeedmsrc
+
+  dotnetfeedmsrc-read-sas-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString: dotnetfeedmsrc-connection-string
+      permissions: r
+      container: $root
+
+  dotnetfeedmsrc-read-sas-token-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetfeedmsrc-read-sas-token
\ No newline at end of file
diff --git a/.vault-config/product-builds-engkeyvault.yaml b/.vault-config/product-builds-engkeyvault.yaml
new file mode 100644
index 00000000000..304383f06c4
--- /dev/null
+++ b/.vault-config/product-builds-engkeyvault.yaml
@@ -0,0 +1,261 @@
+storageLocation:
+  type: azure-key-vault
+  parameters:
+    subscription: a4fc5514-21a9-4296-bfaf-5c7ee7fa35d1
+    name: EngKeyVault
+
+references:
+  helixkv:
+    type: azure-key-vault
+    parameters:
+      subscription: a4fc5514-21a9-4296-bfaf-5c7ee7fa35d1
+      name: helixkv
+      
+references:
+  dotnetbuildskeys:
+    type: azure-key-vault
+    parameters:
+      subscription: 11c6037b-227b-4d63-bee1-18c7b68c3a40
+      name: dotnetbuildskeys
+
+secrets:
+  BotAccount-dotnet-maestro-bot:
+    type: github-account
+    parameters:
+      Name: dotnet-maestro-bot
+
+  #DotNet-Blob-Feed
+  dotnetfeed-storage-access-key-1:
+    type: azure-storage-key
+    parameters:
+      subscription: a4fc5514-21a9-4296-bfaf-5c7ee7fa35d1
+      account: dotnetfeed
+
+  #Publish-Build-Assets
+  MaestroAccessToken:
+    type: maestro-access-token
+    parameters:
+      environment: maestro-prod.westus2.cloudapp.azure.com
+
+  BotAccount-dotnet-maestro-bot-PAT:
+    type: github-access-token
+    parameters:
+      gitHubBotAccountSecret: BotAccount-dotnet-maestro-bot
+      gitHubBotAccountName: dotnet-maestro-bot
+
+  dn-bot-dnceng-build-rw-code-rw:
+    type: azure-devops-access-token
+    parameters:
+      domainAccountName: dn-bot
+      domainAccountSecret:
+          location: helixkv
+          name: dn-bot-account-redmond
+      name: dn-bot-dnceng-build
+      organization: dnceng
+
+  akams:
+    type: github-oauth-secret
+    parameters:
+      appName: akams
+      description: set to never expire
+
+  publishing-dnceng-devdiv-code-r-build-re:
+    type: azure-devops-access-token
+    parameters:
+      domainAccountName: dn-bot
+      domainAccountSecret:
+          location: helixkv
+          name: dn-bot-account-redmond
+      name: publishing-dnceng-devdiv-code
+      organization: dnceng
+
+  dn-bot-dotnet-build-rw-code-rw:
+    type: azure-devops-access-token
+    parameters:
+      domainAccountName: dn-bot
+      domainAccountSecret:
+          location: helixkv
+          name: dn-bot-account-redmond
+      name: dn-bot-dotnet-build
+      organization: dnceng
+
+  dn-bot-all-orgs-build-rw-code-rw:
+    type: azure-devops-access-token
+    parameters:
+      domainAccountName: dn-bot
+      domainAccountSecret:
+          location: helixkv
+          name: dn-bot-account-redmond
+      name: dn-bot-all-orgs-build
+      organization: dnceng
+
+  #DotNet-AllOrgs-Darc-Pats
+  dn-bot-devdiv-dnceng-rw-code-pat:
+    type: azure-devops-access-token
+    parameters:
+      domainAccountName: dn-bot
+      domainAccountSecret:
+          location: helixkv
+          name: dn-bot-account-redmond
+      name: dn-bot-devdiv-dnceng
+      organization: dnceng
+
+  #AzureDevOps-Artifact-Feeds-Pats
+  dn-bot-dnceng-artifact-feeds-rw:
+    type: azure-devops-access-token
+    parameters:
+      domainAccountName: dn-bot
+      domainAccountSecret:
+          location: helixkv
+          name: dn-bot-account-redmond
+      name: dn-bot-dnceng-artifact-feeds
+      organization: dnceng
+
+  dn-bot-dnceng-universal-packages-rw:
+    type: azure-devops-access-token
+    parameters:
+      domainAccountName: dn-bot
+      domainAccountSecret:
+          location: helixkv
+          name: dn-bot-account-redmond
+      name: dn-bot-dnceng-universal-packages
+      organization: dnceng
+
+  dn-bot-all-orgs-artifact-feeds-rw:
+    type: azure-devops-access-token
+    parameters:
+      domainAccountName: dn-bot
+      domainAccountSecret:
+          location: helixkv
+          name: dn-bot-account-redmond
+      name: dn-bot-all-orgs-artifact-feeds
+      organization: dnceng
+
+  #DotNet-Symbol-Server-Pats
+  microsoft-symbol-server-pat:
+    type: azure-devops-access-token
+    parameters:
+      domainAccountSecret:
+          location: helixkv
+          name: dn-bot-account-redmond
+      name: microsoft-symbol-server-pat
+      organization: dnceng
+
+  symweb-symbol-server-pat:
+    type: azure-devops-access-token
+    parameters:
+      domainAccountSecret:
+          location: helixkv
+          name: dn-bot-account-redmond
+      name: dn-symweb-symbol-server-pat
+      organization: dnceng
+
+  dotnetfeedmsrc-storage-access-key-1:
+    type: text
+    parameters:
+      description: Also located in dnceng-pipeline-secrets keyvault.
+      
+  dotnetfeedmsrc-private-feed-url:
+    type: text
+    parameters:
+      description: created manually from SAS in the format https://dotnetfeedmsrc.azurewebsites.net/sig/{sig}/se{se}
+
+  dotnetfeedmsrc-connection-string:
+    type: azure-storage-connection-string
+    parameters:
+      storageKeySecret: dotnetfeedmsrc-storage-access-key-1
+      account: dotnetfeedmsrc
+
+  dotnetfeedmsrc-read-sas-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString: dotnetfeedmsrc-connection-string
+      permissions: r
+      container: $root
+
+  dotnetfeedmsrc-read-sas-token-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetfeedmsrc-read-sas-token
+
+  dotnetclimsrc-access-key:
+    type: text
+    parameters:
+      description: Also located in dnceng-pipeline-secrets keyvault.
+
+  dotnetclimsrc-private-feed-url:
+    type: text
+    parameters:
+      description: created manually from SAS in the format https://dotnetclimsrc.azurewebsites.net/sig/{sig}/se{se}
+
+  dotnetclimsrc-connection-string:
+    type: azure-storage-connection-string
+    parameters:
+      storageKeySecret: dotnetclimsrc-access-key
+      account: dotnetclimsrc
+
+  dotnetclimsrc-read-sas-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString: dotnetclimsrc-connection-string
+      permissions: rl
+      container: dotnet
+
+  dotnetclimsrc-read-sas-token-base64:
+    type: base64-encoder
+    parameters:
+      secret: dotnetclimsrc-read-sas-token
+
+  dotnetclichecksumsmsrc-storage-key:
+    type: text
+    parameters:
+      description: Also located in dnceng-pipeline-secrets keyvault.
+
+  dotnetclichecksumsmsrc-connection-string:
+    type: azure-storage-connection-string
+    parameters:
+      storageKeySecret: dotnetclichecksumsmsrc-storage-key
+      account: dotnetclichecksumsmsrc
+      
+  dotnetclichecksumsmsrc-dotnet-read-list-sas-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString: dotnetclichecksumsmsrc-connection-string
+      permissions: rl
+      container: dotnet
+
+  dotnetbuilds-internal-container-read-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rl
+      container: internal
+
+  dotnetbuilds-public-container-read-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rl
+      container: public
+
+  dotnetbuilds-internal-checksums-container-read-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rl
+      container: internal-checksums
+
+  dotnetbuilds-public-checksums-container-read-token:
+    type: azure-storage-container-sas-token
+    parameters:
+      connectionString:
+        name: dotnetbuilds-connection-string
+        location: dotnetbuildskeys
+      permissions: rl
+      container: public-checksums
diff --git a/.vault-config/product-builds-helixprodkv.yaml b/.vault-config/product-builds-helixprodkv.yaml
new file mode 100644
index 00000000000..4dc01995c60
--- /dev/null
+++ b/.vault-config/product-builds-helixprodkv.yaml
@@ -0,0 +1,11 @@
+storageLocation:
+  type: azure-key-vault
+  parameters:
+    subscription: 68672ab8-de0c-40f1-8d1b-ffb20bd62c0f
+    name: HelixProdKV
+
+secrets:
+  HelixApiAccessToken:
+    type: helix-access-token
+    parameters:
+      environment: helix.dot.net
\ No newline at end of file
diff --git a/.vault-config/product-builds-netsourceindexvault.yaml b/.vault-config/product-builds-netsourceindexvault.yaml
new file mode 100644
index 00000000000..c1b49124444
--- /dev/null
+++ b/.vault-config/product-builds-netsourceindexvault.yaml
@@ -0,0 +1,20 @@
+storageLocation:
+  type: azure-key-vault
+  parameters:
+    subscription: a4fc5514-21a9-4296-bfaf-5c7ee7fa35d1
+    name: netsourceindexvault
+
+secrets:
+  source-dot-net-stage1-connection-string:
+    type: azure-storage-connection-string
+    parameters:
+      subscription: a4fc5514-21a9-4296-bfaf-5c7ee7fa35d1
+      account: netsourceindexstage1
+
+  #source-dot-net stage1 variables
+  source-dot-net-stage1-blob-container-url:
+    type: azure-storage-container-sas-uri
+    parameters:
+      connectionString: source-dot-net-stage1-connection-string
+      permissions: racwdl
+      container: stage1
\ No newline at end of file
diff --git a/Arcade.sln b/Arcade.sln
index b82432eb5b4..8ffbc84b305 100644
--- a/Arcade.sln
+++ b/Arcade.sln
@@ -91,7 +91,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Helix.JobS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.CMake.Sdk", "src\Microsoft.DotNet.CMake.Sdk\Microsoft.DotNet.CMake.Sdk.csproj", "{B1BFCB54-0FE7-4745-A471-2D7F21B5C7B9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk", "src\Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk\src\Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.csproj", "{E83B25A9-66C3-4E15-9BC3-E843CC471622}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Tasks.TargetFramework", "src\Microsoft.DotNet.Build.Tasks.TargetFramework\src\Microsoft.DotNet.Build.Tasks.TargetFramework.csproj", "{E83B25A9-66C3-4E15-9BC3-E843CC471622}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Helix.Sdk.Tests", "src\Microsoft.DotNet.Helix\Sdk.Tests\Microsoft.DotNet.Helix.Sdk.Tests\Microsoft.DotNet.Helix.Sdk.Tests.csproj", "{03390E61-9DC1-4893-93A4-193D76C16034}"
 EndProject
@@ -129,14 +129,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Arcade.Common", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Arcade.Test.Common", "src\Common\Microsoft.Arcade.Test.Common\Microsoft.Arcade.Test.Common.csproj", "{6CA09DC9-E654-4906-A977-1279F6EDC109}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageValidation", "src\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj", "{B691A17B-B577-431C-AF4D-199BBAC8EC97}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageTesting", "src\Microsoft.DotNet.PackageTesting\Microsoft.DotNet.PackageTesting.csproj", "{B691A17B-B577-431C-AF4D-199BBAC8EC97}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageValidation.Tests", "src\Microsoft.DotNet.PackageValidation.Tests\Microsoft.DotNet.PackageValidation.Tests.csproj", "{8BBF14AC-48F0-4282-910E-48E816021660}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.PackageTesting.Tests", "src\Microsoft.DotNet.PackageTesting.Tests\Microsoft.DotNet.PackageTesting.Tests.csproj", "{8BBF14AC-48F0-4282-910E-48E816021660}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Arcade.Common.Tests", "src\Common\Microsoft.Arcade.Common.Tests\Microsoft.Arcade.Common.Tests.csproj", "{B5E9D9D8-59E0-49F8-9C3C-75138A2D452C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Tasks.Workloads", "src\Microsoft.DotNet.Build.Tasks.Workloads\src\Microsoft.DotNet.Build.Tasks.Workloads.csproj", "{A7F1E9A4-5681-47A2-B278-CCC9B68C3B40}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Tasks.Workloads.Tests", "src\Microsoft.DotNet.Build.Tasks.Workloads.Tests\Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj", "{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Tasks.Templating", "src\Microsoft.DotNet.Build.Tasks.Templating\src\Microsoft.DotNet.Build.Tasks.Templating.csproj", "{AED823B2-2167-408E-9732-ECAD854FDCA5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Tasks.Templating.Tests", "src\Microsoft.DotNet.Build.Tasks.Templating\test\Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj", "{FB4168D5-6EA6-4777-AD4F-95758C177FE8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -863,6 +869,42 @@ Global
 		{A7F1E9A4-5681-47A2-B278-CCC9B68C3B40}.Release|x64.Build.0 = Release|Any CPU
 		{A7F1E9A4-5681-47A2-B278-CCC9B68C3B40}.Release|x86.ActiveCfg = Release|Any CPU
 		{A7F1E9A4-5681-47A2-B278-CCC9B68C3B40}.Release|x86.Build.0 = Release|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Debug|x64.Build.0 = Debug|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Debug|x86.Build.0 = Debug|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Release|x64.ActiveCfg = Release|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Release|x64.Build.0 = Release|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Release|x86.ActiveCfg = Release|Any CPU
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D}.Release|x86.Build.0 = Release|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Debug|x64.Build.0 = Debug|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Debug|x86.Build.0 = Debug|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Release|x64.ActiveCfg = Release|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Release|x64.Build.0 = Release|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Release|x86.ActiveCfg = Release|Any CPU
+		{AED823B2-2167-408E-9732-ECAD854FDCA5}.Release|x86.Build.0 = Release|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Debug|x64.Build.0 = Debug|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Debug|x86.Build.0 = Debug|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Release|x64.ActiveCfg = Release|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Release|x64.Build.0 = Release|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Release|x86.ActiveCfg = Release|Any CPU
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -883,19 +925,23 @@ Global
 		{3CCA947D-B466-4481-BC78-43CE98A8A3A7} = {80888CDA-37DC-4061-AF5F-7237BF16A320}
 		{86D901E6-C054-445B-92EC-E267EBB16278} = {80888CDA-37DC-4061-AF5F-7237BF16A320}
 		{4626A7D1-7AC0-4E21-9FED-083EF2A8194C} = {C53DD924-C212-49EA-9BC4-1827421361EF}
+		{036A1269-EA1B-457A-8447-D90AEF80BAF9} = {C53DD924-C212-49EA-9BC4-1827421361EF}
 		{41F3EF12-6062-44CE-A1DB-1DCA76122AF8} = {C53DD924-C212-49EA-9BC4-1827421361EF}
 		{6E19C6B6-4ADF-4DD6-86CC-6C1624BCDB71} = {C53DD924-C212-49EA-9BC4-1827421361EF}
-		{3376C769-211F-4537-A156-5F841FF7840B} = {6BE49638-F842-4329-BE8A-30C0F30CCAA5}
-		{03390E61-9DC1-4893-93A4-193D76C16034} = {6BE49638-F842-4329-BE8A-30C0F30CCAA5}
+		{3376C769-211F-4537-A156-5F841FF7840B} = {C53DD924-C212-49EA-9BC4-1827421361EF}
+		{03390E61-9DC1-4893-93A4-193D76C16034} = {C53DD924-C212-49EA-9BC4-1827421361EF}
 		{D6AC20A4-1719-49FE-B112-B2AB564496F8} = {C53DD924-C212-49EA-9BC4-1827421361EF}
-		{61041759-64FE-425F-8984-BA876428A595} = {E41E23C4-5CB0-4C61-9E05-EEFFEC4B356D}
+		{61041759-64FE-425F-8984-BA876428A595} = {C53DD924-C212-49EA-9BC4-1827421361EF}
 		{52E92416-5E5F-4A62-A837-9D8554DD2805} = {6F517597-E9E2-43B2-B7E2-757132EA525C}
 		{6F517597-E9E2-43B2-B7E2-757132EA525C} = {E41E23C4-5CB0-4C61-9E05-EEFFEC4B356D}
 		{1CC55B23-6212-4120-BF52-8DED9CFF9FBC} = {6F517597-E9E2-43B2-B7E2-757132EA525C}
 		{CE5278A3-2442-4309-A543-5BA5C1C76A2A} = {C53DD924-C212-49EA-9BC4-1827421361EF}
 		{E941EDE6-3FFB-4776-A4CE-750755D57817} = {C53DD924-C212-49EA-9BC4-1827421361EF}
 		{6CA09DC9-E654-4906-A977-1279F6EDC109} = {C53DD924-C212-49EA-9BC4-1827421361EF}
+		{8BBF14AC-48F0-4282-910E-48E816021660} = {C53DD924-C212-49EA-9BC4-1827421361EF}
 		{B5E9D9D8-59E0-49F8-9C3C-75138A2D452C} = {C53DD924-C212-49EA-9BC4-1827421361EF}
+		{0B5D3C20-EB58-4A82-A3AA-2E626A17B35D} = {C53DD924-C212-49EA-9BC4-1827421361EF}
+		{FB4168D5-6EA6-4777-AD4F-95758C177FE8} = {C53DD924-C212-49EA-9BC4-1827421361EF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {32B9C883-432E-4FC8-A1BF-090EB033DD5B}
diff --git a/Directory.Build.props b/Directory.Build.props
index 960eb6c9aa0..37feef5e5fd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,16 +18,6 @@
     <IsShipping>false</IsShipping>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
-    <!--    
-      When building using source-build the process is:
-      - Newtonsoft.Json versions 9.0.1 and 12.0.2 are built by source-build
-      - Version 12.0.2 is written to Version.props
-      - Arcade needs to use 9.0.1 so we need to override Version.props value here
-    -->
-    <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(DotNetBuildOffline)' == 'true'">
     <!--
       Arcade has a special version prop for CodeAnalysis.CSharp in GenFacades
diff --git a/Documentation/ArcadeSdk.md b/Documentation/ArcadeSdk.md
index 5ef96cf064d..c06e6b18722 100644
--- a/Documentation/ArcadeSdk.md
+++ b/Documentation/ArcadeSdk.md
@@ -538,7 +538,7 @@ targets file will be available within the `.nuspec` file via variable `$SourceLi
 
 ## Building VSIX packages (optional)
 
-Building Visual Studio components is an opt-in feature of the Arcade SDK. Property `UsingToolVSSDK` needs to be set to `true` in the `Versions.props` file.
+Building Visual Studio components is an opt-in feature of the Arcade SDK. Property `UsingToolVSSDK` needs to be set to `true` in the `Versions.props` file.  You need to build using framework MSBuild when building VSIX packages.  To build using framework MSBuild, [specify the MSBuild engine](https://github.com/dotnet/arcade/blob/0916e2d4f072d0a87db15803ce5572ff687354d4/eng/common/build.ps1#L68) as VS when building.
 
 Set `VSSDKTargetPlatformRegRootSuffix` property to specify the root suffix of the VS hive to deploy to.
 
@@ -630,7 +630,7 @@ The steps below assume the following variables to be defined:
 ### Signing plugin installation
 
 ```yml
-- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
+- task: MicroBuildSigningPlugin@3
   displayName: Install Signing Plugin
   inputs:
     signType: real
diff --git a/Documentation/AzureDevOps/AzureDevOpsOnboarding.md b/Documentation/AzureDevOps/AzureDevOpsOnboarding.md
index 2cb3369716b..9462bf086e1 100644
--- a/Documentation/AzureDevOps/AzureDevOpsOnboarding.md
+++ b/Documentation/AzureDevOps/AzureDevOpsOnboarding.md
@@ -13,7 +13,6 @@
     - [Internal : (Pool Provider: NetCoreInternal-Pool)](#internal--pool-provider-netcoreinternal-pool)
   - [CI badge link](#ci-badge-link)
   - [Signed Builds](#signed-builds)
-  - [Generate Graph Files](#generate-graph-files)
   - [Security](#security)
   - [Notes about Yaml](#notes-about-yaml)
   - [Troubleshooting](#troubleshooting)
@@ -117,7 +116,7 @@ A couple of notes:
 
   - Whenever possible, you're always encouraged to use the hosted agent pools for your builds.  These don't come from the same budget as other build agents, and have far more MacOS machines than the Engineering Services team has.  
 
-- BuildPool Helix machines will be defined in the [dnceng internal repo 'dotnet-helix-machines'](https://dnceng.visualstudio.com/internal/_git/dotnet-helix-machines?path=%2Fdefinitions%2Fshared&version=GBmaster).  While this format is a bit dense, it is what is used by the deployment system so represents precisely what was on the machines for a given date of deployment.  As such, the descriptions below are not necessarily up-to-date but do represent what these queues had as of this edit.
+- BuildPool Helix machines will be defined in the [dnceng internal repo 'dotnet-helix-machines'](https://dnceng.visualstudio.com/internal/_git/dotnet-helix-machines?path=%2Fdefinitions%2Fshared&version=GBmain).  While this format is a bit dense, it is what is used by the deployment system so represents precisely what was on the machines for a given date of deployment.  As such, the descriptions below are not necessarily up-to-date but do represent what these queues had as of this edit.
 
 - BuildPool.Windows queues:
 
@@ -155,10 +154,6 @@ https://dev.azure.com/dnceng/public/_build?definitionId=208&branchName=master
 
 dev.azure.com/dnceng now has support for signed builds.  Code should be mirrored to dev.azure.com/dnceng/internal as outlined in the [Azure DevOps Guidance](./AzureDevOpsGuidance.md#projects).  See [MovingFromDevDivToDncEng.md](./MovingFromDevDivToDncEng.md) for information about moving signed builds from DevDiv to DncEng.
 
-## Generate Graph Files
-
-Generation of graph files as part of official builds is now supported. See [GeneratingGraphFiles.md](GeneratingGraphFiles.md) for information on how to opt-in to this feature.
-
 ## Security
 
 [Security documentation](https://docs.microsoft.com/en-us/azure/devops/build-release/actions/ci-build-github?view=vsts#security-considerations)
diff --git a/Documentation/AzureDevOps/GeneratingGraphFiles.md b/Documentation/AzureDevOps/GeneratingGraphFiles.md
deleted file mode 100644
index 8cac3bdf603..00000000000
--- a/Documentation/AzureDevOps/GeneratingGraphFiles.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Generating Graph Files
-
-What are the dependencies in this build? What commits are included and what how far are they from 
-those in HEAD? These were some of the common questions asked during meetings. In order to answer them
-we had to go check different files and child repos and make sure we had the right idea.
-
-Today, with the help of `darc` and the data stored in the Build Asset Registry we can generate different
-kind of graph files which contain the data needed to take the right decisions and answer the questions
-mentioned above. 
-
-## The command
-
-Under the scenes the thing generating the graph files is `darc` by running the `get-dependency-graph` command.
-
-## Shiproom data
-
-### Enabling graph generation
-
-Graph generation is off by default so you'd need to enable it in your official builds. As well, you'd need to define
-whether you want toolset dependencies included in your graph. This is also off by default.
-
-If your build definition relies on `/eng/common/templates/jobs/jobs.yml` to execute the jobs you just need to
-define the following under template parameters:
-
-```yaml
-- template: /eng/common/templates/jobs/jobs.yml
-  parameters:
-    graphFileGeneration:
-      enabled: true
-      includeToolset: true
-```
-
-The above enables graph generation where the graphs will include toolset dependencies. If toolset dependencies are not needed
-just remove `includeToolset: true`
-
-### Generated Files
-
-* graph-flat.txt: includes the contents of a dependency graph with unique sets of repository+branch
-* graph-full.txt: includes the contents of a complete dependency graph
-* graphviz.txt: includes the contents of a graph that can be then pasted in http://www.webgraphviz.com
-* graph.png: the same image that would be generated by graphviz.txt in http://www.webgraphviz.com
-
-## Generating the graph locally
-
-As mentioned above, we use darc to generate the different graphs. The base command is the same and we just need to pass a different
-set of options. 
-
-* To generate a full graph: `darc get-dependency-graph --output-file <full-graph-file-path>`
-* To generate a flat graph: `darc get-dependency-graph --flat --output-file <flat-graph-file-path>`
-* To generate a graphviz graph: `darc get-dependency-graph --graphviz <graphviz-graph-file-path>`
-
-There are more options for this command for you to include toolset dependencies, coherency information, etc. For a list of all the
-options execute `darc get-dependency-graph -h`.
-
-## Samples
-
-* [Arcade](https://github.com/dotnet/arcade/blob/master/azure-pipelines.yml#L39) - Graph generation is deferred to 
-`/eng/common/templates/jobs/jobs.yml`
-* [Core-SDK](https://github.com/dotnet/core-sdk/blob/master/.vsts-ci.yml#L280) - Graph generation is defined in the main
-build definition
\ No newline at end of file
diff --git a/Documentation/AzureDevOps/SendingJobsToHelix.md b/Documentation/AzureDevOps/SendingJobsToHelix.md
index a452bde15de..f5055c77cea 100644
--- a/Documentation/AzureDevOps/SendingJobsToHelix.md
+++ b/Documentation/AzureDevOps/SendingJobsToHelix.md
@@ -1,10 +1,10 @@
 # Sending Jobs to Helix
 
-The primary reason to use Helix is to leverage its scalability to run tests. Arcade and the Arcade SDK provide out-of-the-box functionality to interface with Helix.
+The primary reason to use [Helix](/Documentation/Helix.md) is to leverage its scalability to run tests. Arcade and the Arcade SDK provide out-of-the-box functionality to interface with Helix.
 
 ## Understanding Helix
 
-This document assumes you have familiarity with Helix. If that is not the case, it is recommended that you start [here](https://github.com/dotnet/core-eng/blob/master/Documentation/HelixDocumentation.md).
+This document assumes you have familiarity with Helix. If that is not the case, it is recommended that you start [here](/Documentation/Helix.md).
 
 ## Getting Started
 
@@ -83,7 +83,7 @@ The simplest Helix use-case is zipping up a single folder containing your projec
 Simply specify the xUnit project(s) you wish to run (semicolon delimited) with the `XUnitProjects` parameter. Then, specify:
 * the `XUnitPublishTargetFramework` &ndash; this is the framework your **test projects are targeting**, e.g. `netcoreapp3.1`.
 * the `XUnitRuntimeTargetFramework` &ndash; this is the framework version of xUnit you want to use from the xUnit NuGet package, e.g. `netcoreapp2.0`. Notably, the xUnit console runner only supports up to netcoreapp2.0 as of 14 March 2018, so this is the target that should be specified for running against any higher version test projects.
-* the `XUnitRunnerVersion` (the version of the xUnit nuget package you want to use, e.g. `2.4.1`).
+* the `XUnitRunnerVersion` (the version of the xUnit nuget package you want to use, e.g. `2.4.2-pre.9`).
 
 Finally, set `IncludeDotNetCli` to true and specify which `DotNetCliPackageType` (`sdk`, `runtime` or `aspnetcore-runtime`) and `DotNetCliVersion` you wish to use. (For a full list of .NET CLI versions/package types, see these links: [3.0](https://dotnet.microsoft.com/download/dotnet-core/3.0), [2.1](https://dotnet.microsoft.com/download/dotnet-core/2.1), [2.2](https://dotnet.microsoft.com/download/dotnet-core/2.2).)
 
@@ -104,7 +104,7 @@ The list of available Helix queues can be found on the [Helix homepage](https://
       # XUnitWorkItemTimeout: '00:05:00' -- a timeout (specified as a System.TimeSpan string) for all work items created from XUnitProjects
       XUnitPublishTargetFramework: netcoreapp3.1 # specify your publish target framework here
       XUnitRuntimeTargetFramework: netcoreapp2.0 # specify the framework you want to use for the xUnit runner
-      XUnitRunnerVersion: 2.4.1 # specify the version of xUnit runner you wish to use here
+      XUnitRunnerVersion: 2.4.2-pre.9 # specify the version of xUnit runner you wish to use here
       # WorkItemDirectory: '' -- payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
       # WorkItemCommand: '' -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
       # WorkItemTimeout: '' -- a timeout (specified as a System.TimeSpan string) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
diff --git a/Documentation/AzureDevOps/TemplateSchema.md b/Documentation/AzureDevOps/TemplateSchema.md
index c304c87dd86..cc1c511781e 100644
--- a/Documentation/AzureDevOps/TemplateSchema.md
+++ b/Documentation/AzureDevOps/TemplateSchema.md
@@ -16,9 +16,6 @@ parameters:
   continueOnError: boolean # 'true' if future jobs should run even if this job fails; defaults to 'false'
   enablePublishBuildArtifacts: boolean # Enables publishing build logs as an Azure DevOps artifact.
   enablePublishUsingPipelines: boolean # Enable publishing using release pipelines
-  graphFileGeneration:
-    enabled: boolean # Enable generating the graph files at the end of the build
-    includeToolset: boolean # Include toolset dependencies in the generated graph files
   jobs: [ jobSchema ] # see "Job schema" below
   publishBuildAssetsDependsOn: [ string ] # Override automatically derived dependsOn value for "publish build assets" job
   runAsPublic: boolean # Specify if job should run as a public build even in the internal project
diff --git a/Documentation/AzureDevOps/TestReportingQueries.md b/Documentation/AzureDevOps/TestReportingQueries.md
new file mode 100644
index 00000000000..c7da80815fa
--- /dev/null
+++ b/Documentation/AzureDevOps/TestReportingQueries.md
@@ -0,0 +1,115 @@
+# Test Reporting Queries
+
+The following is a list of default queries to use to look up information about failed tests. Feel free to change them for your own usages. 
+
+Caveats (Jan 14, 2022): 
+- Because this data is stored in an internal data source, it is unfortunately currently only available to Microsoft employees. (If you are an internal Microsoft employee, you can request access from the [.NET Engineering Services team](https://github.com/dotnet/core-eng/wiki/How-to-get-a-hold-of-Engineering-Servicing).)
+- Test data is only recently populated, thus, we only have about 2.5 weeks worth of data. 
+- There is a [known issue](https://github.com/dotnet/core-eng/issues/14708) with how we're capturing this data that is currently being worked on, thus, some of the data we have may not be complete. 
+
+## Index
+  - [Tests That Have Failed X% of the Time in the Recent Timespan](#tests-that-have-failed-x-of-the-time-in-the-recent-timespan)
+  - [Mean Value for the Expected Pass Rate for Tests](#mean-value-for-the-expected-pass-rate-for-tests)
+  - [Mean Value for the Expected Pass on Retry Rate for Tests](#mean-value-for-the-expected-pass-on-retry-rate-for-tests)
+  - [Build Analysis Reporting](#build-analysis-reporting)
+  - [Sentiment Tracker Feedback](#sentiment-tracker-feedback)
+
+## Tests That Have Failed X% of the Time in the Recent Timespan
+
+This query will return a list of tests that have failed a certain percentage in the recent provided timespan. The default example in this query provides a list of tests in the dotnet/runtime repo that have failed 10% of the time in the last 7 days. 
+
+Variables: 
+- `ts`: [Kusto timespan format](https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan). Default is `7d`.
+- `repo`: Repository to filter on. Set to empty string to inclue all repositories. Default is `dotnet/runtime`.
+- `failureThreshold`: Double value denoting failure rate percentage. Default is `0.1` or 10%. 
+- `excludeAlwaysFailing`: Set to true to filter out tests that are always failing to get a list of tests that are "flakey". Default is `true`.
+
+```
+let ts = 7d;                      // Timespan value
+let repo = "dotnet/runtime";      // Optional: set to empty string if you want results from all repositories
+let failureThreshold = 0.1;       // Double value denoting the lowest test fail rate to return
+let excludeAlwaysFailing = true;  // Boolean. Set to true to exclude test results that are always failing
+let subtable = AzureDevOpsTestsSummary
+| where ReportDate >= ago(ts) and iff(repo == "", Repository == Repository, Repository == repo)
+| summarize numerator=sum(FailCount), denom=sum(PassCount+FailCount+PassOnRetryCount), asOfDate=max(ReportDate) by BuildDefinitionName, TestName, ArgumentHash;
+let argumentHashMap = AzureDevOpsTestsSummary
+| where ReportDate >= ago(ts)
+| summarize by ArgumentHash, Arguments;
+subtable
+| where denom > 0 and (todouble(numerator)/todouble(denom)) >= failureThreshold and iff(excludeAlwaysFailing, (todouble(numerator)/todouble(denom)) < 1, true)
+| lookup (argumentHashMap) on ArgumentHash
+| project BuildDefinitionName, TestName, Arguments, FailRate=(todouble(numerator) / todouble(denom)), FailCount=numerator, TotalRunCount=denom;
+```
+
+:part_alternation_mark: [Link](https://dataexplorer.azure.com/clusters/engsrvprod/databases/engineeringdata?query=H4sIAAAAAAAAA51SzW7bMAy+5ymInGzUaNrTgHkukC4YdtkypHkBpqZjbbJkSFRTF3v4UTLitGkOxXwwbIr8/kRNDOyhgk91CRefxQK2qiPfo4En1IFmWmYc9Vam5rVlQ7xwwbA0zctpZt2zsgb1Z/CRwgJ1PQ/g2SmzB9XAYAMc0EQoH7RoaJztALVO2F6xdYp8ImtQ6eBo20pra3UtxDfXt+VJ4MqGnaZRHtRkLEcSbgm0PZAX/viKMOCQKcpxxMGZBE/PjzrUtNQHHPw3aYrDFbALVCb4e2s1obmGh9FKPEmWxsER/WiDW2RAR2Il4iVWAUxMPuwYo9IKli/iaEVP695vZdw/hK5DN8z+wqElmd5ICI5XUe1dBbi3Gfsc0NSSXZON8Uv+8yJ1priGWDn9nZ/EmVzwfWJSLwQmdCR5WFdJLYvOv1q5yLxIGXap+gu9T9Wr6fwq1tZmQ+yG4wD6dRPFVh0+ZyftOewGuA9K1ytqlFFxJ35iRwVE0+PX0u1Fh+Hv6NsyxYSvKj+w/9+03ngVHa+JTrS+nB2vZYJL9uEOblLgGds6LVg2BZYvplrqzfPI+25Pj9d1acOKD+J+gdsibVz0o639E3rIzhLKwZo39qS1d/Y3PfJH0/cFRGGbeIeXhMECzqWNE2kDqqlRsC2j3gQzHqTe8h/Tt/8tZwQAAA==) to query editor
+
+## Mean Value for the Expected Pass Rate for Tests
+
+This query will return a list of tests and the mean value for the expected pass rate based on historical data. (Comparably, an inverse to [Tests That Have Failed X% of the Time in the Recent Timespan](#tests-that-have-failed-x-of-the-time-in-the-recent-timespan))
+
+Calculate the expected value (E[_Y_]) for how often a test is likely to pass on its initial run (retries not included) based on its historical data (e.g. monthly, weekly, daily aggregates). Ex: A test is known to fail once out of every seven runs. Its expected value (E[_Y_]) is determined to be 85.7%, meaning, we expect this test to succeed 85.7% of the time.
+
+Variables: 
+- `ts`: [Kusto timespan format](https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan). Default is `7d`.
+- `repo`: Repository to filter on. Set to empty string to inclue all repositories. Default is `dotnet/runtime`.
+- `excludeAlwaysPassing`: Set to true to filter out tests that are always passing. Default is `true`.
+
+```
+let ts = 7d;                      // Timespan value
+let repo = "dotnet/runtime";      // Optional: set to empty string if you want results from all repositories
+let excludeAlwaysPassing = true;  // Boolean. Set to true to exclude test results that are always passing
+let subtable = AzureDevOpsTestsSummary
+| where ReportDate >= ago(ts) and iff(repo == "", Repository == Repository, Repository == repo)
+| summarize numerator=sum(PassCount), denom=sum(PassCount+FailCount+PassOnRetryCount), asOfDate=max(ReportDate) by BuildDefinitionName, TestName, ArgumentHash;
+let argumentHashMap = AzureDevOpsTestsSummary
+| where ReportDate >= ago(ts)
+| summarize by ArgumentHash, Arguments;
+subtable
+| where denom > 0 and iff(excludeAlwaysPassing, (todouble(numerator)/todouble(denom)) < 1, true)
+| lookup (argumentHashMap) on ArgumentHash
+| project BuildDefinitionName, TestName, Arguments, MeanPassRate=(todouble(numerator) / todouble(denom)), PassCount=numerator, TotalRunCount=denom
+| order by MeanPassRate;
+```
+
+:part_alternation_mark: [Link](https://dataexplorer.azure.com/clusters/engsrvprod/databases/engineeringdata?query=H4sIAAAAAAAAA51U3WvbMBB/L/R/OAoDm5lkexgdzVJIP8b20GWkZTDGHi7xOdEiS0Y6NXXpH7+T3DhpycNYXqxI9/u4n84eDuH6oaEFUwk/UAeCyjr4jt7DDJnO4BL1ImhZAq8IaFt7n2qz618/f+cJsrIbsBWTAQQmz6A8aLUm3QJbaCKhNaDYgzKKFWpwwUDmiJ0iD8YKwix0KKnM4fhoOIQ5ehF6Bq2UZ+vUQnAlMkJGg+UAamt4pdsCNkTr+CxRiSAul46W4tnnA2nvDCa9pbWxGxMdVVIp5AsCG1icA92Ta8HLw0RrfgBfRTc5Ody1sJXE5Gpl5Ego5wQfPwxO3xRQExplltHXM1jSk/rkQip9WCxIQKk8isdsWdU0EEFNUuNhDKflCA7+xNKdFPsGTWepAzlqrMBOSsuGeChNRMqTUQ+aNqysQX0mbSYfVDcsPcsVmCWoClobYIMmUvmgxUTlbA2odeL2Kl4B+U6NHtJtTfQGWx8HJnKMgV2gUVK7sFZLDgO47cTiSRLtgF0YWyFeIQM6ErHIlwZGCDspH+aMc01CP3kMjq7oftr4O8H721DX6NrjoyfYrEjwMzHq+CoO7PlYJsFm7HNAU0p/VdZFJBmdFKkytdTGnd2/1ycRk0cBn7TUI4EJNTmUgrHsZbH5Sytp5zKAZGz9cvftZxm1bhX3pmYmM99uAeinVXQ7rvEh25nPYd7CRVC6vKIqvTHWfMOaCohtd6uJW4oPw1/Qr0ZdUri3dYPNfwf2sl2xsq+1U/Yiu72cHWPKAM7hXR/7oVkpIGNb2iDQrM8zH/Z7iSXP4RO8L9LsJFPa2nVoIHvVaB6/E/seY23j7J/46v1jjL6AG5nXaC9++saH7MEQXhssoL/pcV8o/JZRz4LpDlJt9GRdSS4Gui81+gtMm5LlhgUAAA==) to query editor
+
+## Mean Value for the Expected Pass on Retry Rate for Tests
+
+Retries are meant to unblock and prevent a build from failing due to failing test, but they are still indicative of unwanted behavior, therefore, we need to track how often a test passes when retries are introduced. Ex: A test has a 100% pass rate, but only when the test re-runs after a failure every six runs, so it’s expected value for re-runs is 83.3%.
+
+Variables: 
+- `ts`: [Kusto timespan format](https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan). Default is `14d`.
+- `repo`: Repository to filter on. Set to empty string to inclue all repositories. Default is `dotnet/arcade`.
+
+```
+let ts = 14d;                      // Timespan value
+let repo = "dotnet/arcade";        // Optional: set to empty string if you want results from all repositories
+let subtable = AzureDevOpsTestsSummary
+| where ReportDate >= ago(ts) and iff(repo == "", Repository == Repository, Repository == repo) and PassOnRetryCount > 0
+| summarize numerator=sum(PassOnRetryCount), denom=sum(FailCount+PassOnRetryCount), asOfDate=max(ReportDate) by BuildDefinitionName, TestName, ArgumentHash;
+let argumentHashMap = AzureDevOpsTestsSummary
+| where ReportDate >= ago(ts)
+| summarize by ArgumentHash, Arguments;
+subtable
+| where denom > 0
+| lookup (argumentHashMap) on ArgumentHash
+| project BuildDefinitionName, TestName, Arguments, MeanPassOnRetryRate=(todouble(numerator) / todouble(denom)), PassOnRetryCount=numerator, TotalRunCount=denom
+| order by MeanPassOnRetryRate;
+```
+
+:part_alternation_mark: [Link](https://dataexplorer.azure.com/clusters/engsrvprod/databases/engineeringdata?query=H4sIAAAAAAAAA51Uy24TQRC8+ytakSKthYkThQOK5UiBgLgEI5MfaHt64yGzM6t52N6IA7/B7/ElqZkljmPlgPDJ24+q6ureHY9pLtFrCcReqBG2kaKjZBfGLe+JraLWy1oQZlokbRTV3jVUszba3pFKkuufHqOEOEIdQFbSFcwQtTGkrdJLjnot5GrAb0Akihay4rV2fkSD8Tj3eKmdlxFthKygANjRM5Ss3AadUSx0ZBZqOQTI3qwQ8nszaBu9U2kp6oQ+bS/oqi9fMdJ0dnp6XDrJc5ReqbOm62HA3+vIDV7e+mTRBFKP1jxiAj7M8B0FvaWcHlFwpOOfX78DybaVZZ5qzQa2YJAdiA70/vzk/PiEBkZgTqApnb1TE3r1Bwm3upHQsu2xSpOX1qHtSLloJY7ZL1nJ0WSvadZG7SybCwpS1ihNG6EV5mA3uqbOJcrOAyskAxVll4z9ZPCgo8s2FraQFpEXRsB49YC5r2U9a8MtnAnfU9Ow7wY/s2twZI5eH69hKF1Oie9cFcOwnI6u66qXDd1Ho1JZWLoceX46zOSeHuEbdjWz+Ua7jy5B+SWdgjgUCfoBV5IawS6dnyJWHZYPR6TEuqYkP2ODJfrmlTIOszqPMG14Wz1PNKRFRx/y3V9Lra3OBn/lBqeTrej/Xfk7iLDxC4fVpJjHe5Ebbv/XwxeDQsc+0TNtmAyelrWDK0P/9co4d59aqg5EDXH4LxBR2nr3Ayf8rwPj+m/wxdhzc54drKJTLkFOtVvOkPBWPUWLuCE8P1zDdFcPNhfZzJPtE6UFAp1XeBlhxSu8k0dFwXcxzQQAAA==) to query editor
+
+## Build Analysis Reporting
+
+This Power BI page contains the following reports: 
+- Details of PRs outcomes when merged (e.g. when a PR was merged on red)
+- Build outcomes and retry metrics
+- Tests that pass on rerun
+
+:part_alternation_mark: [Link](https://msit.powerbi.com/groups/me/reports/8bdd4339-ea39-4e67-963a-fc44a450605b/ReportSection?ctid=72f988bf-86f1-41af-91ab-2d7cd011db47) to Power BI Report
+
+## Sentiment Tracker Feedback
+
+This report tracks the usage and trends of the feedback we receive via the sentiment tracker in the Build Analysis check on the PRs. 
+
+:part_alternation_mark: [Link](https://msit.powerbi.com/groups/de8c4cb8-b06d-4af8-8609-3182bb4bdc7c/reports/e6deb422-46fc-4f80-8892-ba7036081986/ReportSection) to Power BI Report
diff --git a/Documentation/BranchesChannelsAndSubscriptions.md b/Documentation/BranchesChannelsAndSubscriptions.md
index a8dcabfeca0..202cdd75bc9 100644
--- a/Documentation/BranchesChannelsAndSubscriptions.md
+++ b/Documentation/BranchesChannelsAndSubscriptions.md
@@ -51,6 +51,7 @@ Subscriptions have the following characteristics:
 
 - They have a desired quality metric for when the mapping should be applied (e.g. should tests have passed?)
 - They have a trigger for when the mapping should be applied.
+- They may optionally include a list of GitHub logins (users who must be a public member of the Microsoft organization) or team aliases (for notification to work, this team must exist in the target repository's organization).  When included in a non-batched subscription, failed policies for the pull requests produced will tag these users. As such, these users should be teams or users who represent subject-matter experts for the source repository of the subscription.
 
 A subscription can be visualized with the following pseudocode
 
@@ -84,6 +85,9 @@ A subscription can be visualized with the following pseudocode
         if (subscription.isDesiredQuality(repo)) {
             mergeChanges()
         }
+        else if (subscription.hasFailureNotificationTags and subscription.isNotBatched) {
+            tagTheseUsersOnDependencyFlowPullRequest()
+        }
     }
 ```
 
diff --git a/Documentation/CodeQLGuidance.md b/Documentation/CodeQLGuidance.md
new file mode 100644
index 00000000000..9525e2d4713
--- /dev/null
+++ b/Documentation/CodeQLGuidance.md
@@ -0,0 +1,113 @@
+# CodeQL Guidance
+
+## Background
+
+CodeQL is a code analysis platform owned by Semmle, now a subsidary of GitHub. It provides value by using extractors to construct a database representing the codebase, then providing a query language to perform sematic analysis. CodeQL instruments the build of compiled languages, and directly analyzes source code for interpreted languages. 
+
+CodeQL is required as part of Microsoft's Security Developent Lifecycle (SDL) requirements. .NET Engineering Services supports CodeQL via the Guardian toolset with scan results published to Trust Services Automation (TSA). 
+
+CodeQL adds a significant time to builds. We therefore recommend creating a new, seperate pipeline instead of incorporating CodeQL scans into existing PR or testing pipelines. 
+
+## TL;DR: Quickstart
+
+Arcade provides new templates to encapsulate the build process and start the Guardian-driven CodeQL engine. They may be used from an "empty" pipeline definition 
+
+1. Ensure your repository has the latest Arcade version
+2. Copy Arcade's CodeQL pipeline definition file [`azure-pipelines-codeql.yml`](https://github.dev/dotnet/arcade/blob/main/azure-pipelines-codeql.yml) to your repository
+3. Modify the pipeline definition to work for your repository's needs. 
+   - For projects using compiled languages, like C#, update the `buildCommand` to build the project. Unlike other Guardian tools, the CodeQL engine executes these in an instrumented environment to enable analysis. Note that if not provided, the engine may use heuristics to build. 
+   - Update the `language` parameter to match your project's language. Valid values are `cpp`, `csharp`, `javascript`, `java`, `python`, and `go`
+   - For projects with multiple languages, duplicate the Job for each. 
+4. Create a new Pipeline executing this newly-created definition. 
+
+
+## Use with Arcade
+
+Arcade version (arcade version) provides a new Job template "[codeql-build.yml](https://github.com/dotnet/arcade/blob/main/eng/common/templates/jobs/codeql-build.yml)" and step template "[execute-codeql.yml](https://github.com/dotnet/arcade/blob/main/eng/common/templates/steps/execute-codeql.yml)". It extends Arcade's existing use of Guardian to provide SDL tooling and workflow.
+
+A working example pipeline defintion follows.
+
+```yaml
+#Include variables for SDL/TSA publishing
+variables:
+  - name: _TeamName
+    value: DotNetCore
+  - group: SDL_Settings
+    
+# Execute only on a schedule, once each week
+trigger: none
+
+schedules:
+  - cron: 0 12 * * 1
+    displayName: Weekly Monday CodeQL/Semmle run
+    branches:
+      include:
+      - main
+    always: true
+
+# One stage, one job: just CodeQL
+stages:
+- stage: build
+  displayName: Build
+  jobs:
+  - template: /eng/common/templates/jobs/codeql-build.yml
+    parameters:
+      jobs:
+      - job: Windows_NT_CSharp
+        timeoutInMinutes: 90
+        pool:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
+        steps:
+        - checkout: self
+          clean: true
+
+        - template: /eng/common/templates/steps/execute-codeql.yml
+          parameters:
+            executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1'
+            buildCommands: 'build.cmd -configuration Release -ci -prepareMachine'
+            language: csharp
+            additionalParameters: '-SourceToolsList @("semmle")
+            -TsaInstanceURL $(_TsaInstanceURL)
+            -TsaProjectName $(_TsaProjectName)
+            -TsaNotificationEmail $(_TsaNotificationEmail)
+            -TsaCodebaseAdmin $(_TsaCodebaseAdmin)
+            -TsaBugAreaPath $(_TsaBugAreaPath)
+            -TsaIterationPath $(_TsaIterationPath)
+            -TsaRepositoryName "dotnet-release"
+            -TsaCodebaseName "dotnet-release"
+            -TsaPublish $True'
+```
+
+Much of this template can be used as-is for most repositories. The important elements for customizatino are the input parameters to the `execute-codeql` template. 
+
+- `buildCommands`: For compiled languages, the command to build the project. For interpreted languages, this may be excluded. 
+- `language`: The language target for analysis (as known by CodeQL)
+- `additionalParameters`: These are the typical TSA configuration options usually already populated for .NET projects. Ensure that `TsaRepositoryName` and `TsaCodebaseName` are correct for your repository.
+
+For more information on SDL/Guardian in Arcade, see [How To Add SDL Run To Pipeline](https://github.dev/dotnet/arcade/blob/main/Documentation/HowToAddSDLRunToPipeline.md).
+
+## Alert suppression
+
+Suppression may be done using inline comments (in whatever comment form is appropriate for the language). The comment must appear on the same line as the alert, or the first line if the alert spans multiple lines. 
+
+A suppression comment is made of:
+
+1. The string "lgtm[^1]" (case insensitive)
+2. A query ID surrounded by square brackets
+3. A justification string of at least 25 characters
+
+For example, in C#,
+
+```cs
+// lgtm [cs/weak-crypto] Algorithm needed per standard and contained safely here
+```
+
+Language-specific examples and some variations may be found in LGTM's [Alert Suppression](https://lgtm.com/help/lgtm/alert-suppression) document.
+
+[^1]: At the time of this writing, tools expect `lgtm` instead of `codeql`. This may change as versions evolve and the new name propogates.
+
+## Further Reading
+
+GitHub's official CodeQL documentation: [CodeQL documentation](https://codeql.github.com/docs)
diff --git a/Documentation/CorePackages/PostBuildSigning.md b/Documentation/CorePackages/PostBuildSigning.md
index d2dd4184efe..615e6b36145 100644
--- a/Documentation/CorePackages/PostBuildSigning.md
+++ b/Documentation/CorePackages/PostBuildSigning.md
@@ -37,6 +37,10 @@ The process works as follows:
 
 The crux of the SignTool algorithm is determining the certificate for a specific file. *Side note: Certificates are associated with a specific file name or file extension, though they cannot be associated with a specific path. For instance, 'foo/bar/baz.zip' is only dealt with as 'baz.zip'*. When dealing with a single repo, SignTool just interprets the signing info as applying to all files passed to it. A baz.zip found anywhere in the input file set is treated identically. When dealing with post build signing, it's possible that a foo.dll found in an sdk asset may actually come from the runtime, which may have indicated that *.dll get a different certificate. *So SignTool needs to track where foo.dll originally came from*. Did it come from the build of dotnet/runtime, or from dotnet/sdk? To do this, SignTool associates each input top level item to sign and the signing info for a build with a 'collision priority ID' This collision priority ID serves as a way to disambiguate the source signing information for a nested artifact. As each top-level asset is unpacked, the hash of each nested file is determined and looked up in a map. If the map already contains a file with the same name and hash, the collision priority ID's are compared. If the current one in the map is lower, the signing info for the existing file is used. Otherwise, the certificate information is recomputed based on the lower collision priority ID.
 
+## Post Build Signing a single repo vs full product
+
+Post build signing is intended to sign a full set of product inputs.  Given that some repos produce artifacts that repackage artifacts from other repos, the full graph of builds and dependent builds are required to *fully* sign artifacts.  If you only have the artifacts from an individual repo, then post build signing will sign what it can, given the information available.  If it is repackaging an MSI from another repo, and that repo's manifest / metadata are not available, then post build signing will sign the packaged artifact, but not its contents because it is unable to repackage an MSI without the light command package data from that dependent repo.  The result will be that signing validation would fail and properly report unsigned files.  It is up to the repo owner to investigate whether those unsigned files are valid, invalid, or should be ignored because they are the result of post build signing with partial input (false positives).
+
 ## Additional Information
 
 More information about the file types that are signed and the certificates used to sign them can be found here:
diff --git a/Documentation/CorePackages/Publishing.md b/Documentation/CorePackages/Publishing.md
index f93df9216d5..0ed440bf0a0 100644
--- a/Documentation/CorePackages/Publishing.md
+++ b/Documentation/CorePackages/Publishing.md
@@ -230,7 +230,7 @@ In order to use the new publishing mechanism, the easiest way to start is by tur
 
     | Name                                    | Type     | Description                                                                                          |Default Value |
     | --------------------------------------- | -------- | -----------------------------------------------------------------------------------------------------|----- |
-    | publishingInfraVersion                  | int      | Publishing infrastructure version - Use 3 for latest publishing infra. Accepted values are 2 / 3.                               | 2    |
+    | publishingInfraVersion                  | int      | Publishing infrastructure version - Use 3 for latest publishing infra. Accepted values are 3 (.NET 5.0+) and 2 (.NET 3.1).                               | 3    |
     | enableSourceLinkValidation              | bool     | Run SourceLink validation during the post-build stage.                                               | false |
     | enableSigningValidation                 | bool     | Run signing validation during the post-build stage.                                                  | true |
     | enableNugetValidation                   | bool     | Run NuGet package validation tool during the post build stage.                                       | true |
@@ -250,7 +250,7 @@ In order to use the new publishing mechanism, the easiest way to start is by tur
     * [Arcade-Validation](https://github.com/dotnet/arcade-validation/blob/master/azure-pipelines.yml)
     * [Arcade-Services](https://github.com/dotnet/arcade-services/blob/master/azure-pipelines.yml)
 
-1. Create or update eng/Publishing.props, adding the following MSBuild property:
+2. Create or update eng/Publishing.props, adding the following MSBuild property:
     ```XML
         <PublishingVersion>3</PublishingVersion>
     ```
@@ -505,11 +505,7 @@ TargetChannelConfig takes the following attributes
 | isInternal  | Publishing to an internal Channel or public channel | true or false  |
 | PublishingInfraVersion | Which version of the publishing infra can use this configuration. | Enum = All(0), Legacy(1), Latest(2), Next(3)  |
 | AkaMSChannelName | The name that should be used for creating Aka.ms links for this channel. A specified build quality will be appended to this value if supplied. | See [What build qualities are supported?](#what-build-qualities-are-supported) for valid build quality values |
-| ShippingFeed | The URL (including the index.json suffix) of the *shipping* feed to be used for this channel. |   | 
-| TransportFeed | The URL (including the index.json suffix) of the *transport* feed to be used for this channel. |   | 
-| SymbolsFeed | The URL (including the index.json suffix) of the *symbols* feed to be used for this channel. |   | 
-| ChecksumsFeed | The URL (including the index.json suffix) where *checksums* should be published to. | FeedForChecksums for public channel, FeedInternalForChecksums for internal  | 
-| InstallersFeed | The URL (including the index.json suffix) where *installers* should be published to. | FeedForInstallers for public channel, FeedInternalForInstallers for internal channel   |
+| TargetFeedSpecification | List of feeds to publish (type of asset -> feed mapping)|          |
 | SymbolTargetType | Publish to MSDL or SymWeb symbol server | PublicAndInternalSymbolTargets -publishes to both Msdl and SymWeb or InternalSymbolTargets -publishes only to SymWeb |
 | FilenamesToExclude | List of files to exclude from creating aka.ms links. Should be exact file names | For most channels, we exclude MergedManifest.xml |  
 | Flatten | Whether or not to flatten the path when creating the aka.ms links | Defaults to true, which means the path in the aka.ms link will be flattened. False will use the full path without the version information of the files being published |
@@ -518,17 +514,14 @@ TargetChannelConfig takes the following attributes
 Eg:
 Publishing to General Testing channel : General Testing
 
+            // "General Testing",
             new TargetChannelConfig(
                 529,
                 false,
                 PublishingInfraVersion.All,
                 "generaltesting",
-                "https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json",
-                "https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json",
-                "https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json",
-                FeedForChecksums,
-                FeedForInstallers,
-                PublicAndInternalSymbolTargets)
+                GeneralTestingFeeds,
+                PublicAndInternalSymbolTargets),
 ```
 
 
@@ -575,3 +568,16 @@ The aka.ms links are generated using the `BuildQuality` parameter that is passed
 ### What build qualities are supported?
 
 The build qualities that are supported are daily, signed, validated, preview, and ga. All official daily builds that publish using V3 should use the `daily` build quality. Signed and validated builds are generated by the staging process of the release process. Preview and GA links are generated at release time, on release day. All builds that have preview in the release version will be of the `preview` quality. All other builds will be marked as `GA`. GA builds do not append a build quality to the links.
+
+### Can we exclude symbols from publishing to symbols server?
+Yes. 
+
+Create a file eng/SymbolPublishingExclusionsFile.txt in your repo, add the file name that has to be excluded from symbol publishing in SymbolPublishingExclusionsFile.txt.
+
+Eg: 
+  tools/x86_arm/mscordaccore.dll
+  tools/x86_arm/mscordbi.dll
+  tools/x64_arm64/mscordaccore.dll
+  tools/x64_arm64/mscordbi.dll 
+
+During publishing, arcade will pick up SymbolPublishingExclusionsFile.txt and exclude the symbols mentioned in it.
diff --git a/Documentation/CorePackages/Signing.md b/Documentation/CorePackages/Signing.md
index d65de76c097..f2e8f96cdb5 100644
--- a/Documentation/CorePackages/Signing.md
+++ b/Documentation/CorePackages/Signing.md
@@ -223,6 +223,30 @@ Click [here](../../src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj) to see how t
 ...
 ```
 
+#### 8. How can I use the .NET specific certificate for executable files?
+
+By default, `Microsoft400` is the cert used by default for most executable files (e.g .dll, .js, .exe). To use the .NET specific cert (`MicrosoftDotNet500`),
+use one of the following approaches:
+
+1. Update the existing `FileExtensionSignInfo` and `StrongNameSignInfo` metadata in [Sign.props](../../src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props)
+to use `MicrosoftDotNet500`. This approach must be used if some files still need to be signed with `Microsoft400`.
+   ```
+   <ItemGroup>
+     <FileExtensionSignInfo Update=".js;.ps1;.psd1;.psm1;.psc1;.py;.dll;.exe" CertificateName="MicrosoftDotNet500" />
+     <StrongNameSignInfo Update="MsSharedLib72" PublicKeyToken="31bf3856ad364e35" CertificateName="MicrosoftDotNet500" />
+     <StrongNameSignInfo Update="SilverlightCert121" PublicKeyToken="7cec85d7bea7798e" CertificateName="MicrosoftDotNet500" />
+     <StrongNameSignInfo Update="StrongName" PublicKeyToken="b77a5c561934e089" CertificateName="MicrosoftDotNet500" />
+     <StrongNameSignInfo Update="StrongName" PublicKeyToken="b03f5f7f11d50a3a" CertificateName="MicrosoftDotNet500" />
+     <StrongNameSignInfo Update="$(MSBuildThisFileDirectory)snk\Open.snk" PublicKeyToken="cc7b13ffcd2ddd51" CertificateName="MicrosoftDotNet500" />
+   </ItemGroup>
+   ```
+2. Specify the property `UseDotNetCertificate` with value `true` in your `eng/Signing.props` file. This **replaces** all existing use of `Microsoft400` with `MicrosoftDotNet500`.
+   ```
+   <PropertyGroup>
+     <UseDotNetCertificate>f</UseDotNetCertificate>
+   </PropertyGroup>
+   ```
+
 ## Logs & MicroBuild configuration files
 
 The log messages from the SignToolTask itself will be included in the log (+.binlog) of the original build process. The binary log of executing the MicroBuild signing plugin will be stored in files named `SigningX.binlog` in the `LogDir` folder. The project files used to call the MicroBuild plugin will be stored in files named `RoundX.proj` in the `TempDir` folder. In both cases the `X` in the name refers to a signing round.
diff --git a/Documentation/DependencyFlowOnboarding.md b/Documentation/DependencyFlowOnboarding.md
index 88fcd58e48b..6314e1b4b18 100644
--- a/Documentation/DependencyFlowOnboarding.md
+++ b/Documentation/DependencyFlowOnboarding.md
@@ -10,7 +10,9 @@ There's a set of steps that need to be completed so the versions of assets your
 
 ## Prerequisites
 
-These pre-requisites are not hard requirements, but enabling dependency flow will be much simpler if you are using these processes:
+- If your repository is not part of the Dotnet GitHub organization, contact an administrator for the organization to install the dotnet-maestro app in your repository: https://github.com/apps/dotnet-maestro
+
+The following pre-requisites are not hard requirements, but enabling dependency flow will be much simpler if you are using these processes:
 
 - Internal builds produced out of https://dev.azure.com/dnceng/internal
 
@@ -102,8 +104,9 @@ Target Branch: <target branch for arcade updates, e.g. master>
 Update Frequency: everyDay
 Batchable: False
 Merge Policies:
-- Name: standard
+- Name: Standard
   Properties: {}
+Pull Request Failure Notification Tags: ''
 ```
 
 3. Save and close
@@ -199,17 +202,4 @@ To validate that created subscriptions and channels work as expected you'd need
                      ]
    - Last Build: N/A
    ```
-2. Use the ID and query for the subscription history:
-   ```
-   darc get-subscription-history --id <id>
-   ```
-   For example:
-   ```
-   darc get-subscription-history --id d2d2e80d-8b31-4744-1959-08d6175791f6
-   10/19/2018 9:15:17 AM: (Success) - Checking merge policy for pr 'https://api.github.com/repos/dotnet/arcade-minimalci-sample/pulls/129'
-   10/19/2018 9:10:15 AM: (Success) - Checking merge policy for pr 'https://api.github.com/repos/dotnet/arcade-minimalci-sample/pulls/129'
-   10/19/2018 9:05:14 AM: (Success) - Checking merge policy for pr 'https://api.github.com/repos/dotnet/arcade-minimalci-sample/pulls/129'
-   10/19/2018 9:05:04 AM: (Success) - Updating subscription for build '146'
-   ```
-   Any failed actions will be marked as such, along with a retry command.
-3. Let @alexperovich, @jcagme or @mmitche know about the errors in the unsuccessful entry
+2. Incase of any errors contact @dnceng. 
diff --git a/Documentation/Helix.md b/Documentation/Helix.md
new file mode 100644
index 00000000000..5930f34cac1
--- /dev/null
+++ b/Documentation/Helix.md
@@ -0,0 +1,47 @@
+# Helix
+
+Helix is a system/service that allows for very broad scaling of workloads and their results in a reliable and low cost fashion. The Azure back-end allows for cloud-level scalability without needing to maintain the underlying infrastructure.
+
+The [Helix C# Client](/src/Microsoft.DotNet.Helix/Client/CSharp) and [JobSender](/src/Microsoft.DotNet.Helix/JobSender) library can be used to programmatically interact with Helix.
+
+## Goals
+
+* System can run any arbitrary work (not just .NET)
+* Have a work execution system leveraging the cloud that enables us to deliver our products across all platforms without a dependency on internal Microsoft resources.
+* Create a componentized system where each piece could be swapped out for something else
+* Each component only requires HTTPS access
+* Leverage, as much as is possible, released Microsoft technology
+
+## What Helix does for us
+
+- Distributed work execution
+
+	- Helix machines perform arbitrary work on custom-curated, sometimes-scalable machines. When users want to test on other OSes, or run large quantities of work across many machines even from the same OS, Helix enables distributed execution on dozens of different operating systems with work specified in the same, simple JSON-based format for all operating systems. Supported operating systems include macOS, various Windows configurations (Client and server SKUs, non-en-us languages, and variations), Linux systems, with the option to expand to anywhere Python 3 is supported.
+
+- Telemetry
+
+    - When an Engineering-Services-supported Azure DevOps pipeline kicks off a build or test run, telemetry is automated-ly gathered and sent through the Helix pipeline to be stored and reported. 
+    - This is accomplished by sending telemetry via the Helix API from Azure DevOps pipelines and the various machines performing work.
+    - Telemetry is gathered and reported in near-real-time to provide minute-by-minute build and test updates, monitoring things like exit code, console and harness logs, output files, and even crash dumps.   
+
+- Helix API
+
+	- The Helix API allows users to submit work and telemetry, query previously run work items and jobs for logging and aggregation of results.
+	- [Helix's Client libraries](/src/Microsoft.DotNet.Helix) are used by most consumers whether it be for submitting work items, sending telemetry, or waiting on and determining the results of a run.
+	- Anonymous execution and machines are supported, as well as authenticated work using a GitHub authentication token. Sensitive workloads can be locked down to one or more GitHub user names, which must match to use these queues. 
+	- Users are also able to directly interact with the Helix API via its swagger endpoints in both anonymous and authenticated fashion.
+
+Additional Helix implementation details are available in the private core-eng repository: https://github.com/dotnet/core-eng/blob/main/Documentation/HelixDocumentation.md
+
+## Features of Helix
+
+### Job Distribution at Scale
+With Helix we leverage the power of Azure to create and remove VMs as needed.  This allows us to create the scale we want at whatever budget we can afford.  We also have the ability to add physical machines for other scenarios such as executing work on macOS, ARM, ARM64, dedicated physical hardware for performance, and on virtually any device capable of running Python 3.5 or greater with internet connectivity.
+
+When designing Helix our goal was to leverage the cloud in a way that gave us the reliability we needed, the performance we desired, and simplicity throughout. Azure gives us the ability to have reliable services that we can communicate to over HTTPS.
+
+### Cross Platform Support
+A major requirement for this system was to be able to execute work across multiple platforms.  A wide, constantly-growing variety of operating systems are available, generally removed within a month or two of end-of-life.  To see this list live, visit <https://helix.dot.net/>.
+
+### Docker Image Support
+For any Helix queue where Docker is installed (viewable via the Queue info API), work items may be executed in a docker image via the syntax `(Fake.Queue.Name)real.queue.name@docker.tag`.  This allows running on OS combinations we either can't install on Azure (e.g. Fedora Linuxes) or which only support Docker (Windows Nano, etc.)
diff --git a/Documentation/Onboarding.md b/Documentation/Onboarding.md
index 9e919011974..0972dea7afd 100644
--- a/Documentation/Onboarding.md
+++ b/Documentation/Onboarding.md
@@ -8,22 +8,22 @@
 
    Steps:
     1. Add a
-       [global.json](https://github.com/dotnet/arcade/blob/master/global.json).
+       [global.json](https://github.com/dotnet/arcade/blob/main/global.json).
     2. Add (or copy)
-       [Directory.Build.props](https://github.com/dotnet/arcade/blob/master/Directory.Build.props)
+       [Directory.Build.props](https://github.com/dotnet/arcade/blob/main/Directory.Build.props)
        and
-       [Directory.build.targets](https://github.com/dotnet/arcade/blob/master/Directory.Build.targets).
+       [Directory.build.targets](https://github.com/dotnet/arcade/blob/main/Directory.Build.targets).
     3. Copy `eng\common` from
-       [Arcade](https://github.com/dotnet/arcade/tree/master/eng/common)
+       [Arcade](https://github.com/dotnet/arcade/tree/main/eng/common)
        into repo.
     4. Add (or copy) the
-       [Versions.props](https://github.com/dotnet/arcade/blob/master/eng/Versions.props)
+       [Versions.props](https://github.com/dotnet/arcade/blob/main/eng/Versions.props)
        and
-       [Version.Details.xml](https://github.com/dotnet/arcade/blob/master/eng/Version.Details.xml)
+       [Version.Details.xml](https://github.com/dotnet/arcade/blob/main/eng/Version.Details.xml)
        files to your eng\ folder. Adjust the version prefix and prerelease label
        as necessary.
     5. Add dotnet-core feed and any other feeds that the repository restores NuGet packages from to
-       [NuGet.config](https://github.com/dotnet/arcade/blob/master/NuGet.config).
+       [NuGet.config](https://github.com/dotnet/arcade/blob/main/NuGet.config).
 
     **Using Arcade packages** - See [documentation](CorePackages/) for
     information on specific packages.
@@ -37,7 +37,7 @@
   DevDiv to DncEng](AzureDevOps/MovingFromDevDivToDncEng.md).
 - Onboard onto dependency flow (Darc). - See [Dependency Flow
   Onboarding](DependencyFlowOnboarding.md).
-- Use Helix for testing where possible - See [Sending Jobs to Helix](https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/SendingJobsToHelix.md)
+- Use [Helix](/Documentation/Helix.md) for testing where possible - See [Sending Jobs to Helix](https://github.com/dotnet/arcade/blob/main/Documentation/AzureDevOps/SendingJobsToHelix.md)
 
 ## Which branches should I make these changes in?
 
diff --git a/Documentation/OneLocBuild.md b/Documentation/OneLocBuild.md
index 28f854e0a31..3ce1d903acb 100644
--- a/Documentation/OneLocBuild.md
+++ b/Documentation/OneLocBuild.md
@@ -3,11 +3,117 @@
 As of April 1, 2021, all .NET repositories will be using OneLocBuild for localization. Documentation on this system can
 be found [here](https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task).
 This system is **not a replacement for Xliff-Tasks**; rather, it is replacing the localization team's old system called
-Simple Loc. Xliff-Tasks will continue to be used in addition to OneLocBuild.
+Simple Loc. OneLocBuild coordinates getting translations for new and updated strings and merging them back into the
+repo. Xliff-Tasks will continue to be used in addition to OneLocBuild.
 
 To make OneLocBuild easier to use, we have integrated the task into Arcade. This integration is a job template
 ([here](/eng/common/templates/job/onelocbuild.yml)) that is described in this document.
 
+## Onboarding to OneLocBuild Using Arcade
+
+Onboarding to OneLocBuild is a simple process:
+
+1. Ensure that your repository is on the latest version of Arcade.
+2. Create a test branch (e.g. `LocalizationTests`) in your repository and add the following job template to your YAML:
+```yaml
+- template: /eng/common/templates/job/onelocbuild.yml
+  parameters:
+    CreatePr: false
+```
+Note: If you are running your PR builds and official builds off of the same definition and are on dnceng,
+you will want to conditionalize this step with the following:
+```yaml
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+```
+To prevent OneLocBuild from running in the public project where it will fail.
+
+3. Run the pipeline you want to use OneLocBuild on your test branch.
+4. Open a ticket with the localization team using
+   [this template](https://aka.ms/ceChangeLocConfig).
+   Include the link to the test build you've done.
+5. The loc team will generate an LCL package for you and send you its ID. It will be something like
+   `LCL-JUNO-PROD-YOURREPO`.
+6. Change your YAML (subbing `'LCL-JUNO-PROD-YOURREPO'` for the package ID given to you) to:
+```yaml
+- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
+  - template: /eng/common/templates/job/onelocbuild.yml
+    parameters:
+      LclSource: lclFilesfromPackage
+      LclPackageId: 'LCL-JUNO-PROD-YOURREPO'
+```
+Make sure to remove the `CreatePr: false` line from step 2. Additionally, if you added the YAML condition from step
+2, make sure that your new YAML condition now looks like:
+```yaml
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
+```
+
+7. If using a mirrored repository (your code is mirrored to a trusted repository which your official build uses),
+   add the following parameter to your YAML (subbing e.g. `sdk` for the value):
+```yaml
+    MirrorRepo: name of your GitHub repository, e.g. 'sdk'
+```
+This naming might be confusing for repositories using code mirroring through Maestro, as typically the
+"mirror repository" refers to the trusted Azure DevOps repository our GitHub repositories mirror to.
+In this case, however, it refers to the repository that _mirrors to_ the Azure DevOps repository
+that the official build is based on.
+
+As a further note, the template by default assumes that your mirror repository is located in the dotnet GitHub
+organization. If that is not the case, you will need to specify `GitHubOrg` as well.
+
+8. Merge the changes to your main branch and then open a
+   [repo modification ticket](https://aka.ms/ceChangeLocConfig)
+   with the loc team to let them know to retarget the branch.
+
+## Releasing with OneLocBuild Using Arcade
+
+**Note: The SLA for translations is one week. Please allow at least two weeks from the release for this process.**
+
+### If You're Releasing from `main`
+If you're releasing from the main branch of your repository, all that you need to do is ensure that you're merging
+PRs from OneLocBuild as they are made and that you allow the translator SLA for any new strings prior to the release.
+
+### If You're Releasing from a Branch Other Than `main` (Including Servicing Branches)
+Depending on how often you want to release from the servicing branch you could:
+* Change the loc task, that parses your default branch, to temporarily parse resources from the servicing branch. Here is what you would need to do for that:
+  1. Add the OneLocBuild job template to the pipeline YAML of the release branch. When you do this, you have to change the YAML of both the main branch and the target branch to include a conditional specifying 
+   the target branch rather than main (as above). Additionally, your YAML should include the following line (substituting your target branch for `target-branch`):
+   ```yaml
+      MirrorBranch: target-branch
+   ```
+  2. Open a [repo modification ticket](https://aka.ms/ceChangeLocConfig) with the 
+   loc team at least two weeks before the release and request that they re-target your repository to the release branch.
+  3. Merge the OneLocBuild PRs to your release branch.
+  4. After the release, open another repo modification ticket to re-target your repository to the `main` branch again.
+
+* Register a servicing branch with the loc team using [this ticket](https://aka.ms/ceNewLoc) ([Here](https://ceapex.visualstudio.com/CEINTL/_workitems/edit/523494)'s an example). This allows the loc team to parse your servicing branch(es) while your default branch continues to be parsed. If you already have an old servicing branch parsed by the loc team, you could update it to point to a newer servicing branch. Here's what you would need to do to update the branch:
+   1. Open a [repo modification ticket](https://aka.ms/ceChangeLocConfig) with the 
+   loc team at least two weeks before the release and request that they re-target your servicing branch to new branch.
+   2. Ask the loc team for a package Id for this servicing branch on the ticket. The value of the Package ID would then be substituted in the YAML of the OneLocBuild task.
+   ```yaml
+      LclPackageId: 'LCL-JUNO-PROD-YOURREPOSVC'
+   ```
+   3. Update the conditional on the OneLocBuild task to point to the right branch and change/add in a MirrorBranch field to the task as well. So if the servicing branch is `dev17.0.x` the task would look like:
+   ```yaml
+   - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/dev17.0.x') }}:
+     - template: /eng/common/templates/job/onelocbuild.yml
+       parameters:
+         LclSource: lclFilesfromPackage
+         LclPackageId: 'LCL-JUNO-PROD-YOURREPOSVC'
+         MirrorBranch: dev17.0.x
+   ```
+
+# Common Issues
+
+## Filing Issues for Translation Issues
+
+File a translation issue ticket with the localization team [here](https://aka.ms/ceLocBug).
+
+## Leaving Comments for Translators
+
+Sometimes the proper solution to translation issues is to give the translators context for their work. This can be done easily in RESX files (which will be carried over to the XLF files by xliff-tasks) or in JSON files directly. For more information on how to leave translation comments, see the documentation [here](https://aka.ms/commenting).
+
+# Technical Documentation
+
 ## LocProject.json Index File
 
 The core component of OneLocBuild is the LocProject.json file. This file is an index file containing references to
@@ -29,8 +135,8 @@ which include `test.xlf` in its name.
 }
 ```
 
-The selected files are then added to a generated LocProject.json file. At this point, template currently provides two options
-for how to proceed.
+The selected files are then added to a generated LocProject.json file. At this point, template currently provides two
+options for how to proceed.
 
 ### Build-Time Generation
 
@@ -42,7 +148,8 @@ LocProject.json file. The LocProject.json file is emitted in build logs and as a
 
 While it is **not the recommended path**, repos can instead opt to check in a static LocProject.json and have the
 script compare it against the generated one. If they differ, the script will break the build so that a dev can
-update either the LocProject.json or the LocExclusions.json file accordingly.
+update either the LocProject.json or the LocExclusions.json file accordingly. The LocProject.json should be checked
+placed in the `eng/Localize` directory.
 
 Because the script can be run locally, devs can also do this validation prior to pushing their changes.
 
@@ -59,10 +166,11 @@ The most basic structure for calling the OneLocBuild template is:
 
 ```yaml
 jobs:
-- template: /eng/common/templates/job/onelocbuild.yml
-  parameters:
-    LclSource: lclFilesfromPackage
-    LclPackageId: 'LCL-PACKAGE-ID'
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
+  - template: /eng/common/templates/job/onelocbuild.yml
+    parameters:
+      LclSource: lclFilesfromPackage
+      LclPackageId: 'LCL-PACKAGE-ID'
 ```
 
 The parameters that can be passed to the template are as follows:
@@ -72,9 +180,16 @@ The parameters that can be passed to the template are as follows:
 | `RepoType` | `'gitHub'` | Should be set to `'gitHub'` for GitHub-based repositories and `'azureDevOps'` for Azure DevOps-based ones. |
 | `SourcesDirectory` | `$(Build.SourcesDirectory)` | This is the root directory for your repository source code. |
 | `CreatePr` | `true` | When set to `true`, instructs the OneLocBuild task to make a PR back to the source repository containing the localized files. |
+| `AutoCompletePr` | `false` | When set to `true`, instructs the OneLocBuild task to autocomplete the created PR. Requires permissions to bypass any checks on the main branch. |
+| `ReusePr` | `true` | When set to `true`, instructs the OneLocBuild task to update an existing PR (if one exists) rather than open a new one to reduce PR noise. |
+| `UseLfLineEndings` | `true` | When set to `true`, instructs the OneLocBuild task to use LF line endings during check-in rather than CRLF. |
+| `GitHubOrg` | `'dotnet'` | The GitHub organization to be used when making a PR (only used when using a mirrored repository). |
+| `MirrorRepo` | `''` | The name of the GitHub repository to make a PR to (only used when using a mirrored repository). |
+| `MirrorBranch` | `'main'` | The branch on GitHub to make a PR to (only used when using a mirrored repository). |
 | `UseCheckedInLocProjectJson` | `false` | When set to `true`, instructs the LocProject.json generation script to use build-time validation rather than build-time generation, as described above. |
 | `LanguageSet` | `VS_Main_Languages` | This defines the `LanguageSet` of the LocProject.json as described in the [OneLocBuild task documentation](https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task?anchor=languageset%2C-languages-(required)). |
 | `LclSource` | `LclFilesInRepo` | This passes the `LclSource` input to the OneLocBuild task as described in [its documentation](https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task?anchor=languageset%2C-languages-(required)). For most repos, this should be set to `LclFilesfromPackage`. |
 | `LclPackageId` | `''` | When `LclSource` is set to `LclFilesfromPackage`, this passes in the package ID as described in the [OneLocBuild task documentation](https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task?anchor=scenario-2%3A-lcl-files-from-a-package). |
+| `condition` | `''` | Allows for conditionalizing the template's steps on build-time variables. |
 
-It is recommended that you set `LclSource` and `LclPackageId` as shown in the example above.
\ No newline at end of file
+It is recommended that you set `LclSource` and `LclPackageId` as shown in the example above.
diff --git a/Documentation/Policy/ArcadeServicing.md b/Documentation/Policy/ArcadeServicing.md
index 088db0ddcf6..7d745fb54fd 100644
--- a/Documentation/Policy/ArcadeServicing.md
+++ b/Documentation/Policy/ArcadeServicing.md
@@ -10,7 +10,7 @@ Mechanically, this is done in two ways:
 - Branch our tools (Arcade) with the product.
 - Rev the APIs of our services as needed.
 
-**For those inserting into Visual Studio, careful consideration should be given to which Arcade to take a dependency on.  If latest features are needed, then 'n' (or master) might make sense, otherwise 'n-1' (servicing) will be more stable and have much less churn.**
+**For those inserting into Visual Studio, careful consideration should be given to which Arcade to take a dependency on.  If latest features are needed, then 'n' (or main) might make sense, otherwise 'n-1' (servicing) will be more stable and have much less churn.**
 
 **It's important to note that we *must* continue to validate any supported versions
 of Arcade or services.**
@@ -18,14 +18,14 @@ of Arcade or services.**
 ## Details
 
 ### Where do we do work on Arcade SDK?
-- `master` for future releases
+- `main` for future releases
 - `release/<NET Core Major Version Number>` for servicing
 
-### How do I get my servicing fix into master?
-- Fixes that apply to both master as well as servicing releases must be first checked into
-  master and then cherry picked into the appropriate servicing branches.
-- Code flow happens from servicing branches back into master for the purposes of completeness,
-  but developers must **not** rely on this to get fixes into master.
+### How do I get my servicing fix into main?
+- Fixes that apply to both main as well as servicing releases must be first checked into
+  main and then cherry picked into the appropriate servicing branches.
+- Code flow happens from servicing branches back into main for the purposes of completeness,
+  but developers must **not** rely on this to get fixes into main.
 
 ### When do we branch?
 - Major releases of .NET Core, not minor
@@ -84,6 +84,16 @@ which Arcade can be branched for major release 'N' of .NET Core.
 6. [Create a subscription](https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#add-subscription) from `arcade`  to `arcade-validation` (branch `release/<N>`) to take changes from the `.NET <N> Eng - Validation` channel.
 7. Modify the new release branch  `release/<N>` of arcade-validation to promote builds
    to `.NET <N> Eng`. ([example](https://github.com/dotnet/arcade-validation/pull/1857/files))
+   In the update-channel.ps1 remove call to 
+   - Get-AzDO-Build 
+   - Get-AzDOHeaders 
+   - Get-LatestBuildResult
+   - Remove the reference to bellweather repos runtime, aspnetcore, installer and also the for loop in the same file.
+   In azure-pipelines.yml 
+   - Include the new release branch under trigger `release/<N.x>`.
+   - Update the branch name to `refs/heads/release/<N>` for the Validate_Publishing condition.
+   - Update the display name from `Promote Arcade to '.NET Eng - Latest' channel` to `Promote Arcade to 'Net <N> Eng' channel`
+   - Update the display name from  `Promote Arcade to 'Latest' channel` to `Promote Arcade to 'Net <N> Eng' channel`
 8. Update [PublishingConstants.cs](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/PublishingConstants.cs)
    in Arcade's master for new channels ([example](https://github.com/dotnet/arcade/pull/6360/files))
 9. Reset arcade Maestro++ subscriptions targeting .NET release branches to
diff --git a/Documentation/Policy/DefaultsGuidance.md b/Documentation/Policy/DefaultsGuidance.md
index a5e20f6c677..59e6086011d 100644
--- a/Documentation/Policy/DefaultsGuidance.md
+++ b/Documentation/Policy/DefaultsGuidance.md
@@ -1,45 +1,45 @@
 # Defaults and Arcade
 
-It is often challenging to reconcile differences between a given repo build and Arcade - which represents .NET Core overall.  It's sometimes tough to determine when to conform to how Arcade expects settings/properties/patterns/targets/conventions to be and when to 'override' (fork) for a given repo.  This document attempts to provide some guidance which hopefully gives at least a place to start - as well as a 'frame' for discussions.
+It is often challenging to reconcile differences between a given repo build and Arcade - which represents .NET overall.  It's sometimes tough to determine when to conform to how Arcade expects settings/properties/patterns/targets/conventions to be and when to 'override' (fork) for a given repo.  This document attempts to provide some guidance which hopefully gives at least a place to start - as well as a 'frame' for discussions.
 
 ## Reminders/Principles
-* There is significant value in sharing a common engineering infrastructure for .NET Core3.
+* There is significant value in sharing a common engineering infrastructure for .NET.
 * Buying into (not necessarily agreeing to always....grin) a shared/common infra is always hard - and expensive.
-* The 'how' Arcade does something is always open for discussion.  We should all be working together in an attempt to have the right implementation that works best for .NET Core.
-* We're all in the same boat - we all ship as part of .NET Core.  In other words, no 'privileged' repos here...  (the egalitarian sword cuts both ways though...)
-* We prefer defaults that match the defaults used by 'vanilla' Visual Studio/C# code formatters/MSBuild/.NET Core SDK.
-* Weigh the costs of adopting different alternatives by looking at impact on existing Arcade repos across the product (.NET Core) as a whole.
+* The 'how' Arcade does something is always open for discussion.  We should all be working together in an attempt to have the right implementation that works best for .NET.
+* We're all in the same boat - we all ship as part of .NET.  In other words, no 'privileged' repos here...  (the egalitarian sword cuts both ways though...)
+* We prefer defaults that match the defaults used by 'vanilla' Visual Studio/C# code formatters/MSBuild/.NET SDK.
+* Weigh the costs of adopting different alternatives by looking at impact on existing Arcade repos across the product (.NET) as a whole.
 * Give consideration to how this affects new repos onboarding to Arcade.
 * We try and avoid blocking people based on differences, but still strongly encourage consistency.
 
 ## Categories of Differences
 
-* Category 1 - Company, Divisional, Visual Studio, or .NET Core requirements.
-* Category 2 - Differences which are truly exceptions to what is otherwise correct for .NET Core overall.
+* Category 1 - Company, Divisional, Visual Studio, or .NET requirements.
+* Category 2 - Differences which are truly exceptions to what is otherwise correct for .NET overall.
 * Category 3 - Differences which are excessively expensive or risky to change.
 * Category 4 - Differences which are the result of team/individual preferences and/or history.
 
 ## Category Criteria ("bar" for each) and Mitigation Guidance
 
-### Category 1 - Company, Divisional, or .NET Core requirements  
+### Category 1 - Company, Divisional, or .NET requirements  
 
-* Hard requirements (like SDL or certs) that .NET Core must confirm to.
+* Hard requirements (like SDL or certs) that .NET must confirm to.
 * These differences **should have no defaults** and should have the required parameters explicitly provided by the repo based on supported options presented by the Arcade SDK.  
 * This might also result in cases where the implementation choice Arcade took proves excessively expensive or unreasonable for a specific product team to adopt.  (see other category for more on this)
 * Obviously, any differences here need to be reconciled - but there's always room for the "how" discussion.
 
-### Category 2 - Differences which are truly exceptions to what is otherwise correct for .NET Core overall
+### Category 2 - Differences which are truly exceptions to what is otherwise correct for .NET overall
 
 * True exceptions mean that there's a concrete business case driving the difference.  
 * These differences have defaults (or preferences) that are set by Arcade which can be overridden **only** for this category of differences.
 * Preference or history don't fall into this category. 
-* These differences should always be the *exception*.  If multiple repos are experiencing the same differences, this likely points to a broader .NET Core (Arcade) change.
+* These differences should always be the *exception*.  If multiple repos are experiencing the same differences, this likely points to a broader .NET (Arcade) change.
 
 ### Category 3 - Differences which are excessively expensive or risky to change.
 
 * Sometimes, the 'right' thing to do is simply too expensive or risky to change right away.
 * *Expensive* here is defined as taking more than 2 man-weeks of dev time to reconcile.
-* *Risky* here is defined as likely destabilizing .NET Core for more than 2 days.
+* *Risky* here is defined as likely destabilizing .NET for more than 2 days.
 * The mitigation for this category is to create a plan for moving to the 'right' place over time - and then executing on that plan.  As with most things, 'scope' is usually where the magic of goodness lives.
 * This mitigation plan should take into account the cost of moving, and the end value over time as well.
 
diff --git a/Documentation/Policy/PowershellBestPractices.md b/Documentation/Policy/PowershellBestPractices.md
index a7f7e681cc6..114239d113f 100644
--- a/Documentation/Policy/PowershellBestPractices.md
+++ b/Documentation/Policy/PowershellBestPractices.md
@@ -101,7 +101,11 @@ if ($LASTEXITCODE -ne 0) {
 }
 ```
 
-*There is a known issue when using `$LASTEXITCODE` in release builds where PowerShell will report that the variable has not been set. As a workaround, simply set `$LASTEXITCODE = 0` at the top of your script.*
+To set it in a PowerShell script, e.g. to ensure a known value at the start of a script, reference the variable in the global scope. 
+
+```powershell
+$global:LASTEXITCODE = 0
+```
 
 ## Set StrictMode and ErrorActionPreference at the top of every file
 
diff --git a/Documentation/Projects/Build Analysis/BuildRetryOnboard.md b/Documentation/Projects/Build Analysis/BuildRetryOnboard.md
new file mode 100644
index 00000000000..546619169ab
--- /dev/null
+++ b/Documentation/Projects/Build Analysis/BuildRetryOnboard.md	
@@ -0,0 +1,196 @@
+# Build Retry
+
+## How it works?
+![](./Resources/BuildRetryWorkflow.png?raw=true)
+
+The build retry feature is composed of two parts.
+
+The first one is having the build configuration file as part of the build artifacts. In order to have this in place it is necessary to follow the [onboarding process](#how-to-onboard).
+
+The second part is what is done by the Build Result Analysis. When the build finishes, it starts getting processed. If it failed, the build is analyzed to see if it can be retried. In order to be retried, at least one of the rules specified in a build configuration file needs to be met. 
+## How to onboard?
+1. In order to use the Build Retry feature it's necessary to have the `.NET Helix` GitHub application installed in the repo in which you intend to use the feature. </br>
+If you want to get the application installed, you can contact the [.NET Core Engineering Services team](https://github.com/dotnet/core-eng/wiki/How-to-get-a-hold-of-Engineering-Servicing)
+
+
+1. Create the [build configuration file](#Build-configuration-file-structure). The name of the file should be: `build-configuration.json` and you can create the file inside any folder. That folder is the one that you are going to publish. </br>
+Ex. \eng\BuildConfiguration\build-configuration.json
+1. [Publish an artifact having the `build-configuration.json` file to Azure Pipeline](https://docs.microsoft.com/en-us/azure/devops/pipelines/artifacts/pipeline-artifacts) in the repo that you are expecting to get retry. The name of the artifact should be: `BuildConfiguration`
+
+	Ex.
+	``` 
+	- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
+	  artifact: BuildConfiguration
+	``` 
+
+## Build configuration file structure
+```json 
+{
+   "RetryCountLimit":1,
+   "RetryByAnyError":false,
+   "RetryByErrors":[
+      {
+         "ErrorRegex":"Regex"
+      }
+   ],
+   "RetryByPipeline":{
+      "RetryJobs":[
+         {
+            "JobName":"JobName"
+         }
+      ],
+      "RetryStages":[
+         {
+            "StageName":"StageName"
+         }
+    ],
+    "RetryJobsInStage":[
+      {
+        "StageName":"StageName",
+        "JobsNames":["JobName"]
+      }
+    ]
+  },
+  "RetryByErrorsInPipeline":{
+    "ErrorInPipelineByStage":[
+      {
+        "StageName":"StageName",
+        "ErrorRegex":"Regex"
+      }
+    ],
+    "ErrorInPipelineByJobs":[
+      {
+        "JobsNames":["JobName"],
+        "ErrorRegex":"Regex"
+      }
+    ],
+    "ErrorInPipelineByJobsInStage":[
+      {
+        "StageName":"StageName",
+        "JobsNames":["JobName"],
+        "ErrorRegex":"Regex"
+      }
+      ]
+   }
+}
+```
+
+- **RetryCountLimit:** Number of retries that can be done on your build. <br/> 
+Ex. "RetryCountLimit": 1 means is going to be retried 1 time by the Build Result Analysis giving a total of 2 executions. <br> 
+Default value: 0. Max internal value: 10.
+
+- **RetryByAnyError:** The build is going to be retried independently of which was the reason of the failure. <br> 
+Default value: False. 
+
+- **RetryByErrors:** List of 'ErrorRegex' (.NET flavor) that will look for a match on the build pipeline errors. In case there is an error matching the regex the build is going to be retried.
+
+	Ex.<br/>
+	In order to retry a build with the following pipeline errors
+	![](./Resources/PipelineErrorsExample.png?raw=true)
+	you could have a file with the following information:
+	```json 
+    {
+       "RetryCountLimit":1,
+       "RetryByErrors":[
+          {
+             "ErrorRegex":"Vstest failed with error.*"
+          }
+       ]
+    }
+	```
+
+- **RetryByPipeline:** The retry by pipeline is expecting a list of Jobs or/and Stages names which in case on fail should cause a retry by the Build Result Analysis.
+
+	The job names reference are the ones on the pipeline:<br/>
+	Ex. 
+	![](./Resources/JobNameErrorsExample.png?raw=true)
+	```json 
+    {
+       "RetryCountLimit":1,
+       "RetryByPipeline":{
+          "RetryJobs":[
+             {
+                "JobName":"Validate_Test_Failing"
+             }
+          ]
+       }
+    }
+	```
+	The stage name references are the ones on the yaml </br>
+	Ex.
+	![](./Resources/StageNameExample.png?raw=true)
+	```json
+    {
+       "RetryCountLimit":1,
+       "RetryByPipeline":{
+          "RetryStages":[
+             {
+                "StageName":"StageName"
+             }
+          ]
+        }
+    }
+	```
+     If you want to retry jobs under a specific stage, you can do that by defining the stage name and then the jobs that you want to retry that are under that stage. You will need to define each stage separately. 
+   ```json
+   {
+      "RetryCountLimit":1,
+      "RetryByPipeline":{
+         "RetryJobsInStage":[
+            {
+               "StageName":"StageName",
+               "JobsNames":[ "JobNameA", "JobNameB" ]
+            }
+         ]
+      }
+   }
+   ```
+- **RetryByErrorsInPipeline:** This is a combination of retry by error and retry by pipeline, in which you will be able to retry a build base on errors found in specific places on the pipeline. <br>  
+This gives you a more granular control on which error do you want that get retried.<br>  
+For example, imagine that you have an error: "Vstest failed with error."  that most of the time happens in StageA, when it happens on StageA and you retry the build it usually finishes successfully. Unfortunately, the same error could happen on StageB and when that happens it is unusual. So, if you want the build only gets retried when the error happens in StageA you can define that: 
+
+   ```json
+   {
+      "RetryCountLimit":1,
+      "RetryByErrorsInPipeline":{
+         "ErrorInPipelineByStage":[
+            {
+            "StageName":"StageA",
+            "ErrorRegex":"Vstest failed with error.*"
+            }
+         ]
+      }
+   }
+   ```
+
+   This same principle can be applied to errors under specific job names: 
+
+   ```json
+  {
+    "RetryCountLimit":1,
+    "RetryByErrorsInPipeline":{
+      "ErrorInPipelineByJobs":[
+        {
+          "JobsNames":["JobNameA","JobNameB"],
+          "ErrorRegex":"Regex"
+        }
+      ]
+    }
+  }
+   ```
+
+   and errors for Jobs under a specific Stage:
+   ```json
+  {
+    "RetryCountLimit":1,
+    "RetryByErrorsInPipeline":{
+      "ErrorInPipelineByJobsInStage":[
+        {
+          "StageName":"StageName",
+          "JobsNames":["JobNameA", "JobNameB"],
+          "ErrorRegex":"Regex"
+             }
+          ]
+        }
+    }
+	```
diff --git a/Documentation/Projects/Build Analysis/Introduction.md b/Documentation/Projects/Build Analysis/Introduction.md
new file mode 100644
index 00000000000..5a2fad01613
--- /dev/null
+++ b/Documentation/Projects/Build Analysis/Introduction.md	
@@ -0,0 +1,27 @@
+# Build Analysis
+
+The Build Analysis Check is a service to improve the Pull Request experience by highlighting build and test information most helpful to .NET developers. Its goal is to make Pull Request results more actionable.
+
+## What does it do?
+
+High-level features include:
+
+- Highlight most important failure information
+- Add context by combining information in Azure DevOps and Helix
+- Reduce distance to most helpful analysis tools, such as Azure DevOps Test Result History for a particular test or the Helix artifact logs
+
+For more details, see the [specifics](Specifics.md) document.
+
+## How do I get it?
+
+Build Analysis is enabled on a per-repository basis. Contact dnceng to request it be enabled in your repository.
+
+## How do I use it?
+
+Once enabled, a new GitHub check suite will be included in all pull requests. Navigate to the "Checks" tab, then look for the ".NET Helix" suite.
+
+## Frequently Asked Questions
+
+### Is this useful even if my project does not use Helix?
+
+Yes! The Build Analysis result leverages Azure DevOps history and information to provide context and workflow improvements. Though it may bring additional information for Helix-based execution, it is not required. 
diff --git a/Documentation/Projects/Build Analysis/Resources/ArtifactsTab.png b/Documentation/Projects/Build Analysis/Resources/ArtifactsTab.png
new file mode 100644
index 00000000000..73775415df9
Binary files /dev/null and b/Documentation/Projects/Build Analysis/Resources/ArtifactsTab.png differ
diff --git a/Documentation/Projects/Build Analysis/Resources/AzureDevOpsArtifactsTab.PNG b/Documentation/Projects/Build Analysis/Resources/AzureDevOpsArtifactsTab.PNG
new file mode 100644
index 00000000000..0a6dd2d7296
Binary files /dev/null and b/Documentation/Projects/Build Analysis/Resources/AzureDevOpsArtifactsTab.PNG differ
diff --git a/Documentation/Projects/Build Analysis/Resources/AzureDevOpsPassedOnRerun.PNG b/Documentation/Projects/Build Analysis/Resources/AzureDevOpsPassedOnRerun.PNG
new file mode 100644
index 00000000000..97106f65f88
Binary files /dev/null and b/Documentation/Projects/Build Analysis/Resources/AzureDevOpsPassedOnRerun.PNG differ
diff --git a/Documentation/Projects/Build Analysis/Resources/BuildRetryWorkflow.png b/Documentation/Projects/Build Analysis/Resources/BuildRetryWorkflow.png
new file mode 100644
index 00000000000..d0c28da1740
Binary files /dev/null and b/Documentation/Projects/Build Analysis/Resources/BuildRetryWorkflow.png differ
diff --git a/Documentation/Projects/Build Analysis/Resources/JobNameErrorsExample.PNG b/Documentation/Projects/Build Analysis/Resources/JobNameErrorsExample.PNG
new file mode 100644
index 00000000000..3762a96ae63
Binary files /dev/null and b/Documentation/Projects/Build Analysis/Resources/JobNameErrorsExample.PNG differ
diff --git a/Documentation/Projects/Build Analysis/Resources/PipelineErrorsExample.PNG b/Documentation/Projects/Build Analysis/Resources/PipelineErrorsExample.PNG
new file mode 100644
index 00000000000..c5e0b6a9abd
Binary files /dev/null and b/Documentation/Projects/Build Analysis/Resources/PipelineErrorsExample.PNG differ
diff --git a/Documentation/Projects/Build Analysis/Resources/StageNameExample.PNG b/Documentation/Projects/Build Analysis/Resources/StageNameExample.PNG
new file mode 100644
index 00000000000..35141ed2fb8
Binary files /dev/null and b/Documentation/Projects/Build Analysis/Resources/StageNameExample.PNG differ
diff --git a/Documentation/Projects/Build Analysis/Specifics.md b/Documentation/Projects/Build Analysis/Specifics.md
new file mode 100644
index 00000000000..7ed4c1574b7
--- /dev/null
+++ b/Documentation/Projects/Build Analysis/Specifics.md	
@@ -0,0 +1,15 @@
+# Build Analysis Specifics
+
+The Build Analysis check includes these details:
+
+- Collapse failures of the same name across Jobs and Pipelines to improve discoverability. For example, failures of the same test across multiple operating systems are grouped together. 
+- Highlight a failure's state in the target branch
+- Provide direct links to the most common pages for continuing analysis
+  - Link to the Azure DevOps build
+  - Link to the log of the specific step that failed
+  - Link to the Azure DevOps Test History for the pipeline
+  - Link to test history of the specific test
+  - Link to the Helix artifacts produced by a test
+  - Link to the test execution details 
+
+Each Build Analysis page also includes a "was this helpful" link. This allows you to call out specific highlights or lowlights in your experience with the check. This feedback is then used by the Dev WF team to refine the analysis.
\ No newline at end of file
diff --git a/Documentation/Projects/Build Analysis/Test Retry Documentation.md b/Documentation/Projects/Build Analysis/Test Retry Documentation.md
new file mode 100644
index 00000000000..b956c889bad
--- /dev/null
+++ b/Documentation/Projects/Build Analysis/Test Retry Documentation.md	
@@ -0,0 +1,46 @@
+# Automatic Test Retry
+
+Automatic Test Retry allows you to retry **helix-based tests**. The retry occur at an assembly level and the number of retries is configurable.  
+
+It's important to know that all the reruns happen on the same machine and that the machines are not cleaned between reruns, this has an important implication: **tests should be idempotent on the same machine.** 
+
+Ex. if you are uploading to any fixed URLs, those need to check if that process was completed, and if copying files on the hard drive, it should be resilient to the same copy command having previously ran. 
+
+## How to get on board
+As a first step you should [configure the test-configuration.json](https://github.com/dotnet/arcade/tree/main/src/Microsoft.DotNet.Helix/Sdk#test-retry) file. This file should be allocated at `eng/test-configuration.json` and it will be [automatically picked up](https://github.com/dotnet/arcade/blob/b4fd1cc3817e0e85213dcc219ff7f7252761659f/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MonoQueue.targets#L8), no further changes are needed.
+
+There are a couple of rules that your test should meet:
+1. Using Helix
+2. Using Azure Reporter - if your tests are already reported on azure this means that is all good
+3. Tests should be idempotent on the same machine
+4. Helix workitem exit code is zero for non-exceptional cases: normal execution, even with test failures, should return exit code 0
+
+**NOTE**: If your tests are not using the Helix SDK, you will need to replicate parts of Helix to ensure that the `test-configuration.json` file is uploaded with the payload. 
+
+## How to know if a test was retried
+There are a couple of ways in which you can confirm if a test was rerun, we are going to divide then in failed and succeeded tests:
+
+### Test failed
+
+When your test failed, and you want to verify if it was retried or want to see the errors of every retry you can do the following:
+
+1. AzDO Artifacts tab: Navigate to your Tests tab, select the test that you want to verify and then select your artifacts tab
+
+    ![](./Resources/AzureDevOpsArtifactsTab.PNG?raw=true)
+
+    The Artifact tab now has the necessary context to know if a test was rerun, this will be easily recognizable by two things:
+    * On the title you will see `multiple executions` message 
+    * `Previous executions` will be listed
+   
+    ![](./Resources/ArtifactsTab.png?raw=true)
+
+1. **Looking at the logs:** In there you will notice that you have 2 console.*.log files (one for each execution), furthermore in the run_client.log, will be some lines about the rerun:
+ `Test configuration for test set indicates 'RERUN', re-executing workitem...`
+
+### Test Succeeded 
+
+When you want to know which test succeeded after a rerun you should go to the AzDO Tests tab of your build and filter the test that "Passed on rerun".
+
+As can be appreciated in the image below:
+
+![](./Resources/AzureDevOpsPassedOnRerun.PNG?raw=true)
diff --git a/Documentation/Projects/M2MRenaming/Master-to-Main-renaming-guide.md b/Documentation/Projects/M2MRenaming/Master-to-Main-renaming-guide.md
index 10950c0cf9e..7040653bdaa 100644
--- a/Documentation/Projects/M2MRenaming/Master-to-Main-renaming-guide.md
+++ b/Documentation/Projects/M2MRenaming/Master-to-Main-renaming-guide.md
@@ -124,7 +124,7 @@ Generate json data file describing Maestro migration, review it and disable all
 ## 2. Add `main` triggers to YAML pipelines
 
 **Please read**
-Before you get on with this step, you should know, that once you change the default branch in your GitHub repository ([step 5](#5-change-the-default-branch-to-main-for-your-github-repository), all open PRs targeting `master` will be retargeted and all PR builds will be triggered again.
+Before you get on with this step, you should know, that once you change the default branch in your GitHub repository ([step 5](#5-change-the-default-branch-to-main-for-your-github-repository)), all open PRs targeting `master` will be retargeted and all PR builds will be triggered again.
 This can cause a large strain on the engineering systems, so please consider the amount of opened pull requests in your repository.
 Please consider - based on the heaviness of your PR build and the number of PRs - whether you want to disable the PR builds for the time being or not.
 
diff --git a/Documentation/StartHere.md b/Documentation/StartHere.md
index a2e98887929..a5b51eedb18 100644
--- a/Documentation/StartHere.md
+++ b/Documentation/StartHere.md
@@ -92,7 +92,7 @@ some highlights
   - Mission Control
 
 #### Testing projects
-  - Helix: [SDK](../src/Microsoft.DotNet.Helix/Sdk/Readme.md), [JobSender](../src/Microsoft.DotNet.Helix/JobSender/Readme.md)
+  - Helix: [Introduction](/Documentation/Helix.md), [SDK](../src/Microsoft.DotNet.Helix/Sdk/Readme.md), [JobSender](../src/Microsoft.DotNet.Helix/JobSender/Readme.md)
   - Azure Agent pools and queues
   - Docker support
   - [Dump file retrieval](Dumps/Dumps.md)
diff --git a/Documentation/Validation.md b/Documentation/Validation.md
new file mode 100644
index 00000000000..987bcb4b4aa
--- /dev/null
+++ b/Documentation/Validation.md
@@ -0,0 +1,126 @@
+# Validating Product Builds
+
+Validating builds is an important part of producing a releasable product. There are several levels of validation that are performed on product builds at various phases of the process:
+
+* CI/PR build time
+  * Repository-level functional testing. Owned by the product teams and defined in the repositories, and used to identify bugs
+* Official build time (optionally)
+  * Source code validation: this includes SDL testing and localization testing. Used to confirm that source code meets Microsoft's standards.
+  * Package validation: includes sourcelink validation, symbols validation, nupkg metadata validation. Used to confirm that customers will be able to install and debug packages from .NET.
+* Nightly validation pipeline (optionally)
+  * Source code validation: this includes SDL testing and localization testing. Used to confirm that source code meets Microsoft's standards.
+  * Package validation: includes sourcelink validation, symbols validation, nupkg metadata validation. Used to confirm that customers will be able to install and debug packages from .NET.
+  * Signing validation: Used to validate that all bits that we ship have been signed properly.
+
+While many of these validation steps can be performed in official builds, the supported model is to onboard to the nightly validation pipeline. All of these steps will be performed as part of shipping the product, and all product teams have the option of running these exact validation steps at a nightly cadence.
+
+## How do we validate .NET?
+
+Pre-.NET 5, validation for the core .NET repositories were done during the official builds. For .NET 5, all post-build validation and source code validation was moved out of the official build and into a separate nightly pipeline, [Validate-DotNet](https://dev.azure.com/dnceng/internal/_build?definitionId=827). This pipeline runs all the same validation that is performed on the full product when we go to release, and is a smoke test for product teams so that they can address any issues well before release day.
+
+Validate-DotNet is controlled by a separate scheduling pipeline, which, once a day, looks for the newest build for each repository that has been onboarded on every channel that those repositories publish to. If no build is found from the previous 24 hours, no validation run will be started for that channel/repository combination. For any repository that has published a new build to the BAR database for a given channel, a new Validate-DotNet run will be created.
+
+To gather all of the assets to be validated, Validate-DotNet uses information found in the BAR database. Specifically, it uses the `darc gather-drop` command to pull down all of the assets that were created by a particular build (but no downstream assets). The pipeline will then sign the build before running the various validation checks on that build, including:
+
+* Signing Validation
+* SDL Validation (which will open TSA issues for any failures found)
+* Localization Validation
+* NuGet Metadata Validation
+* Sourcelink Validation
+* Symbols Validation
+* NuGet Package Icon Validation
+* Checksums Validation
+
+Please note, we are always adding new validation steps to the pipeline, so this is not an exhaustive list.
+
+## Why move validation out of official builds?
+
+As a part of .NET 5, we had a goal of two hour build turn-around. In order to close in on that goal, we removed many things from official builds, including post-build validation.
+
+## How do I onboard to Validate-DotNet?
+
+[Validate-DotNet](https://dev.azure.com/dnceng/internal/_build?definitionId=827) is a pipeline that automatically runs nightly validation for all repositories that have been onboarded. Onboarding to Validate-DotNet is quite simple:
+
+1. Update the [list of repositories](https://dev.azure.com/dnceng/internal/_git/dotnet-release?path=%2Feng%2Fpipeline%2Ftools%2Frepos-to-validate.txt) in [dotnet-release](https://dev.azure.com/dnceng/internal/_git/dotnet-release) with your repository's URL. Please reach out to dnceng for PR approval.
+2. To enable nightly SDL runs, add the [sdl-tsa-vars.config](https://github.com/dotnet/runtime/blob/main/eng/sdl-tsa-vars.config) file to your repository. This file should include all of the necessary information specific to your repository for creating SDL issues.
+
+Once the first step is complete, your repository will start validating on a nightly basis. Once the second step is complete, you will also get SDL validation.
+
+## How do I know if there are failures in my validation runs?
+
+There are two main ways of checking your validation results: manually, and using automatic notifications.
+
+### Manually looking at the pipeline
+
+Validate-DotNet runs each day at 4 PM Pacific Time. Each run is tagged with the repository name and the channel of the given run (to distinguish between the various versions). To look at the runs for only your repository, you can use the following URl, with your repository name in place of `<repo>` `https://dev.azure.com/dnceng/internal/_build?definitionId=827&tagFilter=<repo>`. For example, if you wanted to look at results for runtime, you would navigate to `https://dev.azure.com/dnceng/internal/_build?definitionId=827&tagFilter=runtime`.
+
+### Automatic Notifications
+
+[Build Monitor](https://github.com/dotnet/core-eng/blob/main/Documentation/BuildFailureManagement.md) automatically monitors Validate-DotNet builds for a particular repository and opens issues when failures occur. If an issue is already open for Validate-DotNet failures in your repository for builds on a given channel, it will append a new comment.
+
+To onboard, you will need to update both the `Builds` array and the `Issues` array in Build Monitor's [settings.json](https://github.com/dotnet/arcade-services/blob/main/src/DotNet.Status.Web/.config/settings.json#L23).
+
+The `Builds` array controls which Azure DevOps pipeline builds will be monitored. To monitor Validate-DotNet runs for your repository, you will need to add a new item with the following information:
+
+```json
+{
+    "Project": "internal",
+    "DefinitionPath": "\\dotnet-release\\Validate-DotNet",
+    "Branches": [ "main" ],
+    "IssuesId": <id that matches an item in the Issues array>,
+    "Tags": [ <repository name> ]
+}
+```
+
+For example, for runtime, we would add
+
+```json
+{
+    "Project": "internal",
+    "DefinitionPath": "\\dotnet-release\\Validate-DotNet",
+    "Branches": [ "main" ],
+    "IssuesId": "dotnet-runtime-infra",
+    "Tags": [ "runtime" ]
+}
+```
+
+The `Issues` array controls where issues will be opened for builds that fail. You will need to update the `Issues` array in the same settings.json file, with the following information:
+
+```json
+{
+    "Id": <id that matches the IssuesId in your Builds entry>,
+    "Owner": <project>, 
+    "Name": <repository>, 
+    "Labels": [ <infrastructure label> ],
+    "UpdateExisting": true // True if you want issues to be updated. False if you want new issues for every failure
+}
+```
+
+For example, for runtime, we would do:
+
+```json
+{
+    "Id": "dotnet-runtime-infra",
+    "Owner": "dotnet",
+    "Name": "runtime",
+    "Labels": [ "area-Infrastructure" ],
+    "UpdateExisting": true
+}
+```
+
+### What do I do if an issue is opened in my repository?
+
+Validation failures come in many forms. Most will be actual problems found with the assets in a drop for your repository. These are the responsibility of the product teams to fix. Any failures in the `Required Validation` stage should be fixed as soon as possible, as they are possible release blockers.
+
+Some failures may be infrastructure issues. If you believe this is a case, please reach out to [DNCEng First Responders](https://github.com/dotnet/core-eng/wiki/How-to-get-a-hold-of-Engineering-Servicing), and someone will help diagnose and fix the issue found.
+
+Errors we commonly see in validation jobs include:
+
+* Signing Validation
+  * Files that are not intended to be signed are not listed in the `eng/SignCheckExclusionsFile.txt` for that repository, so validation complains that the files are not signed. Mitigation: add that file type to the `eng/SignCheckExclusionsFile.txt` in your repository.
+* SDL Validation (which will open TSA issues for any failures found)
+  * Any pipeline failures in these legs should be reported to [DNCEng First Responders](https://github.com/dotnet/core-eng/wiki/How-to-get-a-hold-of-Engineering-Servicing), as it suggests an infrastructure failure. SDL failures should automatically create TSA issues, which you should address as appropriate.
+* Localization Validation
+  * Localization is done closer to release time. Localization failures suggest that either the localization team hasn't finished translations, or the translation PR hasn't been checked into your repository and should be. The closer to release we get, the more important fixing these failures becomes.
+* Nuget Metadata Validation
+  * Metadata is missing. These need to be fixed in the repository, and are shipping blockers.
diff --git a/azure-pipelines-code-mirror.yml b/azure-pipelines-code-mirror.yml
index c3324a686b6..cff308e55d5 100644
--- a/azure-pipelines-code-mirror.yml
+++ b/azure-pipelines-code-mirror.yml
@@ -1,6 +1,9 @@
 # Disable CI triggers, only called using Maestro
 trigger: none
 
+variables:
+  - group: Mirror-Credentials
+
 # Moves code from GitHub into internal repos
 jobs:
 - template: /eng/common/templates/jobs/jobs.yml
@@ -10,7 +13,8 @@ jobs:
     jobs:
     - job: Merge_GitHub_to_Azure_DevOps
       pool:
-        name: Hosted VS2017
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
       variables:
       - name: WorkingDirectoryName
         value: repo-dir
@@ -48,7 +52,7 @@ jobs:
           targetType: inline
           workingDirectory: $(WorkingDirectoryName)
           script: |
-            git push azdo-mirror $(BranchToMirror) $(ExtraPushArgs)
+            git push azdo-mirror $(BranchToMirror) --tags $(ExtraPushArgs)
 
             if ($LASTEXITCODE -EQ 0) {
               Write-Host "Push was successful"
diff --git a/azure-pipelines-codeql.yml b/azure-pipelines-codeql.yml
new file mode 100644
index 00000000000..267b6d6c1fd
--- /dev/null
+++ b/azure-pipelines-codeql.yml
@@ -0,0 +1,48 @@
+variables:
+  - name: _TeamName
+    value: DotNetCore
+  - group: SDL_Settings
+    
+trigger: none
+
+schedules:
+  - cron: 0 12 * * 1
+    displayName: Weekly Monday CodeQL/Semmle run
+    branches:
+      include:
+      - main
+    always: true
+
+stages:
+- stage: build
+  displayName: Build
+  # Three phases for each of the three OSes we want to run on
+  jobs:
+  - template: /eng/common/templates/jobs/codeql-build.yml
+    parameters:
+      jobs:
+      - job: Windows_NT_CSharp
+        timeoutInMinutes: 90
+        pool:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
+        steps:
+        - checkout: self
+          clean: true
+
+        - template: /eng/common/templates/steps/execute-codeql.yml
+          parameters:
+            executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1'
+            buildCommands: 'eng\common\cibuild.cmd -configuration Release -prepareMachine /p:Test=false /p:Sign=false'
+            language: csharp
+            additionalParameters: '-SourceToolsList @("semmle")
+            -TsaInstanceURL $(_TsaInstanceURL)
+            -TsaProjectName $(_TsaProjectName)
+            -TsaNotificationEmail $(_TsaNotificationEmail)
+            -TsaCodebaseAdmin $(_TsaCodebaseAdmin)
+            -TsaBugAreaPath $(_TsaBugAreaPath)
+            -TsaIterationPath $(_TsaIterationPath)
+            -TsaRepositoryName "Arcade"
+            -TsaCodebaseName "Arcade"
+            -TsaPublish $False'
diff --git a/azure-pipelines-merge-mirror.yml b/azure-pipelines-merge-mirror.yml
index 87a1bc4d61f..0c5d1667671 100644
--- a/azure-pipelines-merge-mirror.yml
+++ b/azure-pipelines-merge-mirror.yml
@@ -1,6 +1,9 @@
 # Disable CI triggers, only called using Maestro
 trigger: none
 
+variables:
+  - group: Mirror-Credentials
+
 # Merges code from GitHub into internal branches in internal repos
 jobs:
 - template: /eng/common/templates/jobs/jobs.yml
@@ -10,7 +13,8 @@ jobs:
     jobs:
     - job: Merge_GitHub_to_Azure_DevOps
       pool:
-        name: Hosted VS2017
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
       variables:
       - name: WorkingDirectoryName
         value: repo-dir
diff --git a/azure-pipelines-richnav.yml b/azure-pipelines-richnav.yml
index ed02de46f8b..363066d6f10 100644
--- a/azure-pipelines-richnav.yml
+++ b/azure-pipelines-richnav.yml
@@ -24,8 +24,8 @@ stages:
       - job: Windows_NT
         timeoutInMinutes: 90
         pool:
-          name: NetCorePublic-Pool
-          queue: BuildPool.Server.Amd64.VS2017.Arcade.Open
+          name: NetCore1ESPool-Public
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
         preSteps:
         - checkout: self
           clean: true
diff --git a/azure-pipelines-weekly.yaml b/azure-pipelines-weekly.yaml
new file mode 100644
index 00000000000..6feba661c27
--- /dev/null
+++ b/azure-pipelines-weekly.yaml
@@ -0,0 +1,40 @@
+trigger: none
+
+schedules:
+- cron: 0 12 * * 1
+  displayName: Weekly Monday build
+  branches:
+    include:
+    - main
+  always: true
+
+name: $(Date:yyyMMdd)$(Rev:rr)
+stages:
+  - stage: SynchronizeSecrets
+    jobs:
+    - job: Synchronize
+      pool:
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
+      steps:
+      - task: UseDotNet@2
+        displayName: Install Correct .NET Version
+        inputs:
+          useGlobalJson: true
+
+      - task: UseDotNet@2
+        displayName: Install .NET 3.1 runtime
+        inputs:
+          packageType: runtime
+          version: 3.1.x
+
+      - script: dotnet tool restore
+
+      - task: AzureCLI@2
+        inputs:
+          azureSubscription: DotNet Eng Services Secret Manager
+          scriptType: ps
+          scriptLocation: inlineScript
+          inlineScript: |
+            Get-ChildItem .vault-config/*.yaml |% { dotnet secret-manager synchronize $_}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 806213964f0..1fac68b9691 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,12 +20,18 @@ variables:
 resources:
   containers:
   - container: LinuxContainer
-    image: microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-cross-0cd4667-20170319080304
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-0cd4667-20170319080304
 
 stages:
 - stage: build
   displayName: Build
   jobs:
+  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
+    - template: /eng/common/templates/job/onelocbuild.yml
+      parameters:
+        MirrorRepo: arcade
+        LclSource: lclFilesFromPackage
+        LclPackageId: 'LCL-JUNO-PROD-ARCADE'
   - template: /eng/common/templates/jobs/jobs.yml
     parameters:
       artifacts:
@@ -44,11 +50,10 @@ stages:
         timeoutInMinutes: 90
         pool:
           ${{ if eq(variables._RunAsPublic, True) }}:
-            name: NetCorePublic-Pool
-            queue: BuildPool.Server.Amd64.VS2017.Arcade.Open
+            vmImage: windows-latest
           ${{ if eq(variables._RunAsInternal, True) }}:
-            name: NetCoreInternal-Pool
-            queue: BuildPool.Server.Amd64.VS2017.Arcade
+            name: NetCore1ESPool-Internal
+            demands: ImageOverride -equals Build.Server.Amd64.VS2019
         strategy:
           matrix:
             Build_Release:
@@ -66,13 +71,12 @@ stages:
             $(_InternalBuildArgs)
             /p:Test=false
           displayName: Windows Build / Publish
-        - task: ComponentGovernanceComponentDetection@0
+
       - ${{ if eq(variables._RunAsPublic, True) }}:
         - job: Linux
           container: LinuxContainer
           pool:
-            name:  NetCorePublic-Pool
-            queue: BuildPool.Ubuntu.1604.Amd64.Arcade.Open
+            vmImage: ubuntu-latest
           strategy:
             matrix:
               Build_Debug:
@@ -97,10 +101,8 @@ stages:
       parameters:
         artifacts:
           publish:
-            artifacts:
-              name: Artifacts_Test_$(Agent.OS)_$(_BuildConfig)
             logs: 
-              name: Logs_Test_$(Agent.OS)_$(_BuildConfig)
+              name: Logs_Test_$(Agent.OS)_$(_BuildConfig)_$(_Testing)
           download: true
         workspace:
           clean: all
@@ -115,16 +117,31 @@ stages:
                 _BuildConfig: Release
               Build_Debug:
                 _BuildConfig: Debug
+          variables:
+          - _Testing: Helix
           preSteps:
           - checkout: self
             clean: true
           steps:
+          - task: PowerShell@2
+            displayName: sdk-task verification
+            inputs:
+              filePath: eng\common\sdk-task.ps1
+              arguments: -task PublishToSymbolServers /p:DryRun="true" -restore -msbuildEngine dotnet
+                /p:DotNetSymbolServerTokenMsdl=DryRunPTA
+                /p:DotNetSymbolServerTokenSymWeb=DryRunPTA
+                /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
+                /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+                /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
+                /p:Configuration=Release
+                /p:PublishToMSDL=false
           - powershell: eng\common\build.ps1
               -configuration $(_BuildConfig) 
               -prepareMachine
               -ci
               -restore
               -test
+              -warnAsError $false
               -projects $(Build.SourcesDirectory)\tests\UnitTests.proj
               /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\Helix.binlog
               /p:RestoreUsingNuGetTargets=false
@@ -132,23 +149,38 @@ stages:
             env:
               SYSTEM_ACCESSTOKEN: $(System.AccessToken)
               HelixAccessToken: ''
-        # We don't have enough hardware to run these tests on Arcade PR given the Arcade XHarness SDK changes infrequently. (https://github.com/dotnet/core-eng/issues/12238)
-        # Until the above issue is resolved, if you are editing the Xharness SDK's Windows side, please exercise this manually.  Contact dnceng for assistance.
-        # - powershell: eng\common\build.ps1
-        #     -configuration $(_BuildConfig) 
-        #     -prepareMachine
-        #     -ci
-        #     -restore
-        #     -test
-        #     -projects $(Build.SourcesDirectory)\tests\UnitTests.XHarness.Android.WindowsQueues.proj
-        #     /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\Helix.XHarness.Android.WindowsQueues.binlog
-        #     /p:RestoreUsingNuGetTargets=false
-        #     /p:XharnessTestARM64_V8A=true
-        #   displayName: XHarness Android Helix Testing (Windows)
-        #   env:
-        #     SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-        #     HelixAccessToken: ''
+        - job: Windows_NT_XHarness
+          timeoutInMinutes: 90
+          pool:
+            vmimage: windows-latest
+          strategy:
+            matrix:
+              Build_Release:
+                _BuildConfig: Release
+              Build_Debug:
+                _BuildConfig: Debug
+          variables:
+          - _Testing: Xharness
+          preSteps:
+          - checkout: self
+            clean: true
+          steps:
+          - powershell: eng\common\build.ps1
+              -configuration $(_BuildConfig) 
+              -prepareMachine
+              -ci
+              -restore
+              -test
+              -warnAsError $false
+              -projects $(Build.SourcesDirectory)\tests\XHarness.Android.DeviceTests.proj
+              /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\Helix.XHarness.Android.Device.Tests.binlog
+              /p:RestoreUsingNuGetTargets=false
+            displayName: XHarness Android Helix Testing (Windows)
+            env:
+              SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+              HelixAccessToken: ''
         - job: Linux
+          timeoutInMinutes: 90
           container: LinuxContainer
           pool:
             vmimage: ubuntu-latest
@@ -158,6 +190,8 @@ stages:
                 _BuildConfig: Debug
               Build_Release:
                 _BuildConfig: Release
+          variables:
+          - _Testing: Helix
           preSteps:
           - checkout: self
             clean: true
@@ -168,6 +202,7 @@ stages:
               --ci
               --restore
               --test
+              --warnAsError false
               --projects $(Build.SourcesDirectory)/tests/UnitTests.proj
               /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.binlog
               /p:RestoreUsingNuGetTargets=false
@@ -175,57 +210,95 @@ stages:
             env:
               SYSTEM_ACCESSTOKEN: $(System.AccessToken)
               HelixAccessToken: ''
+        - job: Linux_XHarness_Apple_Simulator
+          timeoutInMinutes: 90
+          container: LinuxContainer
+          pool:
+            vmimage: ubuntu-latest
+          strategy:
+            matrix:
+              Build_Debug:
+                _BuildConfig: Debug
+              Build_Release:
+                _BuildConfig: Release
+          variables:
+          - _Testing: Xharness_Apple_Simulator
+          preSteps:
+          - checkout: self
+            clean: true
+          steps:
           - script: eng/common/build.sh
               -configuration $(_BuildConfig)
               -prepareMachine
               -ci
               -restore
               -test
-              -projects $(Build.SourcesDirectory)/tests/UnitTests.XHarness.iOS.proj
-              /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.XHarness.iOS.binlog
+              -warnAsError false
+              -projects $(Build.SourcesDirectory)/tests/XHarness.Apple.SimulatorTests.proj
+              /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/XHarness.Apple.Simulator.Tests.binlog
               /p:RestoreUsingNuGetTargets=false
-            displayName: XHarness iOS Simulator Helix Testing
+            displayName: XHarness Apple Simulator Helix Testing
             env:
               SYSTEM_ACCESSTOKEN: $(System.AccessToken)
               HelixAccessToken: ''
-          # TODO (prvysoky): This will be enabled once we get a better app to test with (core-eng/11893)
-          # - script: eng/common/build.sh
-          #     -configuration $(_BuildConfig)
-          #     -prepareMachine
-          #     -ci
-          #     -restore
-          #     -test
-          #     -projects $(Build.SourcesDirectory)/tests/UnitTests.XHarness.iOS.Device.proj
-          #     /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.XHarness.iOS.Device.binlog
-          #     /p:RestoreUsingNuGetTargets=false
-          #   displayName: XHarness iOS Device Helix Testing
-          #   env:
-          #     SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-          #     HelixAccessToken: ''
+        - job: Linux_XHarness_Apple_Device
+          timeoutInMinutes: 90
+          container: LinuxContainer
+          pool:
+            vmimage: ubuntu-latest
+          strategy:
+            matrix:
+              Build_Debug:
+                _BuildConfig: Debug
+              Build_Release:
+                _BuildConfig: Release
+          variables:
+          - _Testing: Xharness_Apple_Device
+          preSteps:
+          - checkout: self
+            clean: true
+          steps:
           - script: eng/common/build.sh
               -configuration $(_BuildConfig)
               -prepareMachine
               -ci
               -restore
               -test
-              -projects $(Build.SourcesDirectory)/tests/UnitTests.XHarness.iOS.IncludeCliOnly.proj
-              /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.XHarness.CLI.binlog
+              -warnAsError false
+              -projects $(Build.SourcesDirectory)/tests/XHarness.Apple.DeviceTests.proj
+              /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.XHarness.Apple.Device.Tests.binlog
               /p:RestoreUsingNuGetTargets=false
-            displayName: XHarness CLI pre-install Helix Testing
+            displayName: XHarness Apple Device Helix Testing
             env:
               SYSTEM_ACCESSTOKEN: $(System.AccessToken)
               HelixAccessToken: ''
+        - job: Linux_XHarness
+          timeoutInMinutes: 90
+          container: LinuxContainer
+          pool:
+            vmimage: ubuntu-latest
+          strategy:
+            matrix:
+              Build_Debug:
+                _BuildConfig: Debug
+              Build_Release:
+                _BuildConfig: Release
+          variables:
+          - _Testing: Xharness
+          preSteps:
+          - checkout: self
+            clean: true
+          steps:
           - script: eng/common/build.sh
               -configuration $(_BuildConfig) 
               -prepareMachine
               -ci
               -restore
               -test
-              -projects $(Build.SourcesDirectory)/tests/UnitTests.XHarness.Android.LinuxQueues.proj
-              /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.XHarness.Android.LinuxQueues.binlog
+              -warnAsError false
+              -projects $(Build.SourcesDirectory)/tests/XHarness.Android.SimulatorTests.proj
+              /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.XHarness.Android.Simulator.Tests.binlog
               /p:RestoreUsingNuGetTargets=false
-              /p:XharnessTestX86=true 
-              /p:XharnessTestX86_64=true 
             displayName: XHarness Android Helix Testing (Linux)
             env:
               SYSTEM_ACCESSTOKEN: $(System.AccessToken)
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 4e3a1aeb165..ace72e8e5d8 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -29,7 +29,7 @@
         $(RepoRoot)src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props;
         $(RepoRoot)src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props;
         $(RepoRoot)src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets;
-        $(RepoRoot)src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.props;
+        $(RepoRoot)src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props;
         $(RepoRoot)src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets;
         $(RepoRoot)src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props" />
     </ItemGroup>
diff --git a/eng/TargetFrameworkDefaults.props b/eng/TargetFrameworkDefaults.props
index 89f2a8eb94c..ca3546e8c55 100644
--- a/eng/TargetFrameworkDefaults.props
+++ b/eng/TargetFrameworkDefaults.props
@@ -6,7 +6,7 @@
   -->
   <PropertyGroup>
     <TargetFrameworkForNETSDK>netcoreapp3.1</TargetFrameworkForNETSDK>
-    <TargetFrameworkForNETSDK Condition="'$(DotNetBuildFromSource)' == 'true'">net5.0</TargetFrameworkForNETSDK>
+    <TargetFrameworkForNETSDK Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworkForNETSDK>
   </PropertyGroup>
 
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b85592e5f2e..6db11599b93 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,64 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.SymbolUploader.Build.Task" Version="1.1.156702">
+    <Dependency Name="Microsoft.SymbolUploader.Build.Task" Version="2.0.0-preview.1.21526.15">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
-      <Sha>861806bc0dc685441cb3e8f6bd1ce5ed31e6b32b</Sha>
+      <Sha>62ceb439e80bf0814d0ffa17f022d4624ea4aa6c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SymbolUploader" Version="1.1.152002">
+    <Dependency Name="Microsoft.SymbolUploader" Version="2.0.0-preview.1.21526.15">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
-      <Sha>165896e7efeecb70f01bd011257ead0f56d32c95</Sha>
+      <Sha>62ceb439e80bf0814d0ffa17f022d4624ea4aa6c</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.TemplateEngine.Tasks" Version="7.0.100-alpha.1.21601.1">
+      <Uri>https://github.com/dotnet/templating</Uri>
+      <Sha />
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21207.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>86aee6d02b2fb8534b9466db0da25483d7c399a9</Sha>
+      <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21207.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>86aee6d02b2fb8534b9466db0da25483d7c399a9</Sha>
+      <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21207.4">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>86aee6d02b2fb8534b9466db0da25483d7c399a9</Sha>
+      <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21207.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>86aee6d02b2fb8534b9466db0da25483d7c399a9</Sha>
+      <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21207.4">
+    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>86aee6d02b2fb8534b9466db0da25483d7c399a9</Sha>
+      <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20258.6">
+    <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.21553.1">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>869869342f1ec338de96adcea6e003b61f195256</Sha>
+      <Sha>354627f34e567c924dc4cc927d1c70a627aeb9f8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Maestro.Tasks" Version="1.1.0-beta.20570.1">
+    <Dependency Name="Microsoft.DotNet.Maestro.Tasks" Version="1.1.0-beta.21520.4">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>cac955fe259cb611f6a29d09209bd717deb69037</Sha>
+      <Sha>a5f3ed9d5f560555ff6d26b286acdcfbb7ce3b14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21201.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22074.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>c2c34bf7fdeb5a89e83817ced9a1a2c3c4cfc15c</Sha>
+      <Sha>0137095821e2e5a9e030d97248503387b8d72a18</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.9.0-6.21160.10">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.1-1.22053.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>59eedc33d35754759994155ea2f4e1012a9951e3</Sha>
+      <Sha>9942dc957472b9bf179b11742bc161ef6c79691e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21207.1">
-      <Uri>https://github.com/mono/linker</Uri>
-      <Sha>55bd0ebd00ddbf2cd817314b1cf6824003cfb463</Sha>
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.22103.2">
+      <Uri>https://github.com/dotnet/linker</Uri>
+      <Sha>3efd231da430baa0fd670e278f6b5c3e62834bde</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21201-01">
+    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22101-03">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
+      <Sha>72ddf5cd5ab8301a41f9741210766eff56a06581</Sha>
       <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="1.1.0-beta-21201-01">
+    <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="1.2.0-beta-22101-03">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
+      <Sha>72ddf5cd5ab8301a41f9741210766eff56a06581</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-19575-01">
       <Uri>https://github.com/dotnet/symreader-converter</Uri>
@@ -68,9 +72,9 @@
       <Uri>https://github.com/dotnet/symreader-converter</Uri>
       <Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
     </Dependency>
-    <Dependency Name="XliffTasks" Version="1.0.0-beta.21169.2">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22079.1">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>0da469fe1c2714d0e25cad1143632562fb528425</Sha>
+      <Sha>8cd0d0d64b445a1db3307d11932006035a47e338</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index eb7b34152b4..460828291fc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,24 +2,26 @@
 <Project>
   <PropertyGroup>
     <!-- This repo version -->
-    <VersionPrefix>6.0.0</VersionPrefix>
+    <VersionPrefix>7.0.0</VersionPrefix>
     <PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
     <!-- Opt-out repo features -->
     <UsingToolXliff>false</UsingToolXliff>
     <!-- Libs -->
     <CommandLineParserVersion>2.2.1</CommandLineParserVersion>
     <CredentialManagementVersion>1.0.2</CredentialManagementVersion>
-    <MicrosoftCciVersion>4.0.0-rc3-24214-00</MicrosoftCciVersion>
     <HandlebarsNetVersion>1.10.1</HandlebarsNetVersion>
     <LibGit2SharpVersion>0.25.2</LibGit2SharpVersion>
     <log4netVersion>2.0.10</log4netVersion>
     <SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
-    <AzureStorageBlobsVersion>12.3.0</AzureStorageBlobsVersion>
+    <AzureCoreVersion>1.19.0</AzureCoreVersion>
+    <AzureStorageBlobsVersion>12.10.0</AzureStorageBlobsVersion>
     <FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
     <MicrosoftApplicationInsightsVersion>2.16.0</MicrosoftApplicationInsightsVersion>
     <MicrosoftAzureKeyVaultVersion>3.0.0</MicrosoftAzureKeyVaultVersion>
     <MicrosoftAzureServicesAppAuthenticationVersion>1.3.1</MicrosoftAzureServicesAppAuthenticationVersion>
     <MicrosoftDataAnalysisVersion>0.1.0</MicrosoftDataAnalysisVersion>
+    <MicrosoftDataODataVersion>5.8.4</MicrosoftDataODataVersion>
+    <MicrosoftDataServicesClientVersion>5.8.4</MicrosoftDataServicesClientVersion>
     <MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
     <MicrosoftBuildFrameworkVersion>15.7.179</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildTasksCoreVersion>15.7.179</MicrosoftBuildTasksCoreVersion>
@@ -35,13 +37,13 @@
     <MicrosoftExtensionsFileSystemGlobbingVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>2.1.1</MicrosoftExtensionsLoggingConsoleVersion>
     <MicrosoftNETCorePlatformsVersion>2.1.0</MicrosoftNETCorePlatformsVersion>
-    <MicrosoftNetCompilersToolsetVersion>3.9.0-6.21160.10</MicrosoftNetCompilersToolsetVersion>
-    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.2.21207.1</MicrosoftNETILLinkTasksVersion>
+    <MicrosoftNetCompilersToolsetVersion>4.0.1-1.22053.6</MicrosoftNetCompilersToolsetVersion>
     <MicrosoftNetTestSdkVersion>16.7.1</MicrosoftNetTestSdkVersion>
+    <MicrosoftNETILLinkTasksVersion>6.0.100-1.22103.2</MicrosoftNETILLinkTasksVersion>
     <MoqVersion>4.8.3</MoqVersion>
     <MonoOptionsVersion>5.3.0.1</MonoOptionsVersion>
     <McMasterExtensionsCommandLineUtils>2.3.0</McMasterExtensionsCommandLineUtils>
-    <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
+    <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
     <SystemTextJsonVersion>4.7.0</SystemTextJsonVersion>
     <NuGetVersioningVersion>4.4.0</NuGetVersioningVersion>
     <NuGetVersion>5.6.0-preview.2.6489</NuGetVersion>
@@ -61,31 +63,32 @@
     <SystemRuntimeInteropServicesRuntimeInformation>4.3.0</SystemRuntimeInteropServicesRuntimeInformation>
     <SystemTextEncodingsWebVersion>4.7.2</SystemTextEncodingsWebVersion>
     <SystemThreadingTasksExtensionVersion>4.5.2</SystemThreadingTasksExtensionVersion>
-    <SystemValueTupleVersion>4.4.0</SystemValueTupleVersion>
+    <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <WindowsAzureStorageVersion>8.5.0</WindowsAzureStorageVersion>
-    <XUnitVersion>2.4.1</XUnitVersion>
+    <XUnitVersion>2.4.2-pre.9</XUnitVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21207.4</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetSignToolVersion>6.0.0-beta.21207.4</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetSignToolVersion>7.0.0-beta.22103.1</MicrosoftDotNetSignToolVersion>
     <MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
     <MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
     <MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
     <MicrosoftDotNetGitHubIssueLabelerAssetsVersion>1.6.0</MicrosoftDotNetGitHubIssueLabelerAssetsVersion>
     <MicrosoftMLVersion>1.0.0</MicrosoftMLVersion>
     <MicrosoftVisualStudioWebCodeGenerationDesignVersion>2.0.4</MicrosoftVisualStudioWebCodeGenerationDesignVersion>
-    <MicrosoftDiaSymReaderConverterVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterVersion>
     <MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbVersion>
-    <MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
-    <MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20258.6</MicrosoftDotNetMaestroClientVersion>
-    <MicrosoftSourceLinkGitHubVersion>1.1.0-beta-21201-01</MicrosoftSourceLinkGitHubVersion>
-    <MicrosoftSourceLinkAzureReposGitVersion>1.1.0-beta-21201-01</MicrosoftSourceLinkAzureReposGitVersion>
-    <MicrosoftDotNetSwaggerGeneratorMSBuildVersion>6.0.0-beta.21207.4</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
-    <XliffTasksVersion>1.0.0-beta.21169.2</XliffTasksVersion>
-    <MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.20570.1</MicrosoftDotNetMaestroTasksVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21201.1</MicrosoftDotNetXHarnessCLIVersion>
-    <MicrosoftSymbolUploaderBuildTaskVersion>1.1.156402</MicrosoftSymbolUploaderBuildTaskVersion>
-    <MicrosoftSymbolUploaderVersion>1.1.152002</MicrosoftSymbolUploaderVersion>
-    <MicrosoftNetSdkWorkloadManifestReaderVersion>6.0.100-preview.3.21175.4</MicrosoftNetSdkWorkloadManifestReaderVersion>
+    <MicrosoftDotNetMaestroClientVersion>1.1.0-beta.21553.1</MicrosoftDotNetMaestroClientVersion>
+    <MicrosoftSourceLinkGitHubVersion>1.2.0-beta-22101-03</MicrosoftSourceLinkGitHubVersion>
+    <MicrosoftSourceLinkAzureReposGitVersion>1.2.0-beta-22101-03</MicrosoftSourceLinkAzureReposGitVersion>
+    <MicrosoftDotNetSwaggerGeneratorMSBuildVersion>7.0.0-beta.22103.1</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
+    <MicrosoftDotNetXliffTasksVersion>1.0.0-beta.22079.1</MicrosoftDotNetXliffTasksVersion>
+    <MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.22076.4</MicrosoftDotNetMaestroTasksVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22074.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftSymbolUploaderBuildTaskVersion>2.0.0-preview.1.21526.15</MicrosoftSymbolUploaderBuildTaskVersion>
+    <MicrosoftSymbolUploaderVersion>2.0.0-preview.1.21526.15</MicrosoftSymbolUploaderVersion>
+    <MicrosoftNetSdkWorkloadManifestReaderVersion>6.0.100-rtm.21515.10</MicrosoftNetSdkWorkloadManifestReaderVersion>
+    <MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview2.6.21561.1</MicrosoftDeploymentDotNetReleasesVersion>
+    <!-- Used to flow Source Link version through Arcade SDK -->
+    <MicrosoftSourceLinkVersion>$(MicrosoftSourceLinkGitHubVersion)</MicrosoftSourceLinkVersion>
+    <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.2.22075.3</MicrosoftTemplateEngineTasksVersion>
   </PropertyGroup>
 </Project>
diff --git a/eng/common-variables.yml b/eng/common-variables.yml
index 805ec66de9e..a8fc301ef8e 100644
--- a/eng/common-variables.yml
+++ b/eng/common-variables.yml
@@ -10,8 +10,6 @@ variables:
     value: False
   - name: _InternalBuildArgs
     value: ''
-  - name: skipComponentGovernanceDetection
-    value: true
 
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - name: _RunAsPublic
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
index a0b5fc37f43..18823840b11 100644
--- a/eng/common/SetupNugetSources.ps1
+++ b/eng/common/SetupNugetSources.ps1
@@ -158,4 +158,10 @@ if ($dotnet5Source -ne $null) {
     AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
 }
 
+$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']")
+if ($dotnet6Source -ne $null) {
+    AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
+    AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
+}
+
 $doc.Save($filename)
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
index 2734601c13c..ad3fb74fd2c 100755
--- a/eng/common/SetupNugetSources.sh
+++ b/eng/common/SetupNugetSources.sh
@@ -129,6 +129,30 @@ if [ "$?" == "0" ]; then
     PackageSources+=('dotnet5-internal-transport')
 fi
 
+# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present
+grep -i "<add key=\"dotnet6\"" $ConfigFile
+if [ "$?" == "0" ]; then
+    grep -i "<add key=\"dotnet6-internal\"" $ConfigFile
+    if [ "$?" != "0" ]; then
+        echo "Adding dotnet6-internal to the packageSources."
+        PackageSourcesNodeFooter="</packageSources>"
+        PackageSourceTemplate="${TB}<add key=\"dotnet6-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2\" />"
+
+        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+    fi
+    PackageSources+=('dotnet6-internal')
+
+    grep -i "<add key=\"dotnet6-internal-transport\">" $ConfigFile
+    if [ "$?" != "0" ]; then
+        echo "Adding dotnet6-internal-transport to the packageSources."
+        PackageSourcesNodeFooter="</packageSources>"
+        PackageSourceTemplate="${TB}<add key=\"dotnet6-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2\" />"
+
+        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+    fi
+    PackageSources+=('dotnet6-internal-transport')
+fi
+
 # I want things split line by line
 PrevIFS=$IFS
 IFS=$'\n'
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 94a91c0817e..8943da242f6 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -25,6 +25,7 @@ Param(
   [switch] $prepareMachine,
   [string] $runtimeSourceFeed = '',
   [string] $runtimeSourceFeedKey = '',
+  [switch] $excludePrereleaseVS,
   [switch] $help,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
@@ -65,6 +66,7 @@ function Print-Usage() {
   Write-Host "  -prepareMachine         Prepare machine for CI run, clean up processes after build"
   Write-Host "  -warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
   Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
+  Write-Host "  -excludePrereleaseVS    Set to exclude build engines in prerelease versions of Visual Studio"
   Write-Host ""
 
   Write-Host "Command line arguments not listed above are passed thru to msbuild."
diff --git a/eng/common/cross/arm/sources.list.trusty b/eng/common/cross/arm/sources.list.trusty
deleted file mode 100644
index 07d8f88d82e..00000000000
--- a/eng/common/cross/arm/sources.list.trusty
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
\ No newline at end of file
diff --git a/eng/common/cross/arm/tizen-build-rootfs.sh b/eng/common/cross/arm/tizen-build-rootfs.sh
new file mode 100755
index 00000000000..9fdb32e920e
--- /dev/null
+++ b/eng/common/cross/arm/tizen-build-rootfs.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -e
+
+__ARM_HARDFP_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+__TIZEN_CROSSDIR="$__ARM_HARDFP_CrossDir/tizen"
+
+if [[ -z "$ROOTFS_DIR" ]]; then
+    echo "ROOTFS_DIR is not defined."
+    exit 1;
+fi
+
+TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
+mkdir -p $TIZEN_TMP_DIR
+
+# Download files
+echo ">>Start downloading files"
+VERBOSE=1 $__ARM_HARDFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
+echo "<<Finish downloading files"
+
+echo ">>Start constructing Tizen rootfs"
+TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
+cd $ROOTFS_DIR
+for f in $TIZEN_RPM_FILES; do
+    rpm2cpio $f  | cpio -idm --quiet
+done
+echo "<<Finish constructing Tizen rootfs"
+
+# Cleanup tmp
+rm -rf $TIZEN_TMP_DIR
+
+# Configure Tizen rootfs
+echo ">>Start configuring Tizen rootfs"
+ln -sfn asm-arm ./usr/include/asm
+patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
+echo "<<Finish configuring Tizen rootfs"
diff --git a/eng/common/cross/arm/tizen-fetch.sh b/eng/common/cross/arm/tizen-fetch.sh
new file mode 100755
index 00000000000..eabd06c4afe
--- /dev/null
+++ b/eng/common/cross/arm/tizen-fetch.sh
@@ -0,0 +1,170 @@
+#!/usr/bin/env bash
+set -e
+
+if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then
+	VERBOSE=0
+fi
+
+Log()
+{
+	if [ $VERBOSE -ge $1 ]; then
+		echo ${@:2}
+	fi
+}
+
+Inform()
+{
+	Log 1 -e "\x1B[0;34m$@\x1B[m"
+}
+
+Debug()
+{
+	Log 2 -e "\x1B[0;32m$@\x1B[m"
+}
+
+Error()
+{
+	>&2 Log 0 -e "\x1B[0;31m$@\x1B[m"
+}
+
+Fetch()
+{
+	URL=$1
+	FILE=$2
+	PROGRESS=$3
+	if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then
+		CURL_OPT="--progress-bar"
+	else
+		CURL_OPT="--silent"
+	fi
+	curl $CURL_OPT $URL > $FILE
+}
+
+hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; }
+hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; }
+hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; }
+
+TMPDIR=$1
+if [ ! -d $TMPDIR ]; then
+	TMPDIR=./tizen_tmp
+	Debug "Create temporary directory : $TMPDIR"
+	mkdir -p $TMPDIR 
+fi
+
+TIZEN_URL=http://download.tizen.org/snapshots/tizen
+BUILD_XML=build.xml
+REPOMD_XML=repomd.xml
+PRIMARY_XML=primary.xml
+TARGET_URL="http://__not_initialized"
+
+Xpath_get()
+{
+	XPATH_RESULT=''
+	XPATH=$1
+	XML_FILE=$2
+	RESULT=$(xmllint --xpath $XPATH $XML_FILE)
+	if [[ -z ${RESULT// } ]]; then
+		Error "Can not find target from $XML_FILE"
+		Debug "Xpath = $XPATH"
+		exit 1
+	fi
+	XPATH_RESULT=$RESULT
+}
+
+fetch_tizen_pkgs_init()
+{
+	TARGET=$1
+	PROFILE=$2
+	Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE"
+
+	TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs
+	if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi
+	mkdir -p $TMP_PKG_DIR
+
+	PKG_URL=$TIZEN_URL/$PROFILE/latest
+
+	BUILD_XML_URL=$PKG_URL/$BUILD_XML
+	TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML
+	TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML
+	TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML
+	TMP_PRIMARYGZ=${TMP_PRIMARY}.gz
+
+	Fetch $BUILD_XML_URL $TMP_BUILD
+
+	Debug "fetch $BUILD_XML_URL to $TMP_BUILD"
+
+	TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()"
+	Xpath_get $TARGET_XPATH $TMP_BUILD
+	TARGET_PATH=$XPATH_RESULT
+	TARGET_URL=$PKG_URL/$TARGET_PATH
+
+	REPOMD_URL=$TARGET_URL/repodata/repomd.xml
+	PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
+
+	Fetch $REPOMD_URL $TMP_REPOMD
+
+	Debug "fetch $REPOMD_URL to $TMP_REPOMD"
+
+	Xpath_get $PRIMARY_XPATH $TMP_REPOMD
+	PRIMARY_XML_PATH=$XPATH_RESULT
+	PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH
+
+	Fetch $PRIMARY_URL $TMP_PRIMARYGZ
+
+	Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ"
+
+	gunzip $TMP_PRIMARYGZ 
+
+	Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" 
+}
+
+fetch_tizen_pkgs()
+{
+	ARCH=$1
+	PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
+
+	PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())'
+
+	for pkg in ${@:2}
+	do
+		Inform "Fetching... $pkg"
+		XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg}
+		XPATH=${XPATH/_ARCH_/$ARCH}
+		Xpath_get $XPATH $TMP_PRIMARY
+		PKG_PATH=$XPATH_RESULT
+
+		XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg}
+		XPATH=${XPATH/_ARCH_/$ARCH}
+		Xpath_get $XPATH $TMP_PRIMARY
+		CHECKSUM=$XPATH_RESULT
+
+		PKG_URL=$TARGET_URL/$PKG_PATH
+		PKG_FILE=$(basename $PKG_PATH)
+		PKG_PATH=$TMPDIR/$PKG_FILE
+
+		Debug "Download $PKG_URL to $PKG_PATH"
+		Fetch $PKG_URL $PKG_PATH true
+
+		echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null
+		if [ $? -ne 0 ]; then
+			Error "Fail to fetch $PKG_URL to $PKG_PATH"
+			Debug "Checksum = $CHECKSUM"
+			exit 1
+		fi
+	done
+}
+
+Inform "Initialize arm base"
+fetch_tizen_pkgs_init standard base
+Inform "fetch common packages"
+fetch_tizen_pkgs armv7hl gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
+Inform "fetch coreclr packages"
+fetch_tizen_pkgs armv7hl lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
+Inform "fetch corefx packages"
+fetch_tizen_pkgs armv7hl libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
+
+Inform "Initialize standard unified"
+fetch_tizen_pkgs_init standard unified
+Inform "fetch corefx packages"
+fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release
+
diff --git a/eng/common/cross/arm/tizen/tizen.patch b/eng/common/cross/arm/tizen/tizen.patch
new file mode 100644
index 00000000000..fb12ade7250
--- /dev/null
+++ b/eng/common/cross/arm/tizen/tizen.patch
@@ -0,0 +1,9 @@
+diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
+--- a/usr/lib/libc.so	2016-12-30 23:00:08.284951863 +0900
++++ b/usr/lib/libc.so	2016-12-30 23:00:32.140951815 +0900
+@@ -2,4 +2,4 @@
+    Use the shared library, but some functions are only in
+    the static library, so try that secondarily.  */
+ OUTPUT_FORMAT(elf32-littlearm)
+-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) )
++GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux-armhf.so.3 ) )
diff --git a/eng/common/cross/arm/trusty-lttng-2.4.patch b/eng/common/cross/arm/trusty-lttng-2.4.patch
deleted file mode 100644
index 8e4dd7ae719..00000000000
--- a/eng/common/cross/arm/trusty-lttng-2.4.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From e72c9d7ead60e3317bd6d1fade995c07021c947b Mon Sep 17 00:00:00 2001
-From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Date: Thu, 7 May 2015 13:25:04 -0400
-Subject: [PATCH] Fix: building probe providers with C++ compiler
-
-Robert Daniels wrote:
-> > I'm attempting to use lttng userspace tracing with a C++ application
-> > on an ARM platform. I'm using GCC 4.8.4 on Linux 3.14 with the 2.6
-> > release of lttng. I've compiled lttng-modules, lttng-ust, and
-> > lttng-tools and have been able to get a simple test working with C
-> > code.  When I attempt to run the hello.cxx test on my target it will
-> > segfault.
->
->
-> I spent a little time digging into this issue and finally discovered the
-> cause of my segfault with ARM C++ tracepoints.
->
-> There is a struct called 'lttng_event' in ust-events.h which contains an
-> empty union 'u'.  This was the cause of my issue.  Under C, this empty union
-> compiles to a zero byte member while under C++ it compiles to a one byte
-> member, and in my case was four-byte aligned which caused my C++ code to
-> have the 'cds_list_head node' offset incorrectly by four bytes.  This lead
-> to an incorrect linked list structure which caused my issue.
->
-> Since this union is empty, I simply removed it from the struct and everything
-> worked correctly.
->
-> I don't know the history or purpose behind this empty union so I'd like to
-> know if this is a safe fix.  If it is I can submit a patch with the union
-> removed.
-
-That's a very nice catch!
-
-We do not support building tracepoint probe provider with
-g++ yet, as stated in lttng-ust(3):
-
-"- Note for C++ support: although an application instrumented with
-   tracepoints can be compiled with g++, tracepoint probes should be
-   compiled with gcc (only tested with gcc so far)."
-
-However, if it works fine with this fix, then I'm tempted to take it,
-especially because removing the empty union does not appear to affect
-the layout of struct lttng_event as seen from liblttng-ust, which must
-be compiled with a C compiler,  and from probe providers compiled with
-a C compiler. So all we are changing is the layout of a probe provider
-compiled with a C++ compiler, which is anyway buggy at the moment,
-because it is not compatible with the layout expected by liblttng-ust
-compiled with a C compiler.
-
-Reported-by: Robert Daniels <robert.daniels@vantagecontrols.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
----
- include/lttng/ust-events.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/usr/include/lttng/ust-events.h b/usr/include/lttng/ust-events.h
-index 328a875..3d7a274 100644
---- a/usr/include/lttng/ust-events.h
-+++ b/usr/include/lttng/ust-events.h
-@@ -407,8 +407,6 @@ struct lttng_event {
- 	void *_deprecated1;
- 	struct lttng_ctx *ctx;
- 	enum lttng_ust_instrumentation instrumentation;
--	union {
--	} u;
- 	struct cds_list_head node;		/* Event list in session */
- 	struct cds_list_head _deprecated2;
- 	void *_deprecated3;
--- 
-2.7.4
-
diff --git a/eng/common/cross/arm/trusty.patch b/eng/common/cross/arm/trusty.patch
deleted file mode 100644
index 2f2972f8eb5..00000000000
--- a/eng/common/cross/arm/trusty.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h
---- a/usr/include/urcu/uatomic/generic.h	2014-03-28 06:04:42.000000000 +0900
-+++ b/usr/include/urcu/uatomic/generic.h	2017-02-13 10:35:21.189927116 +0900
-@@ -65,17 +65,17 @@
- 	switch (len) {
- #ifdef UATOMIC_HAS_ATOMIC_BYTE
- 	case 1:
--		return __sync_val_compare_and_swap_1(addr, old, _new);
-+		return __sync_val_compare_and_swap_1((uint8_t *) addr, old, _new);
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- 	case 2:
--		return __sync_val_compare_and_swap_2(addr, old, _new);
-+		return __sync_val_compare_and_swap_2((uint16_t *) addr, old, _new);
- #endif
- 	case 4:
--		return __sync_val_compare_and_swap_4(addr, old, _new);
-+		return __sync_val_compare_and_swap_4((uint32_t *) addr, old, _new);
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
--		return __sync_val_compare_and_swap_8(addr, old, _new);
-+		return __sync_val_compare_and_swap_8((uint64_t *) addr, old, _new);
- #endif
- 	}
- 	_uatomic_link_error();
-@@ -100,20 +100,20 @@
- 	switch (len) {
- #ifdef UATOMIC_HAS_ATOMIC_BYTE
- 	case 1:
--		__sync_and_and_fetch_1(addr, val);
-+		__sync_and_and_fetch_1((uint8_t *) addr, val);
- 		return;
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- 	case 2:
--		__sync_and_and_fetch_2(addr, val);
-+		__sync_and_and_fetch_2((uint16_t *) addr, val);
- 		return;
- #endif
- 	case 4:
--		__sync_and_and_fetch_4(addr, val);
-+		__sync_and_and_fetch_4((uint32_t *) addr, val);
- 		return;
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
--		__sync_and_and_fetch_8(addr, val);
-+		__sync_and_and_fetch_8((uint64_t *) addr, val);
- 		return;
- #endif
- 	}
-@@ -139,20 +139,20 @@
- 	switch (len) {
- #ifdef UATOMIC_HAS_ATOMIC_BYTE
- 	case 1:
--		__sync_or_and_fetch_1(addr, val);
-+		__sync_or_and_fetch_1((uint8_t *) addr, val);
- 		return;
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- 	case 2:
--		__sync_or_and_fetch_2(addr, val);
-+		__sync_or_and_fetch_2((uint16_t *) addr, val);
- 		return;
- #endif
- 	case 4:
--		__sync_or_and_fetch_4(addr, val);
-+		__sync_or_and_fetch_4((uint32_t *) addr, val);
- 		return;
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
--		__sync_or_and_fetch_8(addr, val);
-+		__sync_or_and_fetch_8((uint64_t *) addr, val);
- 		return;
- #endif
- 	}
-@@ -180,17 +180,17 @@
- 	switch (len) {
- #ifdef UATOMIC_HAS_ATOMIC_BYTE
- 	case 1:
--		return __sync_add_and_fetch_1(addr, val);
-+		return __sync_add_and_fetch_1((uint8_t *) addr, val);
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- 	case 2:
--		return __sync_add_and_fetch_2(addr, val);
-+		return __sync_add_and_fetch_2((uint16_t *) addr, val);
- #endif
- 	case 4:
--		return __sync_add_and_fetch_4(addr, val);
-+		return __sync_add_and_fetch_4((uint32_t *) addr, val);
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
--		return __sync_add_and_fetch_8(addr, val);
-+		return __sync_add_and_fetch_8((uint64_t *) addr, val);
- #endif
- 	}
- 	_uatomic_link_error();
diff --git a/eng/common/cross/arm64/sources.list.trusty b/eng/common/cross/arm64/sources.list.trusty
deleted file mode 100644
index 07d8f88d82e..00000000000
--- a/eng/common/cross/arm64/sources.list.trusty
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
\ No newline at end of file
diff --git a/eng/common/cross/arm64/tizen-fetch.sh b/eng/common/cross/arm64/tizen-fetch.sh
index a48a6f51c49..16d1301f21e 100755
--- a/eng/common/cross/arm64/tizen-fetch.sh
+++ b/eng/common/cross/arm64/tizen-fetch.sh
@@ -157,7 +157,7 @@ fetch_tizen_pkgs()
 Inform "Initialize arm base"
 fetch_tizen_pkgs_init standard base
 Inform "fetch common packages"
-fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
+fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
 Inform "fetch coreclr packages"
 fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
 Inform "fetch corefx packages"
diff --git a/eng/common/cross/armv6/sources.list.buster b/eng/common/cross/armv6/sources.list.buster
new file mode 100644
index 00000000000..f27fc4fb346
--- /dev/null
+++ b/eng/common/cross/armv6/sources.list.buster
@@ -0,0 +1,2 @@
+deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
+deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh
index c29c8267e7a..42516bbeebc 100755
--- a/eng/common/cross/build-android-rootfs.sh
+++ b/eng/common/cross/build-android-rootfs.sh
@@ -106,7 +106,6 @@ __AndroidPackages+=" libandroid-glob"
 __AndroidPackages+=" liblzma"
 __AndroidPackages+=" krb5"
 __AndroidPackages+=" openssl"
-__AndroidPackages+=" openldap"
 
 for path in $(wget -qO- http://termux.net/dists/stable/main/binary-$__AndroidArch/Packages |\
     grep -A15 "Package: \(${__AndroidPackages// /\\|}\)" | grep -v "static\|tool" | grep Filename); do
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 81e641a57b5..f97dca77054 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -6,10 +6,10 @@ usage()
 {
     echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
     echo "BuildArch can be: arm(default), armel, arm64, x86"
-    echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
-    echo "                              for FreeBSD can be: freebsd11 or freebsd12."
+    echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
+    echo "                              for FreeBSD can be: freebsd12, freebsd13"
     echo "                              for illumos can be: illumos."
-    echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FReeBSD"
+    echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
     echo "--skipunmount - optional, will skip the unmount of rootfs folder."
     echo "--use-mirror - optional, use mirror URL to fetch resources, when available."
     exit 1
@@ -32,10 +32,9 @@ __UbuntuPackages="build-essential"
 __AlpinePackages="alpine-base"
 __AlpinePackages+=" build-base"
 __AlpinePackages+=" linux-headers"
-__AlpinePackagesEdgeCommunity=" lldb-dev"
-__AlpinePackagesEdgeMain=" llvm10-libs"
-__AlpinePackagesEdgeMain+=" python3"
-__AlpinePackagesEdgeMain+=" libedit"
+__AlpinePackages+=" lldb-dev"
+__AlpinePackages+=" python3"
+__AlpinePackages+=" libedit"
 
 # symlinks fixer
 __UbuntuPackages+=" symlinks"
@@ -55,28 +54,30 @@ __UbuntuPackages+=" libcurl4-openssl-dev"
 __UbuntuPackages+=" libkrb5-dev"
 __UbuntuPackages+=" libssl-dev"
 __UbuntuPackages+=" zlib1g-dev"
-__UbuntuPackages+=" libldap2-dev"
 
 __AlpinePackages+=" curl-dev"
 __AlpinePackages+=" krb5-dev"
 __AlpinePackages+=" openssl-dev"
 __AlpinePackages+=" zlib-dev"
-__AlpinePackages+=" openldap-dev"
 
-__FreeBSDBase="12.1-RELEASE"
-__FreeBSDPkg="1.12.0"
+__FreeBSDBase="12.3-RELEASE"
+__FreeBSDPkg="1.17.0"
+__FreeBSDABI="12"
 __FreeBSDPackages="libunwind"
 __FreeBSDPackages+=" icu"
 __FreeBSDPackages+=" libinotify"
-__FreeBSDPackages+=" lttng-ust"
+__FreeBSDPackages+=" openssl"
 __FreeBSDPackages+=" krb5"
-__FreeBSDPackages+=" libslapi-2.4"
+__FreeBSDPackages+=" terminfo-db"
 
 __IllumosPackages="icu-64.2nb2"
 __IllumosPackages+=" mit-krb5-1.16.2nb4"
 __IllumosPackages+=" openssl-1.1.1e"
 __IllumosPackages+=" zlib-1.2.11"
-__IllumosPackages+=" openldap-client-2.4.49"
+
+# ML.NET dependencies
+__UbuntuPackages+=" libomp5"
+__UbuntuPackages+=" libomp-dev"
 
 __UseMirror=0
 
@@ -98,6 +99,15 @@ while :; do
             __AlpineArch=armv7
             __QEMUArch=arm
             ;;
+        armv6)
+            __BuildArch=armv6
+            __UbuntuArch=armhf
+            __QEMUArch=arm
+            __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/"
+            __CodeName=buster
+            __LLDB_Package="liblldb-6.0-dev"
+            __Keyring="/usr/share/keyrings/raspbian-archive-keyring.gpg"
+            ;;
         arm64)
             __BuildArch=arm64
             __UbuntuArch=arm64
@@ -115,6 +125,8 @@ while :; do
             __UbuntuArch=s390x
             __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
             __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
+            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
+            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
             unset __LLDB_Package
             ;;
         x86)
@@ -143,11 +155,6 @@ while :; do
         no-lldb)
             unset __LLDB_Package
             ;;
-        trusty) # Ubuntu 14.04
-            if [ "$__CodeName" != "jessie" ]; then
-                __CodeName=trusty
-            fi
-            ;;
         xenial) # Ubuntu 16.04
             if [ "$__CodeName" != "jessie" ]; then
                 __CodeName=xenial
@@ -178,8 +185,8 @@ while :; do
             __LLDB_Package="liblldb-6.0-dev"
             ;;
         tizen)
-            if [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
-                echo "Tizen is available only for armel and arm64."
+            if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
+                echo "Tizen is available only for arm, armel and arm64."
                 usage;
                 exit 1;
             fi
@@ -187,29 +194,30 @@ while :; do
             __UbuntuRepo=
             __Tizen=tizen
             ;;
-        alpine|alpine3.9)
+        alpine|alpine3.13)
             __CodeName=alpine
             __UbuntuRepo=
-            __AlpineVersion=3.9
+            __AlpineVersion=3.13
+            __AlpinePackages+=" llvm10-libs"
             ;;
-        alpine3.13)
+        alpine3.14)
             __CodeName=alpine
             __UbuntuRepo=
-            __AlpineVersion=3.13
-            # Alpine 3.13 has all the packages we need in the 3.13 repository
-            __AlpinePackages+=$__AlpinePackagesEdgeCommunity
-            __AlpinePackagesEdgeCommunity=
-            __AlpinePackages+=$__AlpinePackagesEdgeMain
-            __AlpinePackagesEdgeMain=
+            __AlpineVersion=3.14
+            __AlpinePackages+=" llvm11-libs"
             ;;
-        freebsd11)
-            __FreeBSDBase="11.3-RELEASE"
-            ;&
         freebsd12)
             __CodeName=freebsd
             __BuildArch=x64
             __SkipUnmount=1
             ;;
+        freebsd13)
+            __CodeName=freebsd
+            __FreeBSDBase="13.0-RELEASE"
+            __FreeBSDABI="13"
+            __BuildArch=x64
+            __SkipUnmount=1
+            ;;
         illumos)
             __CodeName=illumos
             __BuildArch=x64
@@ -233,6 +241,12 @@ while :; do
     shift
 done
 
+if [ -e "$__Keyring" ]; then
+    __Keyring="--keyring=$__Keyring"
+else
+    __Keyring=""
+fi
+
 if [ "$__BuildArch" == "armel" ]; then
     __LLDB_Package="lldb-3.5-dev"
 fi
@@ -270,26 +284,12 @@ if [[ "$__CodeName" == "alpine" ]]; then
       -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
       add $__AlpinePackages
 
-    if [[ -n "$__AlpinePackagesEdgeMain" ]]; then
-      $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
-        -X http://dl-cdn.alpinelinux.org/alpine/edge/main \
-        -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
-        add $__AlpinePackagesEdgeMain
-    fi
-
-    if [[ -n "$__AlpinePackagesEdgeCommunity" ]]; then
-      $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
-        -X http://dl-cdn.alpinelinux.org/alpine/edge/community \
-        -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
-        add $__AlpinePackagesEdgeCommunity
-    fi
-
     rm -r $__ApkToolsDir
 elif [[ "$__CodeName" == "freebsd" ]]; then
     mkdir -p $__RootfsDir/usr/local/etc
+    JOBS="$(getconf _NPROCESSORS_ONLN)"
     wget -O - https://download.freebsd.org/ftp/releases/amd64/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
-    # For now, ask for 11 ABI even on 12. This can be revisited later.
-    echo "ABI = \"FreeBSD:11:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf
+    echo "ABI = \"FreeBSD:${__FreeBSDABI}:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf
     echo "FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > ${__RootfsDir}/etc/pkg/FreeBSD.conf
     mkdir -p $__RootfsDir/tmp
     # get and build package manager
@@ -297,7 +297,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
     cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
     # needed for install to succeed
     mkdir -p $__RootfsDir/host/etc
-    ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make && make install
+    ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make -j "$JOBS" && make install
     rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
     # install packages we need.
     INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update
@@ -348,7 +348,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
     wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
     wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
 elif [[ -n $__CodeName ]]; then
-    qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
+    qemu-debootstrap $__Keyring --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
     cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list
     chroot $__RootfsDir apt-get update
     chroot $__RootfsDir apt-get -f -y install
@@ -360,13 +360,6 @@ elif [[ -n $__CodeName ]]; then
         umount $__RootfsDir/* || true
     fi
 
-    if [[ "$__BuildArch" == "arm" && "$__CodeName" == "trusty" ]]; then
-        pushd $__RootfsDir
-        patch -p1 < $__CrossDir/$__BuildArch/trusty.patch
-        patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch
-        popd
-    fi
-
     if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
         pushd $__RootfsDir
         patch -p1 < $__CrossDir/$__BuildArch/armel.jessie.patch
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index fc11001aa76..fba2afda438 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -3,18 +3,26 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
 set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
 if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
   set(CMAKE_SYSTEM_NAME FreeBSD)
+  set(FREEBSD 1)
 elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
   set(CMAKE_SYSTEM_NAME SunOS)
   set(ILLUMOS 1)
 else()
   set(CMAKE_SYSTEM_NAME Linux)
+  set(LINUX 1)
 endif()
 set(CMAKE_SYSTEM_VERSION 1)
 
+if(EXISTS ${CROSS_ROOTFS}/etc/tizen-release)
+  set(TIZEN 1)
+elseif(EXISTS ${CROSS_ROOTFS}/android_platform)
+  set(ANDROID 1)
+endif()
+
 if(TARGET_ARCH_NAME STREQUAL "armel")
   set(CMAKE_SYSTEM_PROCESSOR armv7l)
   set(TOOLCHAIN "arm-linux-gnueabi")
-  if("$ENV{__DistroRid}" MATCHES "tizen.*")
+  if(TIZEN)
     set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm")
@@ -26,6 +34,16 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
   else()
     set(TOOLCHAIN "arm-linux-gnueabihf")
   endif()
+  if(TIZEN)
+    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
+  endif()
+elseif(TARGET_ARCH_NAME STREQUAL "armv6")
+  set(CMAKE_SYSTEM_PROCESSOR armv6l)
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
+    set(TOOLCHAIN "armv6-alpine-linux-musleabihf")
+  else()
+    set(TOOLCHAIN "arm-linux-gnueabihf")
+  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   set(CMAKE_SYSTEM_PROCESSOR aarch64)
   if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl)
@@ -33,7 +51,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   else()
     set(TOOLCHAIN "aarch64-linux-gnu")
   endif()
-  if("$ENV{__DistroRid}" MATCHES "tizen.*")
+  if(TIZEN)
     set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
@@ -42,14 +60,14 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
   set(CMAKE_SYSTEM_PROCESSOR i686)
   set(TOOLCHAIN "i686-linux-gnu")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+elseif (FREEBSD)
   set(CMAKE_SYSTEM_PROCESSOR "x86_64")
-  set(triple "x86_64-unknown-freebsd11")
+  set(triple "x86_64-unknown-freebsd12")
 elseif (ILLUMOS)
   set(CMAKE_SYSTEM_PROCESSOR "x86_64")
   set(TOOLCHAIN "x86_64-illumos")
 else()
-  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64, s390x and x86 are supported!")
+  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, s390x and x86 are supported!")
 endif()
 
 if(DEFINED ENV{TOOLCHAIN})
@@ -57,7 +75,11 @@ if(DEFINED ENV{TOOLCHAIN})
 endif()
 
 # Specify include paths
-if(DEFINED TIZEN_TOOLCHAIN)
+if(TIZEN)
+  if(TARGET_ARCH_NAME STREQUAL "arm")
+    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
+    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
+  endif()
   if(TARGET_ARCH_NAME STREQUAL "armel")
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
@@ -68,7 +90,7 @@ if(DEFINED TIZEN_TOOLCHAIN)
   endif()
 endif()
 
-if("$ENV{__DistroRid}" MATCHES "android.*")
+if(ANDROID)
     if(TARGET_ARCH_NAME STREQUAL "arm")
         set(ANDROID_ABI armeabi-v7a)
     elseif(TARGET_ARCH_NAME STREQUAL "arm64")
@@ -76,7 +98,9 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
     endif()
 
     # extract platform number required by the NDK's toolchain
-    string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "$ENV{__DistroRid}")
+    file(READ "${CROSS_ROOTFS}/android_platform" RID_FILE_CONTENTS)
+    string(REPLACE "RID=" "" ANDROID_RID "${RID_FILE_CONTENTS}")
+    string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "${ANDROID_RID}")
 
     set(ANDROID_TOOLCHAIN clang)
     set(FEATURE_EVENT_TRACE 0) # disable event trace as there is no lttng-ust package in termux repository
@@ -85,12 +109,15 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
 
     # include official NDK toolchain script
     include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+elseif(FREEBSD)
     # we cross-compile by instructing clang
     set(CMAKE_C_COMPILER_TARGET ${triple})
     set(CMAKE_CXX_COMPILER_TARGET ${triple})
     set(CMAKE_ASM_COMPILER_TARGET ${triple})
     set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld")
 elseif(ILLUMOS)
     set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
 
@@ -138,24 +165,24 @@ function(add_toolchain_linker_flag Flag)
   if (NOT Config STREQUAL "")
     set(CONFIG_SUFFIX "_${Config}")
   endif()
-  set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
-  set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
+  set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
+  set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
 endfunction()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(LINUX)
   add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
   add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
 endif()
 
-if(TARGET_ARCH_NAME STREQUAL "armel")
-  if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
+if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
+  if(TIZEN)
     add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
-  if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
+  if(TIZEN)
     add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
@@ -174,7 +201,7 @@ endif()
 
 # Specify compile options
 
-if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS)
+if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS)
   set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
@@ -201,8 +228,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
   add_compile_options(-Wno-error=unused-command-line-argument)
 endif()
 
-if(DEFINED TIZEN_TOOLCHAIN)
-  if(TARGET_ARCH_NAME MATCHES "^(armel|arm64)$")
+if(TIZEN)
+  if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
     add_compile_options(-Wno-deprecated-declarations) # compile-time option
     add_compile_options(-D__extern_always_inline=inline) # compile-time option
   endif()
diff --git a/eng/common/cross/x86/sources.list.trusty b/eng/common/cross/x86/sources.list.trusty
deleted file mode 100644
index 9b3085436e9..00000000000
--- a/eng/common/cross/x86/sources.list.trusty
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe
-deb-src http://archive.ubuntu.com/ubuntu/ trusty main restricted universe
-
-deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe
-deb-src http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe
-
-deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted
-
-deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
index 39abdbecdcf..84c1d0cc2e7 100755
--- a/eng/common/darc-init.sh
+++ b/eng/common/darc-init.sh
@@ -53,7 +53,7 @@ fi
 function InstallDarcCli {
   local darc_cli_package_name="microsoft.dotnet.darc"
 
-  InitializeDotNetCli
+  InitializeDotNetCli true
   local dotnet_root=$_InitializeDotNetCli
 
   if [ -z "$toolpath" ]; then
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
index d6efeb44340..5c94e98632a 100755
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
@@ -55,6 +55,9 @@ case $cpuname in
   aarch64)
     buildarch=arm64
     ;;
+  loongarch64)
+    buildarch=loongarch64
+    ;;
   amd64|x86_64)
     buildarch=x64
     ;;
@@ -70,7 +73,7 @@ case $cpuname in
     ;;
 esac
 
-dotnetRoot="$repo_root/.dotnet"
+dotnetRoot="${repo_root}.dotnet"
 if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
   dotnetRoot="$dotnetRoot/$architecture"
 fi
diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1
deleted file mode 100644
index 0728b1a8b57..00000000000
--- a/eng/common/generate-graph-files.ps1
+++ /dev/null
@@ -1,86 +0,0 @@
-Param(
-  [Parameter(Mandatory=$true)][string] $barToken,       # Token generated at https://maestro-prod.westus2.cloudapp.azure.com/Account/Tokens
-  [Parameter(Mandatory=$true)][string] $gitHubPat,      # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed)
-  [Parameter(Mandatory=$true)][string] $azdoPat,        # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed)
-  [Parameter(Mandatory=$true)][string] $outputFolder,   # Where the graphviz.txt file will be created
-  [string] $darcVersion,                                # darc's version
-  [string] $graphvizVersion = '2.38',                   # GraphViz version
-  [switch] $includeToolset                              # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about
-                                                        # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies
-)
-
-function CheckExitCode ([string]$stage)
-{
-  $exitCode = $LASTEXITCODE
-  if ($exitCode  -ne 0) {
-    Write-PipelineTelemetryError -Category 'Arcade' -Message "Something failed in stage: '$stage'. Check for errors above. Exiting now..."
-    ExitWithExitCode $exitCode
-  }
-}
-
-try {
-  $ErrorActionPreference = 'Stop'
-  . $PSScriptRoot\tools.ps1
-  
-  Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
-
-  Push-Location $PSScriptRoot
-
-  Write-Host 'Installing darc...'
-  . .\darc-init.ps1 -darcVersion $darcVersion
-  CheckExitCode 'Running darc-init'
-
-  $engCommonBaseDir = Join-Path $PSScriptRoot 'native\'
-  $graphvizInstallDir = CommonLibrary\Get-NativeInstallDirectory
-  $nativeToolBaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external'
-  $installBin = Join-Path $graphvizInstallDir 'bin'
-
-  Write-Host 'Installing dot...'
-  .\native\install-tool.ps1 -ToolName graphviz -InstallPath $installBin -BaseUri $nativeToolBaseUri -CommonLibraryDirectory $engCommonBaseDir -Version $graphvizVersion -Verbose
-
-  $darcExe = "$env:USERPROFILE\.dotnet\tools"
-  $darcExe = Resolve-Path "$darcExe\darc.exe"
-
-  Create-Directory $outputFolder
-
-  # Generate 3 graph descriptions:
-  # 1. Flat with coherency information
-  # 2. Graphviz (dot) file
-  # 3. Standard dependency graph
-  $graphVizFilePath = "$outputFolder\graphviz.txt"
-  $graphVizImageFilePath = "$outputFolder\graph.png"
-  $normalGraphFilePath = "$outputFolder\graph-full.txt"
-  $flatGraphFilePath = "$outputFolder\graph-flat.txt"
-  $baseOptions = @( '--github-pat', "$gitHubPat", '--azdev-pat', "$azdoPat", '--password', "$barToken" )
-
-  if ($includeToolset) {
-    Write-Host 'Toolsets will be included in the graph...'
-    $baseOptions += @( '--include-toolset' )
-  }
-
-  Write-Host 'Generating standard dependency graph...'
-  & "$darcExe" get-dependency-graph @baseOptions --output-file $normalGraphFilePath
-  CheckExitCode 'Generating normal dependency graph'
-
-  Write-Host 'Generating flat dependency graph and graphviz file...'
-  & "$darcExe" get-dependency-graph @baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath
-  CheckExitCode 'Generating flat and graphviz dependency graph'
-
-  Write-Host "Generating graph image $graphVizFilePath"
-  $dotFilePath = Join-Path $installBin "graphviz\$graphvizVersion\release\bin\dot.exe"
-  & "$dotFilePath" -Tpng -o"$graphVizImageFilePath" "$graphVizFilePath"
-  CheckExitCode 'Generating graphviz image'
-
-  Write-Host "'$graphVizFilePath', '$flatGraphFilePath', '$normalGraphFilePath' and '$graphVizImageFilePath' created!"
-}
-catch {
-  if (!$includeToolset) {
-    Write-Host 'This might be a toolset repo which includes only toolset dependencies. ' -NoNewline -ForegroundColor Yellow
-    Write-Host 'Since -includeToolset is not set there is no graph to create. Include -includeToolset and try again...' -ForegroundColor Yellow
-  }
-  Write-Host $_.ScriptStackTrace
-  Write-PipelineTelemetryError -Category 'Arcade' -Message $_
-  ExitWithExitCode 1
-} finally {
-  Pop-Location
-}
\ No newline at end of file
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index 7225ddc6669..25e97ac0077 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -14,7 +14,7 @@ $ErrorActionPreference = "Stop"
 
 Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
 
-$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json"
+$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json"
 $exclusions = @{ Exclusions = @() }
 if (Test-Path -Path $exclusionsFilePath)
 {
@@ -25,8 +25,15 @@ Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to
 
 # Template files
 $jsonFiles = @()
-$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern
-$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
+$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern
+$jsonTemplateFiles | ForEach-Object {
+    $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json
+    
+    $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json"
+    $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
+}
+
+$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
 
 $xlfFiles = @()
 
@@ -44,7 +51,7 @@ $langXlfFiles | ForEach-Object {
     $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
 
-$locFiles = $jsonFiles + $xlfFiles
+$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles
 
 $locJson = @{
     Projects = @(
@@ -66,10 +73,19 @@ $locJson = @{
                     }
                     if ($continue)
                     {
-                        return @{
-                            SourceFile = $sourceFile
-                            CopyOption = "LangIDOnName"
-                            OutputPath = $outputPath
+                        if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') {
+                            return @{
+                                SourceFile = $sourceFile
+                                CopyOption = "LangIDOnPath"
+                                OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
+                            }
+                        }
+                        else {
+                            return @{
+                                SourceFile = $sourceFile
+                                CopyOption = "LangIDOnName"
+                                OutputPath = $outputPath
+                            }
                         }
                     }
                 }
@@ -83,14 +99,14 @@ Write-Host "LocProject.json generated:`n`n$json`n`n"
 Pop-Location
 
 if (!$UseCheckedInLocProjectJson) {
-    New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
-    Set-Content "$SourcesDirectory\Localize\LocProject.json" $json
+    New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
+    Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json
 }
 else {
-    New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
-    Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
+    New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
+    Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json
 
-    if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
+    if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) {
         Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
         
         exit 1
diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh
index 5bd205b5da3..3e6a8d6acf2 100755
--- a/eng/common/init-tools-native.sh
+++ b/eng/common/init-tools-native.sh
@@ -10,7 +10,7 @@ force=false
 download_retries=5
 retry_wait_time_seconds=30
 global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json"
-declare -A native_assets
+declare -a native_assets
 
 . $scriptroot/pipeline-logging-functions.sh
 . $scriptroot/native/common-library.sh
diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1
index 418c09930cf..92b77347d99 100644
--- a/eng/common/internal-feed-operations.ps1
+++ b/eng/common/internal-feed-operations.ps1
@@ -45,11 +45,11 @@ function SetupCredProvider {
   # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable 
   # feeds successfully
 
-  $nugetConfigPath = "$RepoRoot\NuGet.config"
+  $nugetConfigPath = Join-Path $RepoRoot "NuGet.config"
 
   if (-Not (Test-Path -Path $nugetConfigPath)) {
     Write-PipelineTelemetryError -Category 'Build' -Message 'NuGet.config file not found in repo root!'
-    ExitWithExitCode 1  
+    ExitWithExitCode 1
   }
   
   $endpoints = New-Object System.Collections.ArrayList
@@ -85,7 +85,7 @@ function SetupCredProvider {
 
 #Workaround for https://github.com/microsoft/msbuild/issues/4430
 function InstallDotNetSdkAndRestoreArcade {
-  $dotnetTempDir = "$RepoRoot\dotnet"
+  $dotnetTempDir = Join-Path $RepoRoot "dotnet"
   $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*)
   $dotnet = "$dotnetTempDir\dotnet.exe"
   $restoreProjPath = "$PSScriptRoot\restore.proj"
diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh
index e2233e78122..9378223ba09 100755
--- a/eng/common/internal-feed-operations.sh
+++ b/eng/common/internal-feed-operations.sh
@@ -39,7 +39,7 @@ function SetupCredProvider {
   # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable 
   # feeds successfully
 
-  local nugetConfigPath="$repo_root/NuGet.config"
+  local nugetConfigPath="{$repo_root}NuGet.config"
 
   if [ ! "$nugetConfigPath" ]; then
     Write-PipelineTelemetryError -category 'Build' "NuGet.config file not found in repo's root!"
diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config
new file mode 100644
index 00000000000..19d3d311b16
--- /dev/null
+++ b/eng/common/internal/NuGet.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj
index f46d5efe2e3..beb9c4648ea 100644
--- a/eng/common/internal/Tools.csproj
+++ b/eng/common/internal/Tools.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1
index c6401230002..f041e5ddd95 100644
--- a/eng/common/msbuild.ps1
+++ b/eng/common/msbuild.ps1
@@ -5,6 +5,8 @@ Param(
   [bool] $nodeReuse = $true,
   [switch] $ci,
   [switch] $prepareMachine,
+  [switch] $excludePrereleaseVS,
+  [string] $msbuildEngine = $null,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs
 )
 
diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1
index adf707c8fe7..ca38268c44d 100644
--- a/eng/common/native/CommonLibrary.psm1
+++ b/eng/common/native/CommonLibrary.psm1
@@ -276,7 +276,8 @@ function Get-MachineArchitecture {
   }
   if (($ProcessorArchitecture -Eq "AMD64") -Or
       ($ProcessorArchitecture -Eq "IA64") -Or
-      ($ProcessorArchitecture -Eq "ARM64")) {
+      ($ProcessorArchitecture -Eq "ARM64") -Or
+      ($ProcessorArchitecture -Eq "LOONGARCH64")) {
     return "x64"
   }
   return "x86"
diff --git a/eng/common/native/common-library.sh b/eng/common/native/common-library.sh
index bf272dcf55a..080c2c283ae 100755
--- a/eng/common/native/common-library.sh
+++ b/eng/common/native/common-library.sh
@@ -148,8 +148,12 @@ function NewScriptShim {
   fi
   
   if [[ ! -f $tool_file_path ]]; then
-    Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist"
-    return 1
+    # try to see if the path is lower cased
+    tool_file_path="$(echo $tool_file_path | tr "[:upper:]" "[:lower:]")" 
+    if [[ ! -f $tool_file_path ]]; then
+      Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist"
+      return 1
+    fi
   fi
 
   local shim_contents=$'#!/usr/bin/env bash\n'
diff --git a/eng/common/native/find-native-compiler.sh b/eng/common/native/find-native-compiler.sh
deleted file mode 100644
index aed19d07d50..00000000000
--- a/eng/common/native/find-native-compiler.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file locates the native compiler with the given name and version and sets the environment variables to locate it.
-#
-
-source="${BASH_SOURCE[0]}"
-
-# resolve $SOURCE until the file is no longer a symlink
-while [[ -h $source ]]; do
-  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-  source="$(readlink "$source")"
-
-  # if $source was a relative symlink, we need to resolve it relative to the path where the
-  # symlink file was located
-  [[ $source != /* ]] && source="$scriptroot/$source"
-done
-scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-
-if [ $# -lt 0 ]
-then
-  echo "Usage..."
-  echo "find-native-compiler.sh <compiler> <compiler major version> <compiler minor version>"
-  echo "Specify the name of compiler (clang or gcc)."
-  echo "Specify the major version of compiler."
-  echo "Specify the minor version of compiler."
-  exit 1
-fi
-
-. $scriptroot/../pipeline-logging-functions.sh
-
-compiler="$1"
-cxxCompiler="$compiler++"
-majorVersion="$2"
-minorVersion="$3"
-
-if [ "$compiler" = "gcc" ]; then cxxCompiler="g++"; fi
-
-check_version_exists() {
-    desired_version=-1
-
-    # Set up the environment to be used for building with the desired compiler.
-    if command -v "$compiler-$1.$2" > /dev/null; then
-        desired_version="-$1.$2"
-    elif command -v "$compiler$1$2" > /dev/null; then
-        desired_version="$1$2"
-    elif command -v "$compiler-$1$2" > /dev/null; then
-        desired_version="-$1$2"
-    fi
-
-    echo "$desired_version"
-}
-
-if [ -z "$CLR_CC" ]; then
-
-    # Set default versions
-    if [ -z "$majorVersion" ]; then
-        # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
-        if [ "$compiler" = "clang" ]; then versions=( 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
-        elif [ "$compiler" = "gcc" ]; then versions=( 9 8 7 6 5 4.9 ); fi
-
-        for version in "${versions[@]}"; do
-            parts=(${version//./ })
-            desired_version="$(check_version_exists "${parts[0]}" "${parts[1]}")"
-            if [ "$desired_version" != "-1" ]; then majorVersion="${parts[0]}"; break; fi
-        done
-
-        if [ -z "$majorVersion" ]; then
-            if command -v "$compiler" > /dev/null; then
-                if [ "$(uname)" != "Darwin" ]; then
-                    Write-PipelineTelemetryError -category "Build" -type "warning" "Specific version of $compiler not found, falling back to use the one in PATH."
-                fi
-                export CC="$(command -v "$compiler")"
-                export CXX="$(command -v "$cxxCompiler")"
-            else
-                Write-PipelineTelemetryError -category "Build" "No usable version of $compiler found."
-                exit 1
-            fi
-        else
-            if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
-                if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
-                    if command -v "$compiler" > /dev/null; then
-                        Write-PipelineTelemetryError -category "Build" -type "warning" "Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
-                        export CC="$(command -v "$compiler")"
-                        export CXX="$(command -v "$cxxCompiler")"
-                    else
-                        Write-PipelineTelemetryError -category "Build" "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
-                        exit 1
-                    fi
-                fi
-            fi
-        fi
-    else
-        desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
-        if [ "$desired_version" = "-1" ]; then
-            Write-PipelineTelemetryError -category "Build" "Could not find specific version of $compiler: $majorVersion $minorVersion."
-            exit 1
-        fi
-    fi
-
-    if [ -z "$CC" ]; then
-        export CC="$(command -v "$compiler$desired_version")"
-        export CXX="$(command -v "$cxxCompiler$desired_version")"
-        if [ -z "$CXX" ]; then export CXX="$(command -v "$cxxCompiler")"; fi
-    fi
-else
-    if [ ! -f "$CLR_CC" ]; then
-        Write-PipelineTelemetryError -category "Build" "CLR_CC is set but path '$CLR_CC' does not exist"
-        exit 1
-    fi
-    export CC="$CLR_CC"
-    export CXX="$CLR_CXX"
-fi
-
-if [ -z "$CC" ]; then
-   Write-PipelineTelemetryError -category "Build" "Unable to find $compiler."
-    exit 1
-fi
-
-export CCC_CC="$CC"
-export CCC_CXX="$CXX"
-export SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
new file mode 100755
index 00000000000..6d7ba15e5f2
--- /dev/null
+++ b/eng/common/native/init-compiler.sh
@@ -0,0 +1,144 @@
+#!/usr/bin/env bash
+#
+# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
+#
+# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
+
+if [[ "$#" -lt 3 ]]; then
+  echo "Usage..."
+  echo "init-compiler.sh <script directory> <Architecture> <compiler>"
+  echo "Specify the script directory."
+  echo "Specify the target architecture."
+  echo "Specify the name of compiler (clang or gcc)."
+  exit 1
+fi
+
+nativescriptroot="$1"
+build_arch="$2"
+compiler="$3"
+
+case "$compiler" in
+    clang*|-clang*|--clang*)
+        # clangx.y or clang-x.y
+        version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
+        parts=(${version//./ })
+        majorVersion="${parts[0]}"
+        minorVersion="${parts[1]}"
+        if [[ -z "$minorVersion" && "$majorVersion" -le 6 ]]; then
+            minorVersion=0;
+        fi
+        compiler=clang
+        ;;
+
+    gcc*|-gcc*|--gcc*)
+        # gccx.y or gcc-x.y
+        version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
+        parts=(${version//./ })
+        majorVersion="${parts[0]}"
+        minorVersion="${parts[1]}"
+        compiler=gcc
+        ;;
+esac
+
+cxxCompiler="$compiler++"
+
+. "$nativescriptroot"/../pipeline-logging-functions.sh
+
+# clear the existing CC and CXX from environment
+CC=
+CXX=
+LDFLAGS=
+
+if [[ "$compiler" == "gcc" ]]; then cxxCompiler="g++"; fi
+
+check_version_exists() {
+    desired_version=-1
+
+    # Set up the environment to be used for building with the desired compiler.
+    if command -v "$compiler-$1.$2" > /dev/null; then
+        desired_version="-$1.$2"
+    elif command -v "$compiler$1$2" > /dev/null; then
+        desired_version="$1$2"
+    elif command -v "$compiler-$1$2" > /dev/null; then
+        desired_version="-$1$2"
+    fi
+
+    echo "$desired_version"
+}
+
+if [[ -z "$CLR_CC" ]]; then
+
+    # Set default versions
+    if [[ -z "$majorVersion" ]]; then
+        # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
+        if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
+        elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
+
+        for version in "${versions[@]}"; do
+            parts=(${version//./ })
+            desired_version="$(check_version_exists "${parts[0]}" "${parts[1]}")"
+            if [[ "$desired_version" != "-1" ]]; then majorVersion="${parts[0]}"; break; fi
+        done
+
+        if [[ -z "$majorVersion" ]]; then
+            if command -v "$compiler" > /dev/null; then
+                if [[ "$(uname)" != "Darwin" ]]; then
+                    Write-PipelineTelemetryError -category "Build" -type "warning" "Specific version of $compiler not found, falling back to use the one in PATH."
+                fi
+                CC="$(command -v "$compiler")"
+                CXX="$(command -v "$cxxCompiler")"
+            else
+                Write-PipelineTelemetryError -category "Build" "No usable version of $compiler found."
+                exit 1
+            fi
+        else
+            if [[ "$compiler" == "clang" && "$majorVersion" -lt 5 ]]; then
+                if [[ "$build_arch" == "arm" || "$build_arch" == "armel" ]]; then
+                    if command -v "$compiler" > /dev/null; then
+                        Write-PipelineTelemetryError -category "Build" -type "warning" "Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
+                        CC="$(command -v "$compiler")"
+                        CXX="$(command -v "$cxxCompiler")"
+                    else
+                        Write-PipelineTelemetryError -category "Build" "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
+                        exit 1
+                    fi
+                fi
+            fi
+        fi
+    else
+        desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
+        if [[ "$desired_version" == "-1" ]]; then
+            Write-PipelineTelemetryError -category "Build" "Could not find specific version of $compiler: $majorVersion $minorVersion."
+            exit 1
+        fi
+    fi
+
+    if [[ -z "$CC" ]]; then
+        CC="$(command -v "$compiler$desired_version")"
+        CXX="$(command -v "$cxxCompiler$desired_version")"
+        if [[ -z "$CXX" ]]; then CXX="$(command -v "$cxxCompiler")"; fi
+    fi
+else
+    if [[ ! -f "$CLR_CC" ]]; then
+        Write-PipelineTelemetryError -category "Build" "CLR_CC is set but path '$CLR_CC' does not exist"
+        exit 1
+    fi
+    CC="$CLR_CC"
+    CXX="$CLR_CXX"
+fi
+
+if [[ -z "$CC" ]]; then
+    Write-PipelineTelemetryError -category "Build" "Unable to find $compiler."
+    exit 1
+fi
+
+# Only lld version >= 9 can be considered stable
+if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
+    if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
+        LDFLAGS="-fuse-ld=lld"
+    fi
+fi
+
+SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
+
+export CC CXX LDFLAGS SCAN_BUILD_COMMAND
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 2427ca6b6ae..8508397d776 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -5,13 +5,8 @@ param(
   [Parameter(Mandatory=$true)][string] $MaestroToken,
   [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
   [Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
-  [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
-  [Parameter(Mandatory=$false)][string] $EnableSigningValidation,
-  [Parameter(Mandatory=$false)][string] $EnableNugetValidation,
-  [Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
   [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
+  [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
 )
 
 try {
@@ -35,27 +30,6 @@ try {
     $optionalParams.Add("--no-wait") | Out-Null
   }
 
-  if ("false" -ne $PublishInstallersAndChecksums) {
-    $optionalParams.Add("--publish-installers-and-checksums") | Out-Null
-  }
-
-  if ("true" -eq $EnableNugetValidation) {
-    $optionalParams.Add("--validate-nuget") | Out-Null
-  }
-
-  if ("true" -eq $EnableSourceLinkValidation) {
-    $optionalParams.Add("--validate-sourcelinkchecksums") | Out-Null
-  }
-
-  if ("true" -eq $EnableSigningValidation) {
-    $optionalParams.Add("--validate-signingchecksums") | Out-Null
-
-    if ("" -ne $SigningValidationAdditionalParameters) {
-      $optionalParams.Add("--signing-validation-parameters") | Out-Null
-      $optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null
-    }
-  }
-
   & $darc add-build-to-channel `
   --id $buildId `
   --publishing-infra-version $PublishingInfraVersion `
diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1
index 1c46f7b6341..4011d324e73 100644
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@@ -14,11 +14,19 @@ param(
 $global:RepoFiles = @{}
 
 # Maximum number of jobs to run in parallel
-$MaxParallelJobs = 6
+$MaxParallelJobs = 16
+
+$MaxRetries = 5
+$RetryWaitTimeInSeconds = 30
 
 # Wait time between check for system load
 $SecondsBetweenLoadChecks = 10
 
+if (!$InputPath -or !(Test-Path $InputPath)){
+  Write-Host "No files to validate."
+  ExitWithExitCode 0
+}
+
 $ValidatePackage = {
   param( 
     [string] $PackagePath                                 # Full path to a Symbols.NuGet package
@@ -29,7 +37,10 @@ $ValidatePackage = {
   # Ensure input file exist
   if (!(Test-Path $PackagePath)) {
     Write-Host "Input file does not exist: $PackagePath"
-    return 1
+    return [pscustomobject]@{
+      result = 1
+      packagePath = $PackagePath
+    }
   }
 
   # Extensions for which we'll look for SourceLink information
@@ -59,7 +70,10 @@ $ValidatePackage = {
 
           # We ignore resource DLLs
           if ($FileName.EndsWith('.resources.dll')) {
-            return
+            return [pscustomobject]@{
+              result = 0
+              packagePath = $PackagePath
+            }
           }
 
           [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true)
@@ -91,36 +105,59 @@ $ValidatePackage = {
                     $Status = 200
                     $Cache = $using:RepoFiles
 
-                    if ( !($Cache.ContainsKey($FilePath)) ) {
-                      try {
-                        $Uri = $Link -as [System.URI]
-                      
-                        # Only GitHub links are valid
-                        if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
-                          $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
+                    $attempts = 0
+
+                    while ($attempts -lt $using:MaxRetries) {
+                      if ( !($Cache.ContainsKey($FilePath)) ) {
+                        try {
+                          $Uri = $Link -as [System.URI]
+                        
+                          if ($Link -match "submodules") {
+                            # Skip submodule links until sourcelink properly handles submodules
+                            $Status = 200
+                          }
+                          elseif ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
+                            # Only GitHub links are valid
+                            $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
+                          }
+                          else {
+                            # If it's not a github link, we want to break out of the loop and not retry.
+                            $Status = 0
+                            $attempts = $using:MaxRetries
+                          }
                         }
-                        else {
+                        catch {
+                          Write-Host $_
                           $Status = 0
                         }
                       }
-                      catch {
-                        write-host $_
-                        $Status = 0
-                      }
-                    }
 
-                    if ($Status -ne 200) {
-                      if ($NumFailedLinks -eq 0) {
-                        if ($FailedFiles.Value -eq 0) {
-                          Write-Host
+                      if ($Status -ne 200) {
+                        $attempts++
+                        
+                        if  ($attempts -lt $using:MaxRetries)
+                        {
+                          $attemptsLeft = $using:MaxRetries - $attempts
+                          Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds"
+                          Start-Sleep -Seconds $using:RetryWaitTimeInSeconds
+                        }
+                        else {
+                          if ($NumFailedLinks -eq 0) {
+                            if ($FailedFiles.Value -eq 0) {
+                              Write-Host
+                            }
+  
+                            Write-Host "`tFile $RealPath has broken links:"
+                          }
+  
+                          Write-Host "`t`tFailed to retrieve $Link"
+  
+                          $NumFailedLinks++
                         }
-
-                        Write-Host "`tFile $RealPath has broken links:"
                       }
-
-                      Write-Host "`t`tFailed to retrieve $Link"
-
-                      $NumFailedLinks++
+                      else {
+                        break
+                      }
                     }
                   }
               }
@@ -136,7 +173,7 @@ $ValidatePackage = {
         }
   }
   catch {
-  
+    Write-Host $_
   }
   finally {
     $zip.Dispose() 
@@ -220,6 +257,7 @@ function ValidateSourceLinkLinks {
   # Process each NuGet package in parallel
   Get-ChildItem "$InputPath\*.symbols.nupkg" |
     ForEach-Object {
+      Write-Host "Starting $($_.FullName)"
       Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null
       $NumJobs = @(Get-Job -State 'Running').Count
       
@@ -267,6 +305,10 @@ function InstallSourcelinkCli {
 try {
   InstallSourcelinkCli
 
+  foreach ($Job in @(Get-Job)) {
+    Remove-Job -Id $Job.Id
+  }
+
   ValidateSourceLinkLinks 
 }
 catch {
diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1
index 99bf28cd5c1..cd2181bafa0 100644
--- a/eng/common/post-build/symbols-validation.ps1
+++ b/eng/common/post-build/symbols-validation.ps1
@@ -1,13 +1,16 @@
 param(
-  [Parameter(Mandatory=$true)][string] $InputPath,              # Full path to directory where NuGet packages to be checked are stored
-  [Parameter(Mandatory=$true)][string] $ExtractPath,            # Full path to directory where the packages will be extracted during validation
-  [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion,    # Version of dotnet symbol to use
-  [Parameter(Mandatory=$false)][switch] $ContinueOnError,       # If we should keep checking symbols after an error
-  [Parameter(Mandatory=$false)][switch] $Clean                  # Clean extracted symbols directory after checking symbols
+  [Parameter(Mandatory = $true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored
+  [Parameter(Mandatory = $true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation
+  [Parameter(Mandatory = $true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use
+  [Parameter(Mandatory = $false)][switch] $CheckForWindowsPdbs, # If we should check for the existence of windows pdbs in addition to portable PDBs
+  [Parameter(Mandatory = $false)][switch] $ContinueOnError, # If we should keep checking symbols after an error
+  [Parameter(Mandatory = $false)][switch] $Clean,           # Clean extracted symbols directory after checking symbols
+  [Parameter(Mandatory = $false)][string] $SymbolExclusionFile  # Exclude the symbols in the file from publishing to symbol server
 )
 
+. $PSScriptRoot\..\tools.ps1
 # Maximum number of jobs to run in parallel
-$MaxParallelJobs = 6
+$MaxParallelJobs = 16
 
 # Max number of retries
 $MaxRetry = 5
@@ -19,13 +22,33 @@ $SecondsBetweenLoadChecks = 10
 Set-Variable -Name "ERROR_BADEXTRACT" -Option Constant -Value -1
 Set-Variable -Name "ERROR_FILEDOESNOTEXIST" -Option Constant -Value -2
 
+$WindowsPdbVerificationParam = ""
+if ($CheckForWindowsPdbs) {
+  $WindowsPdbVerificationParam = "--windows-pdbs"
+}
+
+$ExclusionSet = New-Object System.Collections.Generic.HashSet[string];
+
+if (!$InputPath -or !(Test-Path $InputPath)){
+  Write-Host "No symbols to validate."
+  ExitWithExitCode 0
+}
+
+#Check if the path exists
+if ($SymbolExclusionFile -and (Test-Path $SymbolExclusionFile)){
+  [string[]]$Exclusions = Get-Content "$SymbolExclusionFile"
+  $Exclusions | foreach { if($_ -and $_.Trim()){$ExclusionSet.Add($_)} }
+}
+else{
+  Write-Host "Symbol Exclusion file does not exists. No symbols to exclude."
+}
+
 $CountMissingSymbols = {
   param( 
-    [string] $PackagePath          # Path to a NuGet package
+    [string] $PackagePath, # Path to a NuGet package
+    [string] $WindowsPdbVerificationParam # If we should check for the existence of windows pdbs in addition to portable PDBs
   )
 
-  . $using:PSScriptRoot\..\tools.ps1
-
   Add-Type -AssemblyName System.IO.Compression.FileSystem
 
   Write-Host "Validating $PackagePath "
@@ -34,7 +57,7 @@ $CountMissingSymbols = {
   if (!(Test-Path $PackagePath)) {
     Write-PipelineTaskError "Input file does not exist: $PackagePath"
     return [pscustomobject]@{
-      result = $using:ERROR_FILEDOESNOTEXIST
+      result      = $using:ERROR_FILEDOESNOTEXIST
       packagePath = $PackagePath
     }
   }
@@ -57,24 +80,25 @@ $CountMissingSymbols = {
     Write-Host "Something went wrong extracting $PackagePath"
     Write-Host $_
     return [pscustomobject]@{
-      result = $using:ERROR_BADEXTRACT
+      result      = $using:ERROR_BADEXTRACT
       packagePath = $PackagePath
     }
   }
 
   Get-ChildItem -Recurse $ExtractPath |
-    Where-Object {$RelevantExtensions -contains $_.Extension} |
-    ForEach-Object {
-      $FileName = $_.FullName
-      if ($FileName -Match '\\ref\\') {
-        Write-Host "`t Ignoring reference assembly file " $FileName
-        return
-      }
+  Where-Object { $RelevantExtensions -contains $_.Extension } |
+  ForEach-Object {
+    $FileName = $_.FullName
+    if ($FileName -Match '\\ref\\') {
+      Write-Host "`t Ignoring reference assembly file " $FileName
+      return
+    }
 
-      $FirstMatchingSymbolDescriptionOrDefault = {
+    $FirstMatchingSymbolDescriptionOrDefault = {
       param( 
-        [string] $FullPath,                  # Full path to the module that has to be checked
-        [string] $TargetServerParam,         # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
+        [string] $FullPath, # Full path to the module that has to be checked
+        [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
+        [string] $WindowsPdbVerificationParam, # Parameter to pass to potential check for windows-pdbs.
         [string] $SymbolsPath
       )
 
@@ -99,45 +123,60 @@ $CountMissingSymbols = {
 
       # DWARF file for a .dylib
       $DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf')
-    
+
       $dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools"
       $dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe"
 
       $totalRetries = 0
 
       while ($totalRetries -lt $using:MaxRetry) {
+
         # Save the output and get diagnostic output
-        $output = & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String
+        $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String
 
-        if (Test-Path $PdbPath) {
-          return 'PDB'
+        if ((Test-Path $PdbPath) -and (Test-path $SymbolPath)) {
+          return 'Module and PDB for Module'
         }
-        elseif (Test-Path $NGenPdb) {
-          return 'NGen PDB'
+        elseif ((Test-Path $NGenPdb) -and (Test-Path $PdbPath) -and (Test-Path $SymbolPath)) {
+          return 'Dll, PDB and NGen PDB'
         }
-        elseif (Test-Path $SODbg) {
-          return 'DBG for SO'
+        elseif ((Test-Path $SODbg) -and (Test-Path $SymbolPath)) {
+          return 'So and DBG for SO'
         }  
-        elseif (Test-Path $DylibDwarf) {
-          return 'Dwarf for Dylib'
+        elseif ((Test-Path $DylibDwarf) -and (Test-Path $SymbolPath)) {
+          return 'Dylib and Dwarf for Dylib'
         }  
         elseif (Test-Path $SymbolPath) {
           return 'Module'
         }
-        elseif ($output.Contains("503 Service Unavailable")) {
-          # If we got a 503 error, we should retry.
+        else
+        {
           $totalRetries++
         }
-        else {
-          return $null
-        }
       }
       
       return $null
     }
 
-      $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath
-      $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath
+    $FileRelativePath = $FileName.Replace("$ExtractPath\", "")
+    if (($($using:ExclusionSet) -ne $null) -and ($($using:ExclusionSet).Contains($FileRelativePath) -or ($($using:ExclusionSet).Contains($FileRelativePath.Replace("\", "/"))))){
+      Write-Host "Skipping $FileName from symbol validation"
+    }
+
+    else {
+      $FileGuid = New-Guid
+      $ExpandedSymbolsPath = Join-Path -Path $SymbolsPath -ChildPath $FileGuid
+
+      $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault `
+          -FullPath $FileName `
+          -TargetServerParam '--microsoft-symbol-server' `
+          -SymbolsPath "$ExpandedSymbolsPath-msdl" `
+          -WindowsPdbVerificationParam $WindowsPdbVerificationParam
+      $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault `
+          -FullPath $FileName `
+          -TargetServerParam '--internal-server' `
+          -SymbolsPath "$ExpandedSymbolsPath-symweb" `
+          -WindowsPdbVerificationParam $WindowsPdbVerificationParam
 
       Write-Host -NoNewLine "`t Checking file " $FileName "... "
   
@@ -160,6 +199,7 @@ $CountMissingSymbols = {
         }
       }
     }
+  }
   
   if ($using:Clean) {
     Remove-Item $ExtractPath -Recurse -Force
@@ -168,16 +208,16 @@ $CountMissingSymbols = {
   Pop-Location
 
   return [pscustomobject]@{
-      result = $MissingSymbols
-      packagePath = $PackagePath
-    }
+    result      = $MissingSymbols
+    packagePath = $PackagePath
+  }
 }
 
 function CheckJobResult(
-    $result, 
-    $packagePath,
-    [ref]$DupedSymbols,
-    [ref]$TotalFailures) {
+  $result, 
+  $packagePath,
+  [ref]$DupedSymbols,
+  [ref]$TotalFailures) {
   if ($result -eq $ERROR_BADEXTRACT) {
     Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath has duplicated symbol files"
     $DupedSymbols.Value++
@@ -200,6 +240,7 @@ function CheckSymbolsAvailable {
     Remove-Item $ExtractPath -Force  -Recurse -ErrorAction SilentlyContinue
   }
 
+  $TotalPackages = 0
   $TotalFailures = 0
   $DupedSymbols = 0
 
@@ -222,7 +263,9 @@ function CheckSymbolsAvailable {
         return
       }
 
-      Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null
+      $TotalPackages++
+
+      Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null
 
       $NumJobs = @(Get-Job -State 'Running').Count
 
@@ -247,11 +290,11 @@ function CheckSymbolsAvailable {
 
   if ($TotalFailures -gt 0 -or $DupedSymbols -gt 0) {
     if ($TotalFailures -gt 0) {
-      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures packages"
+      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures/$TotalPackages packages"
     }
 
     if ($DupedSymbols -gt 0) {
-      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols packages had duplicated symbol files"
+      Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols/$TotalPackages packages had duplicated symbol files and could not be extracted"
     }
     
     ExitWithExitCode 1
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index f55c43c6f47..b1bca63ab1d 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -34,7 +34,7 @@ function Print-Usage() {
 function Build([string]$target) {
   $logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
   $log = Join-Path $LogDir "$task$logSuffix.binlog"
-  $outputPath = Join-Path $ToolsetDir "$task\\"
+  $outputPath = Join-Path $ToolsetDir "$task\"
 
   MSBuild $taskProject `
     /bl:$log `
@@ -53,7 +53,7 @@ try {
   }
 
   if ($task -eq "") {
-    Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task <value>'" -ForegroundColor Red
+    Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task <value>'"
     Print-Usage
     ExitWithExitCode 1
   }
@@ -64,7 +64,7 @@ try {
       $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
     }
     if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.8.0-preview3" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.10.0-preview2" -MemberType NoteProperty
     }
     if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
         $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
@@ -78,7 +78,7 @@ try {
 
   $taskProject = GetSdkTaskProject $task
   if (!(Test-Path $taskProject)) {
-    Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" -ForegroundColor Red
+    Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task"
     ExitWithExitCode 1
   }
 
diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1
new file mode 100644
index 00000000000..bdbf49e6c71
--- /dev/null
+++ b/eng/common/sdl/configure-sdl-tool.ps1
@@ -0,0 +1,116 @@
+Param(
+  [string] $GuardianCliLocation,
+  [string] $WorkingDirectory,
+  [string] $TargetDirectory,
+  [string] $GdnFolder,
+  # The list of Guardian tools to configure. For each object in the array:
+  # - If the item is a [hashtable], it must contain these entries:
+  #   - Name = The tool name as Guardian knows it.
+  #   - Scenario = (Optional) Scenario-specific name for this configuration entry. It must be unique
+  #     among all tool entries with the same Name.
+  #   - Args = (Optional) Array of Guardian tool configuration args, like '@("Target > C:\temp")'
+  # - If the item is a [string] $v, it is treated as '@{ Name="$v" }'
+  [object[]] $ToolsList,
+  [string] $GuardianLoggerLevel='Standard',
+  # Optional: Additional params to add to any tool using CredScan.
+  [string[]] $CrScanAdditionalRunConfigParams,
+  # Optional: Additional params to add to any tool using PoliCheck.
+  [string[]] $PoliCheckAdditionalRunConfigParams,
+  # Optional: Additional params to add to any tool using CodeQL/Semmle.
+  [string[]] $CodeQLAdditionalRunConfigParams
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+$disableConfigureToolsetImport = $true
+$global:LASTEXITCODE = 0
+
+try {
+  # `tools.ps1` checks $ci to perform some actions. Since the SDL
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  . $PSScriptRoot\..\tools.ps1
+
+  # Normalize tools list: all in [hashtable] form with defined values for each key.
+  $ToolsList = $ToolsList |
+    ForEach-Object {
+      if ($_ -is [string]) {
+        $_ = @{ Name = $_ }
+      }
+
+      if (-not ($_['Scenario'])) { $_.Scenario = "" }
+      if (-not ($_['Args'])) { $_.Args = @() }
+      $_
+    }
+  
+  Write-Host "List of tools to configure:"
+  $ToolsList | ForEach-Object { $_ | Out-String | Write-Host }
+
+  # We store config files in the r directory of .gdn
+  $gdnConfigPath = Join-Path $GdnFolder 'r'
+  $ValidPath = Test-Path $GuardianCliLocation
+
+  if ($ValidPath -eq $False)
+  {
+    Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location."
+    ExitWithExitCode 1
+  }
+
+  foreach ($tool in $ToolsList) {
+    # Put together the name and scenario to make a unique key.
+    $toolConfigName = $tool.Name
+    if ($tool.Scenario) {
+      $toolConfigName += "_" + $tool.Scenario
+    }
+
+    Write-Host "=== Configuring $toolConfigName..."
+
+    $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig"
+
+    # For some tools, add default and automatic args.
+    if ($tool.Name -eq 'credscan') {
+      if ($targetDirectory) {
+        $tool.Args += "`"TargetDirectory < $TargetDirectory`""
+      }
+      $tool.Args += "`"OutputType < pre`""
+      $tool.Args += $CrScanAdditionalRunConfigParams
+    } elseif ($tool.Name -eq 'policheck') {
+      if ($targetDirectory) {
+        $tool.Args += "`"Target < $TargetDirectory`""
+      }
+      $tool.Args += $PoliCheckAdditionalRunConfigParams
+    } elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') {
+      if ($targetDirectory) {
+        $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`""
+      }
+      $tool.Args += $CodeQLAdditionalRunConfigParams
+    }
+
+    # Create variable pointing to the args array directly so we can use splat syntax later.
+    $toolArgs = $tool.Args
+
+    # Configure the tool. If args array is provided or the current tool has some default arguments
+    # defined, add "--args" and splat each element on the end. Arg format is "{Arg id} < {Value}",
+    # one per parameter. Doc page for "guardian configure":
+    # https://dev.azure.com/securitytools/SecurityIntegration/_wiki/wikis/Guardian/1395/configure
+    Exec-BlockVerbosely {
+      & $GuardianCliLocation configure `
+        --working-directory $WorkingDirectory `
+        --tool $tool.Name `
+        --output-path $gdnConfigFile `
+        --logger-level $GuardianLoggerLevel `
+        --noninteractive `
+        --force `
+        $(if ($toolArgs) { "--args" }) @toolArgs
+      Exit-IfNZEC "Sdl"
+    }
+
+    Write-Host "Created '$toolConfigName' configuration file: $gdnConfigFile"
+  }
+}
+catch {
+  Write-Host $_.ScriptStackTrace
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  ExitWithExitCode 1
+}
diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1
index 81b729f74a4..4797e012c7d 100644
--- a/eng/common/sdl/execute-all-sdl-tools.ps1
+++ b/eng/common/sdl/execute-all-sdl-tools.ps1
@@ -7,8 +7,17 @@ Param(
   [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,                                         # Required: the directory where source files are located
   [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')),  # Required: the directory where build artifacts are located
   [string] $AzureDevOpsAccessToken,                                                              # Required: access token for dnceng; should be provided via KeyVault
-  [string[]] $SourceToolsList,                                                                   # Optional: list of SDL tools to run on source code
-  [string[]] $ArtifactToolsList,                                                                 # Optional: list of SDL tools to run on built artifacts
+
+  # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list
+  # format.
+  [object[]] $SourceToolsList,
+  # Optional: list of SDL tools to run on built artifacts. See 'configure-sdl-tool.ps1' for tools
+  # list format.
+  [object[]] $ArtifactToolsList,
+  # Optional: list of SDL tools to run without automatically specifying a target directory. See
+  # 'configure-sdl-tool.ps1' for tools list format.
+  [object[]] $CustomToolsList,
+
   [bool] $TsaPublish=$False,                                                                     # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs.
   [string] $TsaBranchName=$env:BUILD_SOURCEBRANCH,                                               # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs.
   [string] $TsaRepositoryName=$env:BUILD_REPOSITORY_NAME,                                        # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs.
@@ -25,6 +34,7 @@ Param(
   [string] $GuardianLoggerLevel='Standard',                                                      # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
   [string[]] $CrScanAdditionalRunConfigParams,                                                   # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1")
   [string[]] $PoliCheckAdditionalRunConfigParams,                                                # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1")
+  [string[]] $CodeQLAdditionalRunConfigParams,                                                   # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1")
   [bool] $BreakOnFailure=$False                                                                  # Optional: Fail the build if there were errors during the run
 )
 
@@ -32,7 +42,7 @@ try {
   $ErrorActionPreference = 'Stop'
   Set-StrictMode -Version 2.0
   $disableConfigureToolsetImport = $true
-  $LASTEXITCODE = 0
+  $global:LASTEXITCODE = 0
 
   # `tools.ps1` checks $ci to perform some actions. Since the SDL
   # scripts don't necessarily execute in the same agent that run the
@@ -63,13 +73,16 @@ try {
     ExitWithExitCode 1
   }
 
-  & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
+  Exec-BlockVerbosely {
+    & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
+  }
   $gdnFolder = Join-Path $workingDirectory '.gdn'
 
   if ($TsaOnboard) {
     if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) {
-      Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel"
-      & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
+      Exec-BlockVerbosely {
+        & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
+      }
       if ($LASTEXITCODE -ne 0) {
         Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-onboard failed with exit code $LASTEXITCODE."
         ExitWithExitCode $LASTEXITCODE
@@ -80,11 +93,42 @@ try {
     }
   }
 
-  if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) {
-    & $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
+  # Configure a list of tools with a default target directory. Populates the ".gdn/r" directory.
+  function Configure-ToolsList([object[]] $tools, [string] $targetDirectory) {
+    if ($tools -and $tools.Count -gt 0) {
+      Exec-BlockVerbosely {
+        & $(Join-Path $PSScriptRoot 'configure-sdl-tool.ps1') `
+          -GuardianCliLocation $guardianCliLocation `
+          -WorkingDirectory $workingDirectory `
+          -TargetDirectory $targetDirectory `
+          -GdnFolder $gdnFolder `
+          -ToolsList $tools `
+          -AzureDevOpsAccessToken $AzureDevOpsAccessToken `
+          -GuardianLoggerLevel $GuardianLoggerLevel `
+          -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
+          -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `
+          -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams
+        if ($BreakOnFailure) {
+          Exit-IfNZEC "Sdl"
+        }
+      }
+    }
   }
-  if ($SourceToolsList -and $SourceToolsList.Count -gt 0) {
-    & $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
+
+  # Configure Artifact and Source tools with default Target directories.
+  Configure-ToolsList $ArtifactToolsList $ArtifactsDirectory
+  Configure-ToolsList $SourceToolsList $SourceDirectory
+  # Configure custom tools with no default Target directory.
+  Configure-ToolsList $CustomToolsList $null
+
+  # At this point, all tools are configured in the ".gdn" directory. Run them all in a single call.
+  # (If we used "run" multiple times, each run would overwrite data from earlier runs.)
+  Exec-BlockVerbosely {
+    & $(Join-Path $PSScriptRoot 'run-sdl.ps1') `
+      -GuardianCliLocation $guardianCliLocation `
+      -WorkingDirectory $SourceDirectory `
+      -UpdateBaseline $UpdateBaseline `
+      -GdnFolder $gdnFolder
   }
 
   if ($TsaPublish) {
@@ -92,8 +136,9 @@ try {
       if (-not $TsaRepositoryName) {
         $TsaRepositoryName = "$($Repository)-$($BranchName)"
       }
-      Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel"
-      & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory  --logger-level $GuardianLoggerLevel
+      Exec-BlockVerbosely {
+        & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory  --logger-level $GuardianLoggerLevel
+      }
       if ($LASTEXITCODE -ne 0) {
         Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-publish failed with exit code $LASTEXITCODE."
         ExitWithExitCode $LASTEXITCODE
@@ -106,7 +151,11 @@ try {
 
   if ($BreakOnFailure) {
     Write-Host "Failing the build in case of breaking results..."
-    & $guardianCliLocation break
+    Exec-BlockVerbosely {
+      & $guardianCliLocation break --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
+    }
+  } else {
+    Write-Host "Letting the build pass even if there were breaking results..."
   }
 }
 catch {
diff --git a/eng/common/sdl/extract-artifact-archives.ps1 b/eng/common/sdl/extract-artifact-archives.ps1
new file mode 100644
index 00000000000..68da4fbf257
--- /dev/null
+++ b/eng/common/sdl/extract-artifact-archives.ps1
@@ -0,0 +1,63 @@
+# This script looks for each archive file in a directory and extracts it into the target directory.
+# For example, the file "$InputPath/bin.tar.gz" extracts to "$ExtractPath/bin.tar.gz.extracted/**".
+# Uses the "tar" utility added to Windows 10 / Windows 2019 that supports tar.gz and zip.
+param(
+  # Full path to directory where archives are stored.
+  [Parameter(Mandatory=$true)][string] $InputPath,
+  # Full path to directory to extract archives into. May be the same as $InputPath.
+  [Parameter(Mandatory=$true)][string] $ExtractPath
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+
+$disableConfigureToolsetImport = $true
+
+try {
+  # `tools.ps1` checks $ci to perform some actions. Since the SDL
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  . $PSScriptRoot\..\tools.ps1
+
+  Measure-Command {
+    $jobs = @()
+
+    # Find archive files for non-Windows and Windows builds.
+    $archiveFiles = @(
+      Get-ChildItem (Join-Path $InputPath "*.tar.gz")
+      Get-ChildItem (Join-Path $InputPath "*.zip")
+    )
+
+    foreach ($targzFile in $archiveFiles) {
+      $jobs += Start-Job -ScriptBlock {
+        $file = $using:targzFile
+        $fileName = [System.IO.Path]::GetFileName($file)
+        $extractDir = Join-Path $using:ExtractPath "$fileName.extracted"
+
+        New-Item $extractDir -ItemType Directory -Force | Out-Null
+
+        Write-Host "Extracting '$file' to '$extractDir'..."
+
+        # Pipe errors to stdout to prevent PowerShell detecting them and quitting the job early.
+        # This type of quit skips the catch, so we wouldn't be able to tell which file triggered the
+        # error. Save output so it can be stored in the exception string along with context.
+        $output = tar -xf $file -C $extractDir 2>&1
+        # Handle NZEC manually rather than using Exit-IfNZEC: we are in a background job, so we
+        # don't have access to the outer scope.
+        if ($LASTEXITCODE -ne 0) {
+          throw "Error extracting '$file': non-zero exit code ($LASTEXITCODE). Output: '$output'"
+        }
+
+        Write-Host "Extracted to $extractDir"
+      }
+    }
+
+    Receive-Job $jobs -Wait
+  }
+}
+catch {
+  Write-Host $_
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  ExitWithExitCode 1
+}
diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1
index 1fe9271193c..3ac1d92b370 100644
--- a/eng/common/sdl/init-sdl.ps1
+++ b/eng/common/sdl/init-sdl.ps1
@@ -10,7 +10,7 @@ Param(
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 2.0
 $disableConfigureToolsetImport = $true
-$LASTEXITCODE = 0
+$global:LASTEXITCODE = 0
 
 # `tools.ps1` checks $ci to perform some actions. Since the SDL
 # scripts don't necessarily execute in the same agent that run the
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 3bd8b29ebd7..4585cfd6bba 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.53.3"/>
+  <package id="Microsoft.Guardian.Cli" version="0.109.0"/>
 </packages>
diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1
index fe95ab35aa5..2eac8c78f10 100644
--- a/eng/common/sdl/run-sdl.ps1
+++ b/eng/common/sdl/run-sdl.ps1
@@ -1,19 +1,15 @@
 Param(
   [string] $GuardianCliLocation,
   [string] $WorkingDirectory,
-  [string] $TargetDirectory,
   [string] $GdnFolder,
-  [string[]] $ToolsList,
   [string] $UpdateBaseline,
-  [string] $GuardianLoggerLevel='Standard',
-  [string[]] $CrScanAdditionalRunConfigParams,
-  [string[]] $PoliCheckAdditionalRunConfigParams
+  [string] $GuardianLoggerLevel='Standard'
 )
 
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 2.0
 $disableConfigureToolsetImport = $true
-$LASTEXITCODE = 0
+$global:LASTEXITCODE = 0
 
 try {
   # `tools.ps1` checks $ci to perform some actions. Since the SDL
@@ -23,7 +19,6 @@ try {
   . $PSScriptRoot\..\tools.ps1
 
   # We store config files in the r directory of .gdn
-  Write-Host $ToolsList
   $gdnConfigPath = Join-Path $GdnFolder 'r'
   $ValidPath = Test-Path $GuardianCliLocation
 
@@ -33,37 +28,18 @@ try {
     ExitWithExitCode 1
   }
 
-  $configParam = @('--config')
-
-  foreach ($tool in $ToolsList) {
-    $gdnConfigFile = Join-Path $gdnConfigPath "$tool-configure.gdnconfig"
-    Write-Host $tool
-    # We have to manually configure tools that run on source to look at the source directory only
-    if ($tool -eq 'credscan') {
-      Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory < $TargetDirectory `" `" OutputType < pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})"
-      & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory < $TargetDirectory " "OutputType < pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
-      if ($LASTEXITCODE -ne 0) {
-        Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian configure for $tool failed with exit code $LASTEXITCODE."
-        ExitWithExitCode $LASTEXITCODE
-      }
-    }
-    if ($tool -eq 'policheck') {
-      Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target < $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})"
-      & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target < $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})
-      if ($LASTEXITCODE -ne 0) {
-        Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian configure for $tool failed with exit code $LASTEXITCODE."
-        ExitWithExitCode $LASTEXITCODE
-      }
-    }
-
-    $configParam+=$gdnConfigFile
-  }
-
-  Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam"
-  & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam
-  if ($LASTEXITCODE -ne 0) {
-    Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE."
-    ExitWithExitCode $LASTEXITCODE
+  $gdnConfigFiles = Get-ChildItem $gdnConfigPath -Recurse -Include '*.gdnconfig'
+  Write-Host "Discovered Guardian config files:"
+  $gdnConfigFiles | Out-String | Write-Host
+
+  Exec-BlockVerbosely {
+    & $GuardianCliLocation run `
+      --working-directory $WorkingDirectory `
+      --baseline mainbaseline `
+      --update-baseline $UpdateBaseline `
+      --logger-level $GuardianLoggerLevel `
+      --config @gdnConfigFiles
+    Exit-IfNZEC "Sdl"
   }
 }
 catch {
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 4a32181fd8f..24cec0424e5 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -2,17 +2,33 @@ parameters:
   enable: 'false'                                             # Whether the SDL validation job should execute or not
   overrideParameters: ''                                       # Optional: to override values for parameters.
   additionalParameters: ''                                     # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
+  # Optional: if specified, restore and use this version of Guardian instead of the default.
+  overrideGuardianVersion: ''
+  # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth
+  # diagnosis of problems with specific tool configurations.
+  publishGuardianDirectoryToPipeline: false
+  # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL
+  # parameters rather than relying on YAML. It may be better to use a local script, because you can
+  # reproduce results locally without piecing together a command based on the YAML.
+  executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1'
   # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
   # 'continueOnError', the parameter value is not correctly picked up.
   # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
   sdlContinueOnError: false                                    # optional: determines whether to continue the build if the step errors;
-  downloadArtifacts: true                                      # optional: determines if the artifacts should be dowloaded
+  # optional: determines if build artifacts should be downloaded.
+  downloadArtifacts: true
+  # optional: determines if this job should search the directory of downloaded artifacts for
+  # 'tar.gz' and 'zip' archive files and extract them before running SDL validation tasks.
+  extractArchiveArtifacts: false
   dependsOn: ''                                                # Optional: dependencies of the job
   artifactNames: ''                                            # Optional: patterns supplied to DownloadBuildArtifacts
                                                                # Usage:
                                                                #  artifactNames:
                                                                #    - 'BlobArtifacts'
                                                                #    - 'Artifacts_Windows_NT_Release'
+  # Optional: download a list of pipeline artifacts. 'downloadArtifacts' controls build artifacts,
+  # not pipeline artifacts, so doesn't affect the use of this parameter.
+  pipelineArtifactNames: []
 
 jobs:
 - job: Run_SDL
@@ -22,16 +38,29 @@ jobs:
   variables:
     - group: DotNet-VSTS-Bot
     - name: AzDOProjectName
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
+      value: ${{ parameters.AzDOProjectName }}
     - name: AzDOPipelineId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
+      value: ${{ parameters.AzDOPipelineId }}
     - name: AzDOBuildId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
+      value: ${{ parameters.AzDOBuildId }}
+    - template: /eng/common/templates/variables/sdl-variables.yml
+    - name: GuardianVersion
+      value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
   pool:
-    name: Hosted VS2017
+    # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+    ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+      name: VSEngSS-MicroBuild2022-1ES
+      demands: Cmd
+    # If it's not devdiv, it's dnceng
+    ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+      name: NetCore1ESPool-Internal
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
   steps:
   - checkout: self
     clean: true
+
+  - template: /eng/common/templates/post-build/setup-maestro-vars.yml
+
   - ${{ if ne(parameters.downloadArtifacts, 'false')}}:
     - ${{ if ne(parameters.artifactNames, '') }}:
       - ${{ each artifactName in parameters.artifactNames }}:
@@ -59,35 +88,44 @@ jobs:
           itemPattern: "**"
           downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
           checkDownloadedFiles: true
+
+  - ${{ each artifactName in parameters.pipelineArtifactNames }}:
+    - task: DownloadPipelineArtifact@2
+      displayName: Download Pipeline Artifacts
+      inputs:
+        buildType: specific
+        buildVersionToDownload: specific
+        project: $(AzDOProjectName)
+        pipeline: $(AzDOPipelineId)
+        buildId: $(AzDOBuildId)
+        artifactName: ${{ artifactName }}
+        downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
+        checkDownloadedFiles: true
+
   - powershell: eng/common/sdl/extract-artifact-packages.ps1
       -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
       -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
     displayName: Extract Blob Artifacts
     continueOnError: ${{ parameters.sdlContinueOnError }}
+
   - powershell: eng/common/sdl/extract-artifact-packages.ps1
       -InputPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts
       -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts
     displayName: Extract Package Artifacts
     continueOnError: ${{ parameters.sdlContinueOnError }}
-  - task: NuGetToolInstaller@1
-    displayName: 'Install NuGet.exe'
-  - task: NuGetCommand@2
-    displayName: 'Install Guardian'
-    inputs:
-      restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
-      feedsToUse: config
-      nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
-      externalFeedCredentials: GuardianConnect
-      restoreDirectory: $(Build.SourcesDirectory)\.packages
-  - ${{ if ne(parameters.overrideParameters, '') }}:
-    - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 ${{ parameters.overrideParameters }}
-      displayName: Execute SDL
-      continueOnError: ${{ parameters.sdlContinueOnError }}
-  - ${{ if eq(parameters.overrideParameters, '') }}:
-    - powershell: eng/common/sdl/execute-all-sdl-tools.ps1
-        -GuardianPackageName Microsoft.Guardian.Cli.0.53.3
-        -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
-        -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
-        ${{ parameters.additionalParameters }}
-      displayName: Execute SDL
+
+  - ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
+    - powershell: eng/common/sdl/extract-artifact-archives.ps1
+        -InputPath $(Build.ArtifactStagingDirectory)\artifacts
+        -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts
+      displayName: Extract Archive Artifacts
       continueOnError: ${{ parameters.sdlContinueOnError }}
+  
+  - template: /eng/common/templates/steps/execute-sdl.yml
+    parameters:
+      overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
+      executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
+      overrideParameters: ${{ parameters.overrideParameters }}
+      additionalParameters: ${{ parameters.additionalParameters }}
+      publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
+      sdlContinueOnError: ${{ parameters.sdlContinueOnError }}
diff --git a/eng/common/templates/job/generate-graph-files.yml b/eng/common/templates/job/generate-graph-files.yml
deleted file mode 100644
index e54ce956f90..00000000000
--- a/eng/common/templates/job/generate-graph-files.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-parameters:
-  # Optional: dependencies of the job
-  dependsOn: ''
-
-  # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
-  pool: {}
-
-  # Optional: Include toolset dependencies in the generated graph files
-  includeToolset: false
-  
-jobs:
-- job: Generate_Graph_Files
-
-  dependsOn: ${{ parameters.dependsOn }}
-
-  displayName: Generate Graph Files
-
-  pool: ${{ parameters.pool }}
-
-  variables:
-    # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
-    # DotNet-AllOrgs-Darc-Pats provides: dn-bot-devdiv-dnceng-rw-code-pat
-    - group: Publish-Build-Assets
-    - group: DotNet-AllOrgs-Darc-Pats
-    - name: _GraphArguments
-      value: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT) 
-        -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat) 
-        -barToken $(MaestroAccessToken) 
-        -outputFolder '$(Build.StagingDirectory)/GraphFiles/'
-    - ${{ if ne(parameters.includeToolset, 'false') }}:
-      - name: _GraphArguments
-        value: ${{ variables._GraphArguments }} -includeToolset
-
-  steps:
-    - task: PowerShell@2
-      displayName: Generate Graph Files
-      inputs:
-        filePath: eng\common\generate-graph-files.ps1 
-        arguments: $(_GraphArguments)
-      continueOnError: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Graph to Artifacts
-      inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/GraphFiles'
-        PublishLocation: Container
-        ArtifactName: GraphFiles
-      continueOnError: true
-      condition: always()      
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 86696793480..92e98af7ebd 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -24,6 +24,7 @@ parameters:
   enablePublishBuildAssets: false
   enablePublishTestResults: false
   enablePublishUsingPipelines: false
+  disableComponentGovernance: false
   mergeTestResults: false
   testRunTitle: ''
   testResultsFormat: ''
@@ -103,7 +104,7 @@ jobs:
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-      - task: MicroBuildSigningPlugin@2
+      - task: MicroBuildSigningPlugin@3
         displayName: Install MicroBuild plugin
         inputs:
           signType: $(_SignType)
@@ -114,6 +115,7 @@ jobs:
         continueOnError: ${{ parameters.continueOnError }}
         condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
 
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
     - task: NuGetAuthenticate@0
 
   - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:
@@ -136,6 +138,10 @@ jobs:
         richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
       continueOnError: true
 
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
+      - task: ComponentGovernanceComponentDetection@0
+        continueOnError: true
+
   - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
     - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - task: MicroBuildCleanup@1
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index 928a70cda2c..9d1e3042d8a 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -3,19 +3,25 @@ parameters:
   dependsOn: ''
 
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
-  pool:
-    vmImage: vs2017-win2016
-
+  pool: ''
+    
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
 
   SourcesDirectory: $(Build.SourcesDirectory)
   CreatePr: true
+  AutoCompletePr: false
+  ReusePr: true
+  UseLfLineEndings: true
   UseCheckedInLocProjectJson: false
   LanguageSet: VS_Main_Languages
   LclSource: lclFilesInRepo
   LclPackageId: ''
   RepoType: gitHub
+  GitHubOrg: dotnet
+  MirrorRepo: ''
+  MirrorBranch: main
+  condition: ''
 
 jobs:
 - job: OneLocBuild
@@ -24,7 +30,18 @@ jobs:
 
   displayName: OneLocBuild
 
-  pool: ${{ parameters.pool }}
+  ${{ if ne(parameters.pool, '') }}:
+    pool: ${{ parameters.pool }}
+  ${{ if eq(parameters.pool, '') }}:
+    pool:
+      # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+      ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+        name: VSEngSS-MicroBuild2022-1ES
+        demands: Cmd
+      # If it's not devdiv, it's dnceng
+      ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
   variables:
     - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
@@ -43,23 +60,34 @@ jobs:
         filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
         arguments: $(_GenerateLocProjectArguments)
       displayName: Generate LocProject.json
+      condition: ${{ parameters.condition }}
 
     - task: OneLocBuild@2
       displayName: OneLocBuild
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
       inputs:
-        locProj: Localize/LocProject.json
+        locProj: eng/Localize/LocProject.json
         outDir: $(Build.ArtifactStagingDirectory)
         lclSource: ${{ parameters.LclSource }}
         lclPackageId: ${{ parameters.LclPackageId }}
         isCreatePrSelected: ${{ parameters.CreatePr }}
+        ${{ if eq(parameters.CreatePr, true) }}:
+          isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
+          isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
+          ${{ if eq(parameters.RepoType, 'gitHub') }}:
+            isShouldReusePrSelected: ${{ parameters.ReusePr }}
         packageSourceAuth: patAuth
         patVariable: ${{ parameters.CeapexPat }}
         ${{ if eq(parameters.RepoType, 'gitHub') }}:
           repoType: ${{ parameters.RepoType }}
           gitHubPatVariable: "${{ parameters.GithubPat }}"
-      condition: always()
+        ${{ if ne(parameters.MirrorRepo, '') }}:
+          isMirrorRepoSelected: true
+          gitHubOrganization: ${{ parameters.GitHubOrg }}
+          mirrorRepo: ${{ parameters.MirrorRepo }}
+          mirrorBranch: ${{ parameters.MirrorBranch }}
+      condition: ${{ parameters.condition }}
 
     - task: PublishBuildArtifacts@1
       displayName: Publish Localization Files
@@ -67,12 +95,12 @@ jobs:
         PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc'
         PublishLocation: Container
         ArtifactName: Loc
-      condition: always()
+      condition: ${{ parameters.condition }}
 
     - task: PublishBuildArtifacts@1
       displayName: Publish LocProject.json
       inputs:
-        PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
+        PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
         PublishLocation: Container
         ArtifactName: Loc
-      condition: always()
\ No newline at end of file
+      condition: ${{ parameters.condition }}
\ No newline at end of file
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index 3b9e2524ff3..d91bf914711 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -38,10 +38,6 @@ jobs:
       value: ${{ parameters.configuration }}
     - group: Publish-Build-Assets
     - group: AzureDevOps-Artifact-Feeds-Pats
-    # Skip component governance and codesign validation for SDL. These jobs
-    # create no content.
-    - name: skipComponentGovernanceDetection
-      value: true
     - name: runCodesignValidationInjection
       value: false
 
@@ -94,7 +90,31 @@ jobs:
         PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
         PublishLocation: Container
         ArtifactName: ReleaseConfigs
-    
+
+    - task: powershell@2
+      displayName: Check if SymbolPublishingExclusionsFile.txt exists
+      inputs:
+        targetType: inline
+        script: |
+          $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
+          if(Test-Path -Path $symbolExclusionfile)
+          {
+            Write-Host "SymbolExclusionFile exists"
+            Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true"
+          }
+          else{
+           Write-Host "Symbols Exclusion file does not exists"
+           Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false"
+          }
+
+    - task: PublishBuildArtifacts@1
+      displayName: Publish SymbolPublishingExclusionsFile Artifact
+      condition: eq(variables['SymbolExclusionFile'], 'true') 
+      inputs:
+        PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
+        PublishLocation: Container
+        ArtifactName: ReleaseConfigs
+        
     - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
       - template: /eng/common/templates/steps/publish-logs.yml
         parameters:
diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
index aad41464926..5cd5325d7b4 100644
--- a/eng/common/templates/job/source-build.yml
+++ b/eng/common/templates/job/source-build.yml
@@ -15,6 +15,9 @@ parameters:
   # nonPortable: false
   #   Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
   #   linux-x64), and compiling against distro-provided packages rather than portable ones.
+  # skipPublishValidation: false
+  #   Disables publishing validation.  By default, a check is performed to ensure no packages are
+  #   published by source-build.
   # container: ''
   #   A container to use. Runs in docker.
   # pool: {}
@@ -28,11 +31,6 @@ parameters:
   #   container and pool.
   platform: {}
 
-  # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
-  # source-build builds run in Docker, including the default managed platform.
-  defaultContainerHostPool:
-    vmImage: ubuntu-20.04
-
 jobs:
 - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
   displayName: Source-Build (${{ parameters.platform.name }})
@@ -44,7 +42,15 @@ jobs:
     container: ${{ parameters.platform.container }}
 
   ${{ if eq(parameters.platform.pool, '') }}:
-    pool: ${{ parameters.defaultContainerHostPool }}
+    # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
+    # source-build builds run in Docker, including the default managed platform.
+    pool:
+      ${{ if eq(variables['System.TeamProject'], 'public') }}:
+        name: NetCore1ESPool-Public
+        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        name: NetCore1ESPool-Internal
+        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
   ${{ if ne(parameters.platform.pool, '') }}:
     pool: ${{ parameters.platform.pool }}
 
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index c002a2b1b0a..4af724eb1a9 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -1,15 +1,17 @@
 parameters:
   runAsPublic: false
-  sourceIndexPackageVersion: 1.0.1-20210225.1
+  sourceIndexPackageVersion: 1.0.1-20210614.1
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
   preSteps: []
   binlogPath: artifacts/log/Debug/Build.binlog
-  pool:
-    vmImage: vs2017-win2016
+  condition: ''
+  dependsOn: ''
 
 jobs:
 - job: SourceIndexStage1
+  dependsOn: ${{ parameters.dependsOn }}
+  condition: ${{ parameters.condition }}
   variables:
   - name: SourceIndexPackageVersion
     value: ${{ parameters.sourceIndexPackageVersion }}
@@ -20,7 +22,13 @@ jobs:
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - group: source-dot-net stage1 variables
 
-  pool: ${{ parameters.pool }}
+  pool:
+    ${{ if eq(variables['System.TeamProject'], 'public') }}:
+      name: NetCore1ESPool-Public
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
+    ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+      name: NetCore1ESPool-Internal
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
   steps:
   - ${{ each preStep in parameters.preSteps }}:
     - ${{ preStep }}
@@ -30,29 +38,24 @@ jobs:
     inputs:
       packageType: sdk
       version: 3.1.x
-
-  - task: UseDotNet@2
-    displayName: Use .NET Core sdk
-    inputs:
-      useGlobalJson: true
+      installationPath: $(Agent.TempDirectory)/dotnet
+      workingDirectory: $(Agent.TempDirectory)
 
   - script: |
-      dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
-      dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
-      echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools
+      $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
+      $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
     displayName: Download Tools
+    # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
+    workingDirectory: $(Agent.TempDirectory)
 
   - script: ${{ parameters.sourceIndexBuildCommand }}
     displayName: Build Repository
 
-  - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
+  - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
     displayName: Process Binlog into indexable sln
-    env:
-      DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
+    - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
       displayName: Upload stage1 artifacts to source index
       env:
         BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
-        DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml
new file mode 100644
index 00000000000..f7dc5ea4aaa
--- /dev/null
+++ b/eng/common/templates/jobs/codeql-build.yml
@@ -0,0 +1,31 @@
+parameters:
+  # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md
+  continueOnError: false
+  # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
+  jobs: []
+  # Optional: if specified, restore and use this version of Guardian instead of the default.
+  overrideGuardianVersion: ''
+
+jobs:
+- template: /eng/common/templates/jobs/jobs.yml
+  parameters:
+    enableMicrobuild: false
+    enablePublishBuildArtifacts: false
+    enablePublishTestResults: false
+    enablePublishBuildAssets: false
+    enablePublishUsingPipelines: false
+    enableTelemetry: true
+
+    variables:
+      - group: Publish-Build-Assets
+      # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
+      # sync with the packages.config file.
+      - name: DefaultGuardianVersion
+        value: 0.109.0
+      - name: GuardianPackagesConfigFile
+        value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+      - name: GuardianVersion
+        value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
+  
+    jobs: ${{ parameters.jobs }}
+        
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index a1f8fce96ca..70d44735ace 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -8,6 +8,10 @@ parameters:
   # Optional: Enable publishing using release pipelines
   enablePublishUsingPipelines: false
 
+  # Optional: Disable component governance detection. In general, component governance
+  # should be on for all jobs. Use only in the event of issues.
+  disableComponentGovernance: false
+
   # Optional: Enable running the source-build jobs to build repo from source
   enableSourceBuild: false
 
@@ -83,17 +87,15 @@ jobs:
         - ${{ if eq(parameters.enableSourceBuild, true) }}:
           - Source_Build_Complete
         pool:
-          vmImage: vs2017-win2016
+          # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+          ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+            name: VSEngSS-MicroBuild2022-1ES
+            demands: Cmd
+          # If it's not devdiv, it's dnceng
+          ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+            name: NetCore1ESPool-Internal
+            demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
         runAsPublic: ${{ parameters.runAsPublic }}
         publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
         enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
-
-  - ${{ if eq(parameters.graphFileGeneration.enabled, true) }}:
-    - template: ../job/generate-graph-files.yml
-      parameters:
-        continueOnError: ${{ parameters.continueOnError }}
-        includeToolset: ${{ parameters.graphFileGeneration.includeToolset }}
-        dependsOn:
-          - Asset_Registry_Publish
-        pool:
-          vmImage: vs2017-win2016
diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml
deleted file mode 100644
index 0123cf43b16..00000000000
--- a/eng/common/templates/phases/base.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-parameters:
-  # Optional: Clean sources before building
-  clean: true
-
-  # Optional: Git fetch depth
-  fetchDepth: ''
-
-  # Optional: name of the phase (not specifying phase name may cause name collisions)
-  name: ''
-  # Optional: display name of the phase
-  displayName: ''
-
-  # Optional: condition for the job to run
-  condition: ''
-
-  # Optional: dependencies of the phase
-  dependsOn: ''
-
-  # Required: A defined YAML queue
-  queue: {}
-
-  # Required: build steps
-  steps: []
-
-  # Optional: variables
-  variables: {}
-
-  # Optional: should run as a public build even in the internal project
-  #           if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
-  runAsPublic: false
-
-  ## Telemetry variables
-
-  # Optional: enable sending telemetry
-  #           if 'true', these "variables" must be specified in the variables object or as part of the queue matrix
-  #             _HelixBuildConfig - differentiate between Debug, Release, other
-  #             _HelixSource - Example: build/product
-  #             _HelixType - Example: official/dotnet/arcade/$(Build.SourceBranch)
-  enableTelemetry: false
-
-  # Optional: Enable installing Microbuild plugin
-  #           if 'true', these "variables" must be specified in the variables object or as part of the queue matrix
-  #             _TeamName - the name of your team
-  #             _SignType - 'test' or 'real'
-  enableMicrobuild: false
-
-# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
-# and some (Microbuild) should only be applied to non-PR cases for internal builds.
-
-phases:
-- phase: ${{ parameters.name }}
-
-  ${{ if ne(parameters.displayName, '') }}:
-    displayName: ${{ parameters.displayName }}
-
-  ${{ if ne(parameters.condition, '') }}:
-    condition: ${{ parameters.condition }}
-
-  ${{ if ne(parameters.dependsOn, '') }}:
-    dependsOn: ${{ parameters.dependsOn }}
-
-  queue: ${{ parameters.queue }}
-
-  ${{ if ne(parameters.variables, '') }}:
-    variables:
-      ${{ insert }}: ${{ parameters.variables }}
-
-  steps:
-  - checkout: self
-    clean: ${{ parameters.clean }}
-    ${{ if ne(parameters.fetchDepth, '') }}:
-      fetchDepth: ${{ parameters.fetchDepth }}
-
-  - ${{ if eq(parameters.enableTelemetry, 'true') }}:
-    - template: /eng/common/templates/steps/telemetry-start.yml
-      parameters:
-        buildConfig: $(_HelixBuildConfig)
-        helixSource: $(_HelixSource)
-        helixType: $(_HelixType)
-        runAsPublic: ${{ parameters.runAsPublic }}
-
-  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-    # Internal only resource, and Microbuild signing shouldn't be applied to PRs.
-    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: MicroBuildSigningPlugin@2
-        displayName: Install MicroBuild plugin
-        inputs:
-          signType: $(_SignType)
-          zipSources: false
-          feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
-          
-        env:
-          TeamName: $(_TeamName)
-        continueOnError: false
-        condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
-
-  # Run provided build steps
-  - ${{ parameters.steps }}
-
-  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-    # Internal only resources
-    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: MicroBuildCleanup@1
-        displayName: Execute Microbuild cleanup tasks  
-        condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
-        env:
-          TeamName: $(_TeamName)
-
-  - ${{ if eq(parameters.enableTelemetry, 'true') }}:
-    - template: /eng/common/templates/steps/telemetry-end.yml
-      parameters:
-        helixSource: $(_HelixSource)
-        helixType: $(_HelixType)
-
-  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - task: CopyFiles@2
-      displayName: Gather Asset Manifests
-      inputs:
-        SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest'
-        TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
-      continueOnError: false
-      condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
-    - task: PublishBuildArtifacts@1
-      displayName: Push Asset Manifests
-      inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/AssetManifests'
-        PublishLocation: Container
-        ArtifactName: AssetManifests
-      continueOnError: false
-      condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml
deleted file mode 100644
index 4e51e472e2b..00000000000
--- a/eng/common/templates/phases/publish-build-assets.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-parameters:
-  dependsOn: ''
-  queue: {}
-  configuration: 'Debug'
-  condition: succeeded()
-  continueOnError: false
-  runAsPublic: false
-  publishUsingPipelines: false
-phases:
-  - phase: Asset_Registry_Publish
-    displayName: Publish to Build Asset Registry
-    dependsOn: ${{ parameters.dependsOn }}
-    queue: ${{ parameters.queue }}
-    variables:
-      _BuildConfig: ${{ parameters.configuration }}
-    steps:
-      - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-        - task: DownloadBuildArtifacts@0
-          displayName: Download artifact
-          inputs:
-            artifactName: AssetManifests
-            downloadPath: '$(Build.StagingDirectory)/Download'
-            checkDownloadedFiles: true
-          condition: ${{ parameters.condition }}
-          continueOnError: ${{ parameters.continueOnError }}
-        - task: AzureKeyVault@1
-          inputs:
-            azureSubscription: 'DotNet-Engineering-Services_KeyVault'
-            KeyVaultName: EngKeyVault
-            SecretsFilter: 'MaestroAccessToken'
-          condition: ${{ parameters.condition }}
-          continueOnError: ${{ parameters.continueOnError }}
-        - task: PowerShell@2
-          displayName: Publish Build Assets
-          inputs:
-            filePath: eng\common\sdk-task.ps1
-            arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
-              /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
-              /p:BuildAssetRegistryToken=$(MaestroAccessToken)
-              /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
-              /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
-              /p:Configuration=$(_BuildConfig)
-          condition: ${{ parameters.condition }}
-          continueOnError: ${{ parameters.continueOnError }}
-        - task: PublishBuildArtifacts@1
-          displayName: Publish Logs to VSTS
-          inputs:
-            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
-            PublishLocation: Container
-            ArtifactName: $(Agent.Os)_Asset_Registry_Publish
-          continueOnError: true
-          condition: always()
diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml
deleted file mode 100644
index 58fa9a35b8c..00000000000
--- a/eng/common/templates/post-build/channels/generic-internal-channel.yml
+++ /dev/null
@@ -1,184 +0,0 @@
-parameters:
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-  artifactsPublishingAdditionalParameters: ''
-  dependsOn:
-  - Validate
-  publishInstallersAndChecksums: true
-  symbolPublishingAdditionalParameters: ''
-  stageName: ''
-  channelName: ''
-  channelId: ''
-  transportFeed: ''
-  shippingFeed: ''
-  symbolsFeed: ''
-
-stages:
-- stage: ${{ parameters.stageName }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    - template: ../common-variables.yml
-  displayName: ${{ parameters.channelName }} Publishing
-  jobs:
-  - template: ../setup-maestro-vars.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-  - job: publish_symbols
-    displayName: Symbol Publishing
-    dependsOn: setupMaestroVars
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    variables:
-      - group: DotNet-Symbol-Server-Pats
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PdbArtifacts/**
-            BlobArtifacts/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-      # otherwise it'll complain about accessing a private feed.
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
-            /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-            /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-            /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-            /p:Configuration=Release
-            /p:PublishToMSDL=false
-            ${{ parameters.symbolPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'SymbolPublishing'
-
-  - job: publish_assets
-    displayName: Publish Assets
-    dependsOn: setupMaestroVars
-    timeoutInMinutes: 120
-    variables:
-      - name: BARBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      - name: IsStableBuild
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PackageArtifacts/**
-            BlobArtifacts/**
-            AssetManifests/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      - task: NuGetToolInstaller@1
-        displayName: 'Install NuGet.exe'
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish Assets
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
-            /p:PublishingInfraVersion=2
-            /p:IsStableBuild=$(IsStableBuild)
-            /p:IsInternalBuild=$(IsInternalBuild)
-            /p:RepositoryName=$(Build.Repository.Name)
-            /p:CommitSha=$(Build.SourceVersion)
-            /p:NugetPath=$(NuGetExeToolPath)
-            /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
-            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
-            /p:BARBuildId=$(BARBuildId)
-            /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
-            /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
-            /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
-            /p:Configuration=Release
-            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
-            /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
-            /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey)
-            /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
-            /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey)
-            /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
-            /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
-            /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
-            /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:PublishToMSDL=false
-            ${{ parameters.artifactsPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'AssetsPublishing'
-
-      - template: ../../steps/add-build-to-channel.yml
-        parameters:
-          ChannelId: ${{ parameters.channelId }}
diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml
deleted file mode 100644
index b50c0b3bdb8..00000000000
--- a/eng/common/templates/post-build/channels/generic-public-channel.yml
+++ /dev/null
@@ -1,186 +0,0 @@
-parameters:
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-  artifactsPublishingAdditionalParameters: ''
-  dependsOn:
-  - Validate
-  publishInstallersAndChecksums: true
-  symbolPublishingAdditionalParameters: ''
-  stageName: ''
-  channelName: ''
-  channelId: ''
-  transportFeed: ''
-  shippingFeed: ''
-  symbolsFeed: ''
-  # If the channel name is empty, no links will be generated
-  akaMSChannelName: ''
-
-stages:
-- stage: ${{ parameters.stageName }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    - template: ../common-variables.yml
-  displayName: ${{ parameters.channelName }} Publishing
-  jobs:
-  - template: ../setup-maestro-vars.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-  - job: publish_symbols
-    displayName: Symbol Publishing
-    dependsOn: setupMaestroVars
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    variables:
-      - group: DotNet-Symbol-Server-Pats
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PdbArtifacts/**
-            BlobArtifacts/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-      # otherwise it'll complain about accessing a private feed.
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
-            /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-            /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-            /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-            /p:Configuration=Release
-            ${{ parameters.symbolPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'SymbolPublishing'
-
-  - job: publish_assets
-    displayName: Publish Assets
-    dependsOn: setupMaestroVars
-    timeoutInMinutes: 120
-    variables:
-      - name: BARBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      - name: IsStableBuild
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-      - name: ArtifactsCategory
-        value: ${{ coalesce(variables._DotNetArtifactsCategory, '.NETCore') }}
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PackageArtifacts/**
-            BlobArtifacts/**
-            AssetManifests/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      - task: NuGetToolInstaller@1
-        displayName: 'Install NuGet.exe'
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish Assets
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
-            /p:PublishingInfraVersion=2
-            /p:ArtifactsCategory=$(ArtifactsCategory)
-            /p:IsStableBuild=$(IsStableBuild)
-            /p:IsInternalBuild=$(IsInternalBuild)
-            /p:RepositoryName=$(Build.Repository.Name)
-            /p:CommitSha=$(Build.SourceVersion)
-            /p:NugetPath=$(NuGetExeToolPath)
-            /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
-            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
-            /p:BARBuildId=$(BARBuildId)
-            /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
-            /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
-            /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
-            /p:Configuration=Release
-            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
-            /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
-            /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
-            /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
-            /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
-            /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
-            /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
-            /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
-            /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:LatestLinkShortUrlPrefix=dotnet/'${{ parameters.akaMSChannelName }}'
-            /p:AkaMSClientId=$(akams-client-id)
-            /p:AkaMSClientSecret=$(akams-client-secret)
-            ${{ parameters.artifactsPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'AssetsPublishing'
-
-      - template: ../../steps/add-build-to-channel.yml
-        parameters:
-          ChannelId: ${{ parameters.channelId }}
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index c99fd750376..1ac7f49a43c 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -4,54 +4,6 @@ variables:
   - group: DotNet-DotNetCli-Storage
   - group: DotNet-MSRC-Storage
   - group: Publish-Build-Assets
-    
-  # .NET Core 3.1 Dev
-  - name: PublicDevRelease_31_Channel_Id
-    value: 128
-
-  # .NET 5 Dev
-  - name: Net_5_Dev_Channel_Id
-    value: 131
-
-  # .NET Eng - Validation
-  - name: Net_Eng_Validation_Channel_Id
-    value: 9
-
-  # .NET Eng - Latest
-  - name: Net_Eng_Latest_Channel_Id
-    value: 2
-
-  # .NET 3 Eng - Validation
-  - name: NET_3_Eng_Validation_Channel_Id
-    value: 390
-
-  # .NET 3 Eng
-  - name: NetCore_3_Tools_Channel_Id
-    value: 344
-
-  # .NET Core 3.0 Internal Servicing
-  - name: InternalServicing_30_Channel_Id
-    value: 184
-
-  # .NET Core 3.0 Release
-  - name: PublicRelease_30_Channel_Id
-    value: 19
-
-  # .NET Core 3.1 Release
-  - name: PublicRelease_31_Channel_Id
-    value: 129
-
-  # General Testing
-  - name: GeneralTesting_Channel_Id
-    value: 529
-
-  # .NET Core 3.1 Blazor Features
-  - name: NetCore_31_Blazor_Features_Channel_Id
-    value: 531
-
-  # .NET Core Experimental
-  - name: NetCore_Experimental_Channel_Id
-    value: 562
 
   # Whether the build is internal or not
   - name: IsInternalBuild
@@ -70,30 +22,5 @@ variables:
   - name: SymbolToolVersion
     value: 1.0.1
 
-  # Feed Configurations
-  # These should include the suffix "/index.json"
-
-  # Default locations for Installers and checksums
-  # Public Locations
-  - name: ChecksumsBlobFeedUrl
-    value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json
-  - name: InstallersBlobFeedUrl
-    value: https://dotnetcli.blob.core.windows.net/dotnet/index.json
-
-  # Private Locations
-  - name: InternalChecksumsBlobFeedUrl
-    value: https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json
-  - name: InternalChecksumsBlobFeedKey
-    value: $(dotnetclichecksumsmsrc-storage-key)
-
-  - name: InternalInstallersBlobFeedUrl
-    value: https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json
-  - name: InternalInstallersBlobFeedKey
-    value: $(dotnetclimsrc-access-key)
-
-  # Skip component governance and codesign validation for SDL. These jobs
-  # create no content.
-  - name: skipComponentGovernanceDetection
-    value: true
   - name: runCodesignValidationInjection
     value: false
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 4f79cf0f337..2f176571f02 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -1,113 +1,114 @@
 parameters:
- # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
-  # Publishing V2 accepts optionally outlining the publishing stages - default is inline.
-  # Publishing V3 DOES NOT accept inlining the publishing stages.
-  publishingInfraVersion: 2
-  # When set to true the publishing templates from the repo will be used
-  # otherwise Darc add-build-to-channel will be used to trigger the promotion pipeline
-  inline: true
-
-  # Only used if inline==false. When set to true will stall the current build until
-  # the Promotion Pipeline build finishes. Otherwise, the current build will continue 
-  # execution concurrently with the promotion build.
-  waitPublishingFinish: true
-
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-
-  enableSourceLinkValidation: false
-  enableSigningValidation: true
-  enableSymbolValidation: false
-  enableNugetValidation: true
-  publishInstallersAndChecksums: true
-  SDLValidationParameters:
-    enable: false
-    continueOnError: false
-    params: ''
-    artifactNames: ''
-    downloadArtifacts: true
+  # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
+  # Publishing V1 is no longer supported
+  # Publishing V2 is no longer supported
+  # Publishing V3 is the default
+  - name: publishingInfraVersion
+    displayName: Which version of publishing should be used to promote the build definition?
+    type: number
+    default: 3
+    values:
+    - 3
+
+  - name: BARBuildId
+    displayName: BAR Build Id
+    type: number
+    default: 0
+
+  - name: PromoteToChannelIds
+    displayName: Channel to promote BARBuildId to
+    type: string
+    default: ''
+
+  - name: enableSourceLinkValidation
+    displayName: Enable SourceLink validation
+    type: boolean
+    default: false
+
+  - name: enableSigningValidation
+    displayName: Enable signing validation
+    type: boolean
+    default: true
+
+  - name: enableSymbolValidation
+    displayName: Enable symbol validation
+    type: boolean
+    default: false
+
+  - name: enableNugetValidation
+    displayName: Enable NuGet validation
+    type: boolean
+    default: true
+    
+  - name: publishInstallersAndChecksums
+    displayName: Publish installers and checksums
+    type: boolean
+    default: true
+
+  - name: SDLValidationParameters
+    type: object
+    default:
+      enable: false
+      continueOnError: false
+      params: ''
+      artifactNames: ''
+      downloadArtifacts: true
 
   # These parameters let the user customize the call to sdk-task.ps1 for publishing
   # symbols & general artifacts as well as for signing validation
-  symbolPublishingAdditionalParameters: ''
-  artifactsPublishingAdditionalParameters: ''
-  signingValidationAdditionalParameters: ''
+  - name: symbolPublishingAdditionalParameters
+    displayName: Symbol publishing additional parameters
+    type: string
+    default: ''
+
+  - name: artifactsPublishingAdditionalParameters
+    displayName: Artifact publishing additional parameters
+    type: string
+    default: ''
+
+  - name: signingValidationAdditionalParameters
+    displayName: Signing validation additional parameters
+    type: string
+    default: ''
 
   # Which stages should finish execution before post-build stages start
-  validateDependsOn:
-  - build
-  publishDependsOn: 
-  - Validate
+  - name: validateDependsOn
+    type: object
+    default:
+    - build
 
-  # Channel ID's instantiated in this file.
-  # When adding a new channel implementation the call to `check-channel-consistency.ps1` 
-  # needs to be updated with the new channel ID
-  NetEngLatestChannelId: 2
-  NetEngValidationChannelId: 9
-  NetDev5ChannelId: 131
-  NetDev6ChannelId: 1296
-  GeneralTestingChannelId: 529
-  NETCoreToolingDevChannelId: 548
-  NETCoreToolingReleaseChannelId: 549
-  NETInternalToolingChannelId: 551
-  NETCoreExperimentalChannelId: 562
-  NetEngServicesIntChannelId: 678
-  NetEngServicesProdChannelId: 679
-  NetCoreSDK313xxChannelId: 759
-  NetCoreSDK313xxInternalChannelId: 760
-  NetCoreSDK314xxChannelId: 921
-  NetCoreSDK314xxInternalChannelId: 922
-  VS166ChannelId: 1010
-  VS167ChannelId: 1011
-  VS168ChannelId: 1154
-  VSMasterChannelId: 1012
-  VS169ChannelId: 1473
-  VS1610ChannelId: 1692
+  - name: publishDependsOn
+    type: object
+    default:
+    - Validate
 
 stages:
-- ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
   - stage: Validate
     dependsOn: ${{ parameters.validateDependsOn }}
     displayName: Validate Build Assets
     variables:
       - template: common-variables.yml
     jobs:
-    - template: setup-maestro-vars.yml
-      parameters:
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-    - ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
-      - job:
-        displayName: Post-build Checks
-        dependsOn: setupMaestroVars
-        variables:
-          - name: TargetChannels
-            value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ]
-        pool:
-          vmImage: 'windows-2019'
-        steps:
-          - task: PowerShell@2
-            displayName: Maestro Channels Consistency
-            inputs:
-              filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
-              arguments: -PromoteToChannels "$(TargetChannels)"
-                -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}}
-
     - job:
       displayName: NuGet Validation
-      dependsOn: setupMaestroVars
       condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
       pool:
-        vmImage: 'windows-2019'
-      variables:
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+
       steps:
+        - template: setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
         - task: DownloadBuildArtifacts@0
           displayName: Download Package Artifacts
           inputs:
@@ -128,19 +129,22 @@ stages:
 
     - job:
       displayName: Signing Validation
-      dependsOn: setupMaestroVars
       condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
-      variables:
-        - template: common-variables.yml
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
       pool:
-        vmImage: 'windows-2019'
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
+        - template: setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
         - task: DownloadBuildArtifacts@0
           displayName: Download Package Artifacts
           inputs:
@@ -185,19 +189,22 @@ stages:
 
     - job:
       displayName: SourceLink Validation
-      dependsOn: setupMaestroVars
       condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
-      variables:
-        - template: common-variables.yml
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
       pool:
-        vmImage: 'windows-2019'
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
+        - template: setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
         - task: DownloadBuildArtifacts@0
           displayName: Download Blob Artifacts
           inputs:
@@ -223,367 +230,48 @@ stages:
     - template: /eng/common/templates/job/execute-sdl.yml
       parameters:
         enable: ${{ parameters.SDLValidationParameters.enable }}
-        dependsOn: setupMaestroVars
         additionalParameters: ${{ parameters.SDLValidationParameters.params }}
         continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
         artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
         downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }}
 
-- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}:
-  - stage: publish_using_darc
-    ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
-      dependsOn: ${{ parameters.publishDependsOn }}
-    ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
-      dependsOn: ${{ parameters.validateDependsOn }}
-    displayName: Publish using Darc
-    variables:
-      - template: common-variables.yml
-    jobs:
-    - template: setup-maestro-vars.yml
-      parameters:
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-    - job:
-      displayName: Publish Using Darc
-      dependsOn: setupMaestroVars
-      timeoutInMinutes: 120
-      variables:
-        - name: BARBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      pool:
-        vmImage: 'windows-2019'
-      steps:
-        - task: PowerShell@2
-          displayName: Publish Using Darc
-          inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
-            arguments: -BuildId $(BARBuildId) 
-              -PublishingInfraVersion ${{ parameters.PublishingInfraVersion }}
-              -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-              -MaestroToken '$(MaestroApiAccessToken)'
-              -WaitPublishingFinish ${{ parameters.waitPublishingFinish }}
-              -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
-              -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-              -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-
-- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NetCore_Dev5_Publish'
-      channelName: '.NET 5 Dev'
-      akaMSChannelName: 'net5/dev'
-      channelId: ${{ parameters.NetDev5ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NetCore_Dev6_Publish'
-      channelName: '.NET 6 Dev'
-      akaMSChannelName: 'net6/dev'
-      channelId: ${{ parameters.NetDev6ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Latest_Publish'
-      channelName: '.NET Eng - Latest'
-      akaMSChannelName: 'eng/daily'
-      channelId: ${{ parameters.NetEngLatestChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Validation_Publish'
-      channelName: '.NET Eng - Validation'
-      akaMSChannelName: 'eng/validation'
-      channelId: ${{ parameters.NetEngValidationChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'General_Testing_Publish'
-      channelName: 'General Testing'
-      akaMSChannelName: 'generaltesting'
-      channelId: ${{ parameters.GeneralTestingChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Tooling_Dev_Publishing'
-      channelName: '.NET Core Tooling Dev'
-      channelId: ${{ parameters.NETCoreToolingDevChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Tooling_Release_Publishing'
-      channelName: '.NET Core Tooling Release'
-      channelId: ${{ parameters.NETCoreToolingReleaseChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NET_Internal_Tooling_Publishing'
-      channelName: '.NET Internal Tooling'
-      channelId: ${{ parameters.NETInternalToolingChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Experimental_Publishing'
-      channelName: '.NET Core Experimental'
-      channelId: ${{ parameters.NETCoreExperimentalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Services_Int_Publish'
-      channelName: '.NET Eng Services - Int'
-      channelId: ${{ parameters.NetEngServicesIntChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Services_Prod_Publish'
-      channelName: '.NET Eng Services - Prod'
-      channelId: ${{ parameters.NetEngServicesProdChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_314xx_Publishing'
-      channelName: '.NET Core SDK 3.1.4xx'
-      channelId: ${{ parameters.NetCoreSDK314xxChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_314xx_Internal_Publishing'
-      channelName: '.NET Core SDK 3.1.4xx Internal'
-      channelId: ${{ parameters.NetCoreSDK314xxInternalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' 
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_313xx_Publishing'
-      channelName: '.NET Core SDK 3.1.3xx'
-      channelId: ${{ parameters.NetCoreSDK313xxChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_313xx_Internal_Publishing'
-      channelName: '.NET Core SDK 3.1.3xx Internal'
-      channelId: ${{ parameters.NetCoreSDK313xxInternalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' 
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_6_Publishing'
-      channelName: 'VS 16.6'
-      channelId: ${{ parameters.VS166ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_7_Publishing'
-      channelName: 'VS 16.7'
-      channelId: ${{ parameters.VS167ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-      
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_8_Publishing'
-      channelName: 'VS 16.8'
-      channelId: ${{ parameters.VS168ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_Master_Publishing'
-      channelName: 'VS Master'
-      channelId: ${{ parameters.VSMasterChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_16_9_Publishing'
-      channelName: 'VS 16.9'
-      channelId: ${{ parameters.VS169ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_16_10_Publishing'
-      channelName: 'VS 16.10'
-      channelId: ${{ parameters.VS1610ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+- stage: publish_using_darc
+  ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+    dependsOn: ${{ parameters.publishDependsOn }}
+  ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
+    dependsOn: ${{ parameters.validateDependsOn }}
+  displayName: Publish using Darc
+  variables:
+    - template: common-variables.yml
+  jobs:
+  - job:
+    displayName: Publish Using Darc
+    timeoutInMinutes: 120
+    pool:
+      # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
+    steps:
+      - template: setup-maestro-vars.yml
+        parameters:
+          BARBuildId: ${{ parameters.BARBuildId }}
+          PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
+      - task: NuGetAuthenticate@0
+
+      - task: PowerShell@2
+        displayName: Publish Using Darc
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+          arguments: -BuildId $(BARBuildId) 
+            -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
+            -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
+            -MaestroToken '$(MaestroApiAccessToken)'
+            -WaitPublishingFinish true
+            -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
+            -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
\ No newline at end of file
diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml
index 4a22b2e6f6d..0c87f149a4a 100644
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
@@ -2,77 +2,69 @@ parameters:
   BARBuildId: ''
   PromoteToChannelIds: ''
 
-jobs:
-- job: setupMaestroVars
-  displayName: Setup Maestro Vars
-  variables:
-    - template: common-variables.yml
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-    - checkout: none
-
-    - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Release Configs
-        inputs:
-          buildType: current
-          artifactName: ReleaseConfigs
-          checkDownloadedFiles: true
-
-    - task: PowerShell@2
-      name: setReleaseVars
-      displayName: Set Release Configs Vars
+steps:
+  - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
+    - task: DownloadBuildArtifacts@0
+      displayName: Download Release Configs
       inputs:
-        targetType: inline
-        script: |
-          try {
-            if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
-              $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
+        buildType: current
+        artifactName: ReleaseConfigs
+        checkDownloadedFiles: true
 
-              $BarId = $Content | Select -Index 0
-              $Channels = $Content | Select -Index 1             
-              $IsStableBuild = $Content | Select -Index 2
+  - task: PowerShell@2
+    name: setReleaseVars
+    displayName: Set Release Configs Vars
+    inputs:
+      targetType: inline
+      pwsh: true
+      script: |
+        try {
+          if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
+            $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
 
-              $AzureDevOpsProject = $Env:System_TeamProject
-              $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId
-              $AzureDevOpsBuildId = $Env:Build_BuildId
-            }
-            else {
-              $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
+            $BarId = $Content | Select -Index 0
+            $Channels = $Content | Select -Index 1             
+            $IsStableBuild = $Content | Select -Index 2
 
-              $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
-              $apiHeaders.Add('Accept', 'application/json')
-              $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
-
-              $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-             
-              $BarId = $Env:BARBuildId
-              $Channels = $Env:PromoteToMaestroChannels -split ","
-              $Channels = $Channels -join "]["
-              $Channels = "[$Channels]"
+            $AzureDevOpsProject = $Env:System_TeamProject
+            $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId
+            $AzureDevOpsBuildId = $Env:Build_BuildId
+          }
+          else {
+            $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
 
-              $IsStableBuild = $buildInfo.stable
-              $AzureDevOpsProject = $buildInfo.azureDevOpsProject
-              $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
-              $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
-            }
+            $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
+            $apiHeaders.Add('Accept', 'application/json')
+            $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
 
-            Write-Host "##vso[task.setvariable variable=BARBuildId;isOutput=true]$BarId"
-            Write-Host "##vso[task.setvariable variable=TargetChannels;isOutput=true]$Channels"
-            Write-Host "##vso[task.setvariable variable=IsStableBuild;isOutput=true]$IsStableBuild"
+            $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
+            
+            $BarId = $Env:BARBuildId
+            $Channels = $Env:PromoteToMaestroChannels -split ","
+            $Channels = $Channels -join "]["
+            $Channels = "[$Channels]"
 
-            Write-Host "##vso[task.setvariable variable=AzDOProjectName;isOutput=true]$AzureDevOpsProject"
-            Write-Host "##vso[task.setvariable variable=AzDOPipelineId;isOutput=true]$AzureDevOpsBuildDefinitionId"
-            Write-Host "##vso[task.setvariable variable=AzDOBuildId;isOutput=true]$AzureDevOpsBuildId"
+            $IsStableBuild = $buildInfo.stable
+            $AzureDevOpsProject = $buildInfo.azureDevOpsProject
+            $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
+            $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
           }
-          catch {
-            Write-Host $_
-            Write-Host $_.Exception
-            Write-Host $_.ScriptStackTrace
-            exit 1
-          }
-      env:
-        MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
+
+          Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId"
+          Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels"
+          Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild"
+
+          Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject"
+          Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId"
+          Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId"
+        }
+        catch {
+          Write-Host $_
+          Write-Host $_.Exception
+          Write-Host $_.ScriptStackTrace
+          exit 1
+        }
+    env:
+      MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
+      BARBuildId: ${{ parameters.BARBuildId }}
+      PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
diff --git a/eng/common/templates/steps/execute-codeql.yml b/eng/common/templates/steps/execute-codeql.yml
new file mode 100644
index 00000000000..3930b163021
--- /dev/null
+++ b/eng/common/templates/steps/execute-codeql.yml
@@ -0,0 +1,32 @@
+parameters:
+  # Language that should be analyzed. Defaults to csharp
+  language: csharp
+  # Build Commands
+  buildCommands: ''
+  overrideParameters: ''                                       # Optional: to override values for parameters.
+  additionalParameters: ''                                     # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
+  # Optional: if specified, restore and use this version of Guardian instead of the default.
+  overrideGuardianVersion: ''
+  # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth
+  # diagnosis of problems with specific tool configurations.
+  publishGuardianDirectoryToPipeline: false
+  # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL
+  # parameters rather than relying on YAML. It may be better to use a local script, because you can
+  # reproduce results locally without piecing together a command based on the YAML.
+  executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1'
+  # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
+  # 'continueOnError', the parameter value is not correctly picked up.
+  # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
+  # optional: determines whether to continue the build if the step errors;
+  sdlContinueOnError: false
+
+steps:
+- template: /eng/common/templates/steps/execute-sdl.yml
+  parameters:
+    overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
+    executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
+    overrideParameters: ${{ parameters.overrideParameters }}
+    additionalParameters: '${{ parameters.additionalParameters }}
+      -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")'
+    publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
+    sdlContinueOnError: ${{ parameters.sdlContinueOnError }}
\ No newline at end of file
diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml
new file mode 100644
index 00000000000..7b8ee18a28d
--- /dev/null
+++ b/eng/common/templates/steps/execute-sdl.yml
@@ -0,0 +1,68 @@
+parameters:
+  overrideGuardianVersion: ''
+  executeAllSdlToolsScript: ''
+  overrideParameters: ''
+  additionalParameters: ''
+  publishGuardianDirectoryToPipeline: false
+  sdlContinueOnError: false
+  condition: ''
+
+steps:
+- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
+  - powershell: |
+      $content = Get-Content $(GuardianPackagesConfigFile)
+
+      Write-Host "packages.config content was:`n$content"
+
+      $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
+      $content | Set-Content $(GuardianPackagesConfigFile)
+
+      Write-Host "packages.config content updated to:`n$content"
+    displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
+
+- task: NuGetToolInstaller@1
+  displayName: 'Install NuGet.exe'
+  
+- task: NuGetCommand@2
+  displayName: 'Install Guardian'
+  inputs:
+    restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+    feedsToUse: config
+    nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
+    externalFeedCredentials: GuardianConnect
+    restoreDirectory: $(Build.SourcesDirectory)\.packages
+
+- ${{ if ne(parameters.overrideParameters, '') }}:
+  - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
+    displayName: Execute SDL
+    continueOnError: ${{ parameters.sdlContinueOnError }}
+    condition: ${{ parameters.condition }}
+
+- ${{ if eq(parameters.overrideParameters, '') }}:
+  - powershell: ${{ parameters.executeAllSdlToolsScript }}
+      -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
+      -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
+      -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
+      ${{ parameters.additionalParameters }}
+    displayName: Execute SDL
+    continueOnError: ${{ parameters.sdlContinueOnError }}
+    condition: ${{ parameters.condition }}
+
+- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
+  # We want to publish the Guardian results and configuration for easy diagnosis. However, the
+  # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
+  # tooling files. Some of these files are large and aren't useful during an investigation, so
+  # exclude them by simply deleting them before publishing. (As of writing, there is no documented
+  # way to selectively exclude a dir from the pipeline artifact publish task.)
+  - task: DeleteFiles@1
+    displayName: Delete Guardian dependencies to avoid uploading
+    inputs:
+      SourceFolder: $(Agent.BuildDirectory)/.gdn
+      Contents: |
+        c
+        i
+    condition: succeededOrFailed()
+  - publish: $(Agent.BuildDirectory)/.gdn
+    artifact: GuardianConfiguration
+    displayName: Publish GuardianConfiguration
+    condition: succeededOrFailed()
\ No newline at end of file
diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml
index cd02ae1607f..09a223989f7 100644
--- a/eng/common/templates/steps/send-to-helix.yml
+++ b/eng/common/templates/steps/send-to-helix.yml
@@ -20,7 +20,6 @@ parameters:
   IncludeDotNetCli: false                # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
   DotNetCliPackageType: ''               # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
   DotNetCliVersion: ''                   # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
-  EnableXUnitReporter: false             # optional -- true enables XUnit result reporting to Mission Control
   WaitForWorkItemCompletion: true        # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
   IsExternal: false                      # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
   HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting int)
@@ -54,7 +53,6 @@ steps:
       IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
       DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
       DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
-      EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
       WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
       HelixBaseUri: ${{ parameters.HelixBaseUri }}
       Creator: ${{ parameters.Creator }}
@@ -85,7 +83,6 @@ steps:
       IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
       DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
       DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
-      EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
       WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
       HelixBaseUri: ${{ parameters.HelixBaseUri }}
       Creator: ${{ parameters.Creator }}
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 65ee5992bf4..12a8ff94d8e 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -18,6 +18,35 @@ steps:
     set -x
     df -h
 
+    # If building on the internal project, the artifact feeds variable may be available (usually only if needed)
+    # In that case, call the feed setup script to add internal feeds corresponding to public ones.
+    # In addition, add an msbuild argument to copy the WIP from the repo to the target build location.
+    # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those
+    # changes.
+    internalRestoreArgs=
+    if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then
+      # Temporarily work around https://github.com/dotnet/arcade/issues/7709
+      chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+      $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw)
+      internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true'
+
+      # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo.
+      # This only works if there is a username/email configured, which won't be the case in most CI runs.
+      git config --get user.email
+      if [ $? -ne 0 ]; then
+        git config user.email dn-bot@microsoft.com
+        git config user.name dn-bot
+      fi
+    fi
+
+    # If building on the internal project, the internal storage variable may be available (usually only if needed)
+    # In that case, add variables to allow the download of internal runtimes if the specified versions are not found
+    # in the default public locations.
+    internalRuntimeDownloadArgs=
+    if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
+      internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
+    fi
+
     buildConfig=Release
     # Check if AzDO substitutes in a build config from a variable, and use it if so.
     if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then
@@ -34,10 +63,17 @@ steps:
       targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
     fi
 
+    publishArgs=
+    if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
+      publishArgs='--publish'
+    fi
+
     ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
       --configuration $buildConfig \
-      --restore --build --pack --publish -bl \
+      --restore --build --pack $publishArgs -bl \
       $officialBuildArgs \
+      $internalRuntimeDownloadArgs \
+      $internalRestoreArgs \
       $targetRidArgs \
       /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
       /p:ArcadeBuildFromSource=true
diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml
new file mode 100644
index 00000000000..dbdd66d4a4b
--- /dev/null
+++ b/eng/common/templates/variables/sdl-variables.yml
@@ -0,0 +1,7 @@
+variables:
+# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
+# sync with the packages.config file.
+- name: DefaultGuardianVersion
+  value: 0.109.0
+- name: GuardianPackagesConfigFile
+  value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
\ No newline at end of file
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index d52467eea11..f1e1cb53953 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -42,12 +42,15 @@
 [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dot.net/v1/dotnet-install.ps1
+#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
 [bool]$useGlobalNuGetCache = if (Test-Path variable:useGlobalNuGetCache) { $useGlobalNuGetCache } else { !$ci }
 
+# True to exclude prerelease versions Visual Studio during build
+[bool]$excludePrereleaseVS = if (Test-Path variable:excludePrereleaseVS) { $excludePrereleaseVS } else { $false }
+
 # An array of names of processes to stop on script exit if prepareMachine is true.
 $processesToStopOnExit = if (Test-Path variable:processesToStopOnExit) { $processesToStopOnExit } else { @('msbuild', 'dotnet', 'vbcscompiler') }
 
@@ -103,6 +106,46 @@ function Exec-Process([string]$command, [string]$commandArgs) {
   }
 }
 
+# Take the given block, print it, print what the block probably references from the current set of
+# variables using low-effort string matching, then run the block.
+#
+# This is intended to replace the pattern of manually copy-pasting a command, wrapping it in quotes,
+# and printing it using "Write-Host". The copy-paste method is more readable in build logs, but less
+# maintainable and less reliable. It is easy to make a mistake and modify the command without
+# properly updating the "Write-Host" line, resulting in misleading build logs. The probability of
+# this mistake makes the pattern hard to trust when it shows up in build logs. Finding the bug in
+# existing source code can also be difficult, because the strings are not aligned to each other and
+# the line may be 300+ columns long.
+#
+# By removing the need to maintain two copies of the command, Exec-BlockVerbosely avoids the issues.
+#
+# In Bash (or any posix-like shell), "set -x" prints usable verbose output automatically.
+# "Set-PSDebug" appears to be similar at first glance, but unfortunately, it isn't very useful: it
+# doesn't print any info about the variables being used by the command, which is normally the
+# interesting part to diagnose.
+function Exec-BlockVerbosely([scriptblock] $block) {
+  Write-Host "--- Running script block:"
+  $blockString = $block.ToString().Trim()
+  Write-Host $blockString
+
+  Write-Host "--- List of variables that might be used:"
+  # For each variable x in the environment, check the block for a reference to x via simple "$x" or
+  # "@x" syntax. This doesn't detect other ways to reference variables ("${x}" nor "$variable:x",
+  # among others). It only catches what this function was originally written for: simple
+  # command-line commands.
+  $variableTable = Get-Variable |
+    Where-Object {
+      $blockString.Contains("`$$($_.Name)") -or $blockString.Contains("@$($_.Name)")
+    } |
+    Format-Table -AutoSize -HideTableHeaders -Wrap |
+    Out-String
+  Write-Host $variableTable.Trim()
+
+  Write-Host "--- Executing:"
+  & $block
+  Write-Host "--- Done running script block!"
+}
+
 # createSdkLocationFile parameter enables a file being generated under the toolset directory
 # which writes the sdk's location into. This is only necessary for cmd --> powershell invocations
 # as dot sourcing isn't possible.
@@ -190,38 +233,42 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   return $global:_DotNetInstallDir = $dotnetRoot
 }
 
+function Retry($downloadBlock, $maxRetries = 5) {
+  $retries = 1
+
+  while($true) {
+    try {
+      & $downloadBlock
+      break
+    }
+    catch {
+      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
+    }
+
+    if (++$retries -le $maxRetries) {
+      $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
+      Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
+      Start-Sleep -Seconds $delayInSeconds
+    }
+    else {
+      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts."
+      break
+    }
+
+  }
+}
+
 function GetDotNetInstallScript([string] $dotnetRoot) {
   $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1'
   if (!(Test-Path $installScript)) {
     Create-Directory $dotnetRoot
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
+    $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
 
-    $maxRetries = 5
-    $retries = 1
-
-    $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1"
-
-    while($true) {
-      try {
-        Write-Host "GET $uri"
-        Invoke-WebRequest $uri -OutFile $installScript
-        break
-      }
-      catch {
-        Write-Host "Failed to download '$uri'"
-        Write-Error $_.Exception.Message -ErrorAction Continue
-      }
-
-      if (++$retries -le $maxRetries) {
-        $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
-        Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
-        Start-Sleep -Seconds $delayInSeconds
-      }
-      else {
-        throw "Unable to download file in $maxRetries attempts."
-      }
-
-    }
+    Retry({
+      Write-Host "GET $uri"
+      Invoke-WebRequest $uri -OutFile $installScript
+    })
   }
 
   return $installScript
@@ -251,32 +298,45 @@ function InstallDotNet([string] $dotnetRoot,
   if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles }
   if ($noPath) { $installParameters.NoPath = $True }
 
-  try {
-    & $installScript @installParameters
-  }
-  catch {
-    if ($runtimeSourceFeed -or $runtimeSourceFeedKey) {
-      Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'"
-      if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed }
+  $variations = @()
+  $variations += @($installParameters)
 
-      if ($runtimeSourceFeedKey) {
-        $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
-        $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
-        $installParameters.FeedCredential = $decodedString
-      }
+  $dotnetBuilds = $installParameters.Clone()
+  $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
+  $variations += @($dotnetBuilds)
 
-      try {
-        & $installScript @installParameters
-      }
-      catch {
-        Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'."
-        ExitWithExitCode 1
-      }
+  if ($runtimeSourceFeed) {
+    $runtimeSource = $installParameters.Clone()
+    $runtimeSource.AzureFeed = $runtimeSourceFeed
+    if ($runtimeSourceFeedKey) {
+      $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
+      $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
+      $runtimeSource.FeedCredential = $decodedString
+    }
+    $variations += @($runtimeSource)
+  }
+
+  $installSuccess = $false
+  foreach ($variation in $variations) {
+    if ($variation | Get-Member AzureFeed) {
+      $location = $variation.AzureFeed
     } else {
-      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location."
-      ExitWithExitCode 1
+      $location = "public location";
+    }
+    Write-Host "Attempting to install dotnet from $location."
+    try {
+      & $installScript @variation
+      $installSuccess = $true
+      break
+    }
+    catch {
+      Write-Host "Failed to install dotnet from $location."
     }
   }
+  if (-not $installSuccess) {
+    Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations."
+    ExitWithExitCode 1
+  }
 }
 
 #
@@ -305,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
   # If the version of msbuild is going to be xcopied,
   # use this version. Version matches a package here:
-  # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.8.0-preview3&view=overview
-  $defaultXCopyMSBuildVersion = '16.8.0-preview3'
+  # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.10.0-preview2&view=overview
+  $defaultXCopyMSBuildVersion = '16.10.0-preview2'
 
   if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
   $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr }
@@ -371,7 +431,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
   }
 
   $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
-  return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
+
+  $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
+  $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
+  if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
+    $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
+  } else {
+    $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
+  }
+
+  return $global:_MSBuildExe
 }
 
 function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {
@@ -400,9 +469,13 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
     }
 
     Create-Directory $packageDir
+
     Write-Host "Downloading $packageName $packageVersion"
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
-    Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
+    Retry({
+      Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
+    })
+
     Unzip $packagePath $packageDir
   }
 
@@ -439,31 +512,17 @@ function LocateVisualStudio([object]$vsRequirements = $null){
   if (!(Test-Path $vsWhereExe)) {
     Create-Directory $vsWhereDir
     Write-Host 'Downloading vswhere'
-    $maxRetries = 5
-    $retries = 1
-
-    while($true) {
-      try {
-        Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
-        break
-      }
-      catch{
-        Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
-      }
-
-      if (++$retries -le $maxRetries) {
-        $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
-        Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
-        Start-Sleep -Seconds $delayInSeconds
-      }
-      else {
-        Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts."
-      }
-    }
+    Retry({
+      Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
+    })
   }
 
   if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
-  $args = @('-latest', '-prerelease', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
+  $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
+
+  if (!$excludePrereleaseVS) {
+    $args += '-prerelease'
+  }
 
   if (Get-Member -InputObject $vsRequirements -Name 'version') {
     $args += '-version'
@@ -489,7 +548,13 @@ function LocateVisualStudio([object]$vsRequirements = $null){
 
 function InitializeBuildTool() {
   if (Test-Path variable:global:_BuildTool) {
-    return $global:_BuildTool
+    # If the requested msbuild parameters do not match, clear the cached variables.
+    if($global:_BuildTool.Contains('ExcludePrereleaseVS') -and $global:_BuildTool.ExcludePrereleaseVS -ne $excludePrereleaseVS) {
+      Remove-Item variable:global:_BuildTool
+      Remove-Item variable:global:_MSBuildExe
+    } else {
+      return $global:_BuildTool
+    }
   }
 
   if (-not $msbuildEngine) {
@@ -517,7 +582,7 @@ function InitializeBuildTool() {
       ExitWithExitCode 1
     }
 
-    $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472" }
+    $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472"; ExcludePrereleaseVS = $excludePrereleaseVS }
   } else {
     Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'."
     ExitWithExitCode 1
@@ -542,7 +607,7 @@ function GetDefaultMSBuildEngine() {
 
 function GetNuGetPackageCachePath() {
   if ($env:NUGET_PACKAGES -eq $null) {
-    # Use local cache on CI to ensure deterministic build. 
+    # Use local cache on CI to ensure deterministic build.
     # Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116
     # use global cache in dev builds to avoid cost of downloading packages.
     # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968
@@ -620,6 +685,17 @@ function ExitWithExitCode([int] $exitCode) {
   exit $exitCode
 }
 
+# Check if $LASTEXITCODE is a nonzero exit code (NZEC). If so, print a Azure Pipeline error for
+# diagnostics, then exit the script with the $LASTEXITCODE.
+function Exit-IfNZEC([string] $category = "General") {
+  Write-Host "Exit code $LASTEXITCODE"
+  if ($LASTEXITCODE -ne 0) {
+    $message = "Last command failed with exit code $LASTEXITCODE."
+    Write-PipelineTelemetryError -Force -Category $category -Message $message
+    ExitWithExitCode $LASTEXITCODE
+  }
+}
+
 function Stop-Processes() {
   Write-Host 'Killing running build processes...'
   foreach ($processName in $processesToStopOnExit) {
@@ -643,6 +719,8 @@ function MSBuild() {
       Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20'
     }
 
+    Enable-Nuget-EnhancedRetry
+
     $toolsetBuildProject = InitializeToolset
     $basePath = Split-Path -parent $toolsetBuildProject
     $possiblePaths = @(
@@ -651,6 +729,8 @@ function MSBuild() {
       (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
       (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
       (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
+      (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
+      (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
     )
     $selectedPath = $null
     foreach ($path in $possiblePaths) {
@@ -687,6 +767,8 @@ function MSBuild-Core() {
     }
   }
 
+  Enable-Nuget-EnhancedRetry
+
   $buildTool = InitializeBuildTool
 
   $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
@@ -699,7 +781,10 @@ function MSBuild-Core() {
   }
 
   foreach ($arg in $args) {
-    if ($arg -ne $null -and $arg.Trim() -ne "") {
+    if ($null -ne $arg -and $arg.Trim() -ne "") {
+      if ($arg.EndsWith('\')) {
+        $arg = $arg + "\"
+      }
       $cmdArgs += " `"$arg`""
     }
   }
@@ -771,7 +856,7 @@ function Get-Darc($version) {
 
 . $PSScriptRoot\pipeline-logging-functions.ps1
 
-$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..')
+$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..\')
 $EngRoot = Resolve-Path (Join-Path $PSScriptRoot '..')
 $ArtifactsDir = Join-Path $RepoRoot 'artifacts'
 $ToolsetDir = Join-Path $ArtifactsDir 'toolset'
@@ -806,3 +891,18 @@ if (!$disableConfigureToolsetImport) {
     }
   }
 }
+
+#
+# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
+#
+function Enable-Nuget-EnhancedRetry() {
+    if ($ci) {
+      Write-Host "Setting NUGET enhanced retry environment variables"
+      $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true'
+      $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6
+      $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000
+      Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true'
+      Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6'
+      Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
+    }
+}
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 5fad1846e5a..17f0a365805 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
 use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dot.net/v1/dotnet-install.sh
+#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
 dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -178,7 +178,7 @@ function InstallDotNetSdk {
   if [[ $# -ge 3 ]]; then
     architecture=$3
   fi
-  InstallDotNet "$root" "$version" $architecture 'sdk' 'false' $runtime_source_feed $runtime_source_feed_key
+  InstallDotNet "$root" "$version" $architecture 'sdk' 'true' $runtime_source_feed $runtime_source_feed_key
 }
 
 function InstallDotNet {
@@ -188,28 +188,29 @@ function InstallDotNet {
   GetDotNetInstallScript "$root"
   local install_script=$_GetDotNetInstallScript
 
-  local archArg=''
+  local installParameters=(--version $version --install-dir "$root")
+
   if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then
-    archArg="--architecture $3"
+    installParameters+=(--architecture $3)
   fi
-  local runtimeArg=''
   if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then
-    runtimeArg="--runtime $4"
+    installParameters+=(--runtime $4)
   fi
-  local skipNonVersionedFilesArg=""
   if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then
-    skipNonVersionedFilesArg="--skip-non-versioned-files"
+    installParameters+=(--skip-non-versioned-files)
   fi
-  bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || {
-    local exit_code=$?
-    echo "Failed to install dotnet SDK from public location (exit code '$exit_code')."
 
-    local runtimeSourceFeed=''
-    if [[ -n "${6:-}" ]]; then
-      runtimeSourceFeed="--azure-feed $6"
-    fi
+  local variations=() # list of variable names with parameter arrays in them
+
+  local public_location=("${installParameters[@]}")
+  variations+=(public_location)
 
-    local runtimeSourceFeedKey=''
+  local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
+  variations+=(dotnetbuilds)
+
+  if [[ -n "${6:-}" ]]; then
+    variations+=(private_feed)
+    local private_feed=("${installParameters[@]}" --azure-feed $6)
     if [[ -n "${7:-}" ]]; then
       # The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
       # '-d'. To work around this, do a simple detection and switch the parameter
@@ -219,22 +220,27 @@ function InstallDotNet {
           decodeArg="-d"
       fi
       decodedFeedKey=`echo $7 | base64 $decodeArg`
-      runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
+      private_feed+=(--feed-credential $decodedFeedKey)
     fi
+  fi
 
-    if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then
-      bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || {
-        local exit_code=$?
-        Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')."
-        ExitWithExitCode $exit_code
-      }
-    else
-      if [[ $exit_code != 0 ]]; then
-        Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')."
-      fi
-      ExitWithExitCode $exit_code
+  local installSuccess=0
+  for variationName in "${variations[@]}"; do
+    local name="$variationName[@]"
+    local variation=("${!name}")
+    echo "Attempting to install dotnet from $variationName."
+    bash "$install_script" "${variation[@]}" && installSuccess=1
+    if [[ "$installSuccess" -eq 1 ]]; then
+      break
     fi
-  }
+
+    echo "Failed to install dotnet from $variationName."
+  done
+
+  if [[ "$installSuccess" -eq 0 ]]; then
+    Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations."
+    ExitWithExitCode 1
+  fi
 }
 
 function with_retries {
@@ -262,7 +268,7 @@ function with_retries {
 function GetDotNetInstallScript {
   local root=$1
   local install_script="$root/dotnet-install.sh"
-  local install_script_url="https://dot.net/$dotnetInstallScriptVersion/dotnet-install.sh"
+  local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
 
   if [[ ! -a "$install_script" ]]; then
     mkdir -p "$root"
@@ -410,6 +416,13 @@ function MSBuild {
       export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
       Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
       Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
+
+      export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
+      export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
+      export NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000
+      Write-PipelineSetVariable -name "NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY" -value "true"
+      Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT" -value "6"
+      Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS" -value "1000"
     fi
 
     local toolset_dir="${_InitializeToolset%/*}"
@@ -420,6 +433,8 @@ function MSBuild {
     possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
     possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
     possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
+    possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
+    possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
     for path in "${possiblePaths[@]}"; do
       if [[ -f $path ]]; then
         selectedPath=$path
@@ -485,13 +500,14 @@ _script_dir=`dirname "$_ResolvePath"`
 
 eng_root=`cd -P "$_script_dir/.." && pwd`
 repo_root=`cd -P "$_script_dir/../.." && pwd`
-artifacts_dir="$repo_root/artifacts"
+repo_root="${repo_root}/"
+artifacts_dir="${repo_root}artifacts"
 toolset_dir="$artifacts_dir/toolset"
-tools_dir="$repo_root/.tools"
+tools_dir="${repo_root}.tools"
 log_dir="$artifacts_dir/log/$configuration"
 temp_dir="$artifacts_dir/tmp/$configuration"
 
-global_json_file="$repo_root/global.json"
+global_json_file="${repo_root}global.json"
 # determine if global.json contains a "runtimes" entry
 global_json_has_runtimes=false
 if command -v jq &> /dev/null; then
@@ -504,7 +520,7 @@ fi
 
 # HOME may not be defined in some scenarios, but it is required by NuGet
 if [[ -z $HOME ]]; then
-  export HOME="$repo_root/artifacts/.home/"
+  export HOME="${repo_root}artifacts/.home/"
   mkdir -p "$HOME"
 fi
 
diff --git a/eng/configure-toolset.sh b/eng/configure-toolset.sh
index 4c0b2cd4b90..33ae9a970ff 100644
--- a/eng/configure-toolset.sh
+++ b/eng/configure-toolset.sh
@@ -4,6 +4,8 @@ function Test-FilesUseTelemetryOutput {
     require_telemetry_exclude_files=(
         'eng/common/build.sh'
         'eng/common/cibuild.sh'
+        'eng/common/cross/arm/tizen-build-rootfs.sh'
+        'eng/common/cross/arm/tizen-fetch.sh'
         'eng/common/cross/armel/tizen-build-rootfs.sh'
         'eng/common/cross/armel/tizen-fetch.sh'
         'eng/common/cross/arm64/tizen-build-rootfs.sh'
diff --git a/eng/promote-build.yml b/eng/promote-build.yml
index 49584685e8f..267b77d7a7a 100644
--- a/eng/promote-build.yml
+++ b/eng/promote-build.yml
@@ -4,9 +4,8 @@ parameters:
   - name: PublishingInfraVersion
     displayName: Which version of publishing should be used to promote the build definition?
     type: number
-    default: 2
+    default: 3
     values:
-      - 2
       - 3
       
   - name: BARBuildId
@@ -18,6 +17,20 @@ parameters:
     type: string 
     default: ' '
 
+  - name: SymbolPublishingAdditionalParameters
+    displayName: Additional (MSBuild) properties for symbol publishing
+    type: string 
+    default: ' '
+
+  - name: ArtifactsPublishingAdditionalParameters
+    displayName: Additional (MSBuild) properties for general asset publishing
+    type: string 
+    default: ' '
+
+  # The parameters below here are legacy. They are passed by add-build-to-channel
+  # to the build pipeline, and if they are not present in the pipeline, then queueing
+  # will fail. Remove once add-build-to-channel has been updated to remove the parameters.
+
   - name: EnableSourceLinkValidation
     displayName: Should Sourcelink validation be performed?
     type: boolean 
@@ -37,16 +50,6 @@ parameters:
     displayName: Should installers and checksums be published?
     type: boolean 
     default: true
-      
-  - name: SymbolPublishingAdditionalParameters
-    displayName: Additional (MSBuild) properties for symbol publishing
-    type: string 
-    default: ' '
-
-  - name: ArtifactsPublishingAdditionalParameters
-    displayName: Additional (MSBuild) properties for general asset publishing
-    type: string 
-    default: ' '
     
   - name: SigningValidationAdditionalParameters
     displayName: Additional (MSBuild) properties for signing validation
@@ -55,116 +58,10 @@ parameters:
 
 trigger: none
 
-variables:
-  _DotNetArtifactsCategory: .NETCore
-
 stages:
-- stage: prepare_promotion
-  displayName: Prepare for Promotion
-  jobs:
-    - job:
-      displayName: Validate Parameters
-      variables:
-        - template: common\templates\post-build\common-variables.yml
-      steps:
-        - checkout: none
-        
-        - task: PowerShell@2
-          displayName: Validate Build & Channel
-          inputs:
-            targetType: inline
-            script: |
-              # Keeping this script inline so that we don't need to checkout the whole repo to use just one file
-              try {
-                  $buildApiEndpoint = "$(MaestroApiEndPoint)/api/builds/${Env:BARBuildId}?api-version=$(MaestroApiVersion)"
-
-                  $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
-                  $apiHeaders.Add('Accept', 'application/json')
-                  $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
-
-                  $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-
-                  if (!$buildInfo) {
-                    Write-Host "Build with BAR ID ${Env:BARBuildId} was not found in BAR!"
-                    exit 1
-                  }
-
-                  $channels = ${Env:PromoteToChannelIds} -split "-"
-                  foreach ($channelId in $channels) {
-                    $channelApiEndpoint = "$(MaestroApiEndPoint)/api/channels/${channelId}?api-version=$(MaestroApiVersion)"
-                    $channelInfo = try { Invoke-WebRequest -Method Get -Uri $channelApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-
-                    if (!$channelInfo) {
-                      Write-Host "Channel with ID ${channelId} was not found in BAR. Aborting."
-                      exit 1
-                    }
-                  }
-                  
-                  $azureDevOpsBuildNumber = $buildInfo.azureDevOpsBuildNumber
-                  $channelName = $channelInfo.name
-                  $azureDevOpsRepository = "Unknown"
-                  $lastIndexOfSlash = $buildInfo.azureDevOpsRepository.LastIndexOf('/')
-
-                  if ($lastIndexOfSlash -ne -1) {
-                    $azureDevOpsRepository = $buildInfo.azureDevOpsRepository.Substring($lastIndexOfSlash + 1)
-
-                    # Invalid chars in Azdo build number: '"', '/', ':', '<', '>', '\', '|', '?', '@', and '*'
-                    $azureDevOpsRepository = $azureDevOpsRepository -replace '["/:<>\\|?@*"]', '_'
-                  }
-
-                  $buildNumberName = "Promoting $azureDevOpsRepository build $azureDevOpsBuildNumber to channel(s) ${Env:PromoteToChannelIds}#"
-
-                  # Maximum buildnumber length is 255 chars
-                  if ($buildNumberName.Length -GT 255) {
-                    $buildNumberName = $buildNumberName.Substring(0, 255)
-                  }
-
-                  Write-Host "##vso[build.updatebuildnumber]$buildNumberName"
-                  Write-Host "##vso[build.addbuildtag]$channelName"
-              }
-              catch {
-                Write-Host $_
-                Write-Host $_.Exception
-                Write-Host $_.ScriptStackTrace
-                exit 1
-              }
-          env:
-            MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
-            BARBuildId: ${{ parameters.BARBuildId }}
-            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-- ${{ if le(parameters.PublishingInfraVersion, 2) }}:
-  - template: \eng\common\templates\post-build\post-build.yml
-    parameters:
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-      BARBuildId: ${{ parameters.BARBuildId }}
-    
-      enableSourceLinkValidation: ${{ parameters.EnableSourceLinkValidation }}
-      enableNugetValidation: ${{ parameters.EnableNugetValidation }}
-      enableSigningValidation: ${{ parameters.EnableSigningValidation }}
-      
-      validateDependsOn:
-        - prepare_promotion
-           
-      publishInstallersAndChecksums: ${{ parameters.PublishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.SymbolPublishingAdditionalParameters }}
-      artifactsPublishingAdditionalParameters: ${{ parameters.ArtifactsPublishingAdditionalParameters }}
-      signingValidationAdditionalParameters: ${{ parameters.SigningValidationAdditionalParameters }}
-
-- ${{ if ge(parameters.PublishingInfraVersion, 3) }}:
-  - template: \eng\publishing\v3\publish.yml
-    parameters:
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-      BARBuildId: ${{ parameters.BARBuildId }}
-    
-      enableSourceLinkValidation: ${{ parameters.EnableSourceLinkValidation }}
-      enableNugetValidation: ${{ parameters.EnableNugetValidation }}
-      enableSigningValidation: ${{ parameters.EnableSigningValidation }}
-      
-      validateDependsOn:
-        - prepare_promotion
-      
-      publishInstallersAndChecksums: ${{ parameters.PublishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.SymbolPublishingAdditionalParameters }}
-      artifactsPublishingAdditionalParameters: ${{ parameters.ArtifactsPublishingAdditionalParameters }}
-      signingValidationAdditionalParameters: ${{ parameters.SigningValidationAdditionalParameters }}
+- template: \eng\publishing\v3\publish.yml
+  parameters:
+    PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+    BARBuildId: ${{ parameters.BARBuildId }}
+    symbolPublishingAdditionalParameters: ${{ parameters.SymbolPublishingAdditionalParameters }}
+    artifactsPublishingAdditionalParameters: ${{ parameters.ArtifactsPublishingAdditionalParameters }}
diff --git a/eng/publishing/v3/common-variables.yml b/eng/publishing/v3/common-variables.yml
deleted file mode 100644
index ed518e46b57..00000000000
--- a/eng/publishing/v3/common-variables.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-variables:
-  - group: AzureDevOps-Artifact-Feeds-Pats
-  - group: DotNet-Blob-Feed
-  - group: DotNet-DotNetCli-Storage
-  - group: DotNet-MSRC-Storage
-  - group: Publish-Build-Assets
-    
-  # Default Maestro++ API Endpoint and API Version
-  - name: MaestroApiEndPoint
-    value: "https://maestro-prod.westus2.cloudapp.azure.com"
-  - name: MaestroApiAccessToken
-    value: $(MaestroAccessToken)
-  - name: MaestroApiVersion
-    value: "2020-02-20"
-
-  - name: SourceLinkCLIVersion
-    value: 3.0.0
-
-  # Skip component governance and codesign validation for SDL. These jobs
-  # create no content.
-  - name: skipComponentGovernanceDetection
-    value: true
-  - name: runCodesignValidationInjection
-    value: false
\ No newline at end of file
diff --git a/eng/publishing/v3/nuget-validation.yml b/eng/publishing/v3/nuget-validation.yml
deleted file mode 100644
index 6c9e0b8c3ef..00000000000
--- a/eng/publishing/v3/nuget-validation.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-jobs:
-- job:
-  displayName: NuGet Validation
-  dependsOn: setupMaestroVars
-  pool:
-    vmImage: 'windows-2019'
-  variables:
-    - name: AzDOProjectName
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-    - name: AzDOPipelineId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-    - name: AzDOBuildId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-  steps:
-    - task: DownloadBuildArtifacts@0
-      displayName: Download Package Artifacts
-      inputs:
-        buildType: specific
-        buildVersionToDownload: specific
-        project: $(AzDOProjectName)
-        pipeline: $(AzDOPipelineId)
-        buildId: $(AzDOBuildId)
-        artifactName: PackageArtifacts
-        checkDownloadedFiles: true
-
-    - task: PowerShell@2
-      displayName: Validate
-      inputs:
-        targetType: inline
-        script: |
-          try {
-            $ErrorActionPreference = 'Stop'
-            Set-StrictMode -Version 2.0
-
-            # `tools.ps1` requires $ci to be $true
-            $ci = $true
-            $disableConfigureToolsetImport = $true
-            . ${Env:BUILD_SOURCESDIRECTORY}\eng\common\tools.ps1
-
-            $ToolDestinationPath = "${Env:AGENT_BUILDDIRECTORY}\Extract\"
-            $PackagesPath = "${Env:BUILD_ARTIFACTSTAGINGDIRECTORY}\PackageArtifacts\"
-            $url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1'
-
-            New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force
-
-            Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1 
-
-            & ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg
-          } 
-          catch {
-            Write-Host $_.ScriptStackTrace
-            Write-PipelineTelemetryError -Category 'NuGetValidation' -Message $_
-            ExitWithExitCode 1
-          }
diff --git a/eng/publishing/v3/postbuild-checks.yml b/eng/publishing/v3/postbuild-checks.yml
deleted file mode 100644
index 9382a1a40e3..00000000000
--- a/eng/publishing/v3/postbuild-checks.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-jobs:
-- job:
-  displayName: Post-build Checks
-  dependsOn: setupMaestroVars
-  variables:
-    - name: TargetChannels
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ]
-  pool:
-    vmImage: 'windows-2019'
diff --git a/eng/publishing/v3/publish-assets.yml b/eng/publishing/v3/publish-assets.yml
deleted file mode 100644
index beb11af49f1..00000000000
--- a/eng/publishing/v3/publish-assets.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-parameters:
-  artifactsPublishingAdditionalParameters: ''
-  publishInstallersAndChecksums: true
-  PromoteToChannelIds: ''
-  symbolPublishingAdditionalParameters: ''
-  buildQuality: 'daily'
-
-jobs:
-- job: publish_assets
-  displayName: Publish Assets and Symbols
-  dependsOn: setupMaestroVars
-  timeoutInMinutes: 120
-  variables:
-    - group: DotNet-Symbol-Server-Pats
-    - name: BARBuildId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-    - name: IsStableBuild
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
-    - name: AzDOProjectName
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-    - name: AzDOPipelineId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-    - name: AzDOBuildId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-    - task: DownloadBuildArtifacts@0
-      displayName: Download Build Assets
-      continueOnError: true
-      inputs:
-        buildType: specific
-        buildVersionToDownload: specific
-        project: $(AzDOProjectName)
-        pipeline: $(AzDOPipelineId)
-        buildId: $(AzDOBuildId)
-        downloadType: 'specific'
-        itemPattern: |
-          PackageArtifacts/**
-          BlobArtifacts/**
-          AssetManifests/**
-          PdbArtifacts/**
-        downloadPath: '$(Build.ArtifactStagingDirectory)'
-        checkDownloadedFiles: true
-
-    - task: NuGetToolInstaller@1
-      displayName: 'Install NuGet.exe'
-
-    # This is necessary whenever we want to publish/restore to an AzDO private feed
-    - task: NuGetAuthenticate@0
-      displayName: 'Authenticate to AzDO Feeds'
-
-    - task: PowerShell@2
-      displayName: Enable cross-org publishing
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1
-        arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-    - task: PowerShell@2
-      displayName: Publish packages, blobs and symbols
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
-        arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
-          /p:PublishingInfraVersion=3
-          /p:BARBuildId=$(BARBuildId)
-          /p:TargetChannels='${{ parameters.PromoteToChannelIds }}'
-          /p:IsInternalBuild=${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }}
-          /p:NugetPath=$(NuGetExeToolPath)
-          /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
-          /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
-          /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
-          /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-          /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
-          /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
-          /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
-          /p:InternalInstallersAzureAccountKey=$(dotnetclimsrc-access-key)
-          /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
-          /p:InternalChecksumsAzureAccountKey=$(dotnetclichecksumsmsrc-storage-key)
-          /p:AzureDevOpsFeedsKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-          /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
-          /p:AkaMSClientId=$(akams-client-id)
-          /p:AkaMSClientSecret=$(akams-client-secret)
-          ${{ parameters.artifactsPublishingAdditionalParameters }}
-          /p:PDBArtifactsBasePath='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
-          /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-          ${{ parameters.symbolPublishingAdditionalParameters}}
-          /p:MsdlToken=$(microsoft-symbol-server-pat)
-          /p:SymWebToken=$(symweb-symbol-server-pat)
-          /p:BuildQuality='${{ parameters.buildQuality }}'
-
-    - template: /eng/common/templates/steps/publish-logs.yml
-      parameters:
-        StageLabel: '${{ parameters.stageName }}'
-        JobLabel: 'AssetsPublishing'
diff --git a/eng/publishing/v3/publish-symbols.yml b/eng/publishing/v3/publish-symbols.yml
deleted file mode 100644
index 10196525e95..00000000000
--- a/eng/publishing/v3/publish-symbols.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-parameters:
-  symbolPublishingAdditionalParameters: ''
-
-jobs:
-- job: publish_symbols
-  displayName: Symbols Publishing
-  dependsOn: setupMaestroVars
-  variables:
-    - group: DotNet-Symbol-Server-Pats
-    - name: AzDOProjectName
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-    - name: AzDOPipelineId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-    - name: AzDOBuildId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-    - task: DownloadBuildArtifacts@0
-      displayName: Download Build Assets
-      continueOnError: true
-      inputs:
-        buildType: specific
-        buildVersionToDownload: specific
-        project: $(AzDOProjectName)
-        pipeline: $(AzDOPipelineId)
-        buildId: $(AzDOBuildId)
-        downloadType: 'specific'
-        itemPattern: |
-          PdbArtifacts/**
-          BlobArtifacts/**
-        downloadPath: '$(Build.ArtifactStagingDirectory)'
-        checkDownloadedFiles: true
-        
-    # This is necessary whenever we want to publish/restore to an AzDO private feed
-    # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-    # otherwise it'll complain about accessing a private feed.
-    - task: NuGetAuthenticate@0
-      displayName: 'Authenticate to AzDO Feeds'
-
-    - task: PowerShell@2
-      displayName: Enable cross-org publishing
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1
-        arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-    - task: PowerShell@2
-      displayName: Publish
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
-        arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
-          /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-          /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-          /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
-          /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-          /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-          /p:Configuration=Release
-          /p:PublishToMSDL=false
-          /p:PublishToSymWeb=true
-          ${{ parameters.symbolPublishingAdditionalParameters }}
-
-    - template: /eng/common/templates/steps/publish-logs.yml
-      parameters:
-        StageLabel: '${{ parameters.stageName }}'
-        JobLabel: 'SymbolPublishing'
diff --git a/eng/publishing/v3/publish.yml b/eng/publishing/v3/publish.yml
index ef0315cff82..783701729d0 100644
--- a/eng/publishing/v3/publish.yml
+++ b/eng/publishing/v3/publish.yml
@@ -1,61 +1,198 @@
 parameters:
-  BARBuildId: ''
+  artifactsPublishingAdditionalParameters: ''
   PromoteToChannelIds: ''
-
-  enableSourceLinkValidation: false
-  enableSigningValidation: true
-  enableNugetValidation: true
-  publishInstallersAndChecksums: true
-  
-  # These parameters let the user customize the call to sdk-task.ps1 for publishing
-  # symbols & general artifacts as well as for signing validation
+  BARBuildId: ''
   symbolPublishingAdditionalParameters: ''
-  artifactsPublishingAdditionalParameters: ''
-  signingValidationAdditionalParameters: ''
-
-  # Which stages should finish execution before post-build stages start
-  validateDependsOn:
-  - build
-  publishDependsOn: 
-  - Validate
+  buildQuality: 'daily'
 
 stages:
-  - stage: Validate
-    dependsOn: ${{ parameters.validateDependsOn }}
-    displayName: Validate Build Assets
-    variables:
-      - template: /eng/publishing/v3/common-variables.yml
+  - stage: publish
+    displayName: Publishing
     jobs:
-    - template: /eng/publishing/v3/setup-maestro-vars.yml
-      parameters:
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+    - job: publish_assets
+      displayName: Publish Assets and Symbols
+      timeoutInMinutes: 120
+      variables:
+        - group: DotNet-Symbol-Server-Pats
+        - group: DotNetBuilds storage account tokens
+        - group: AzureDevOps-Artifact-Feeds-Pats
+        - group: DotNet-Blob-Feed
+        - group: DotNet-DotNetCli-Storage
+        - group: DotNet-MSRC-Storage
+        - group: Publish-Build-Assets
+          
+        # Default Maestro++ API Endpoint and API Version
+        - name: MaestroApiEndPoint
+          value: "https://maestro-prod.westus2.cloudapp.azure.com"
+        - name: MaestroApiAccessToken
+          value: $(MaestroAccessToken)
+        - name: MaestroApiVersion
+          value: "2020-02-20"
 
-    - template: /eng/publishing/v3/postbuild-checks.yml
+      pool:
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: VSEngSS-MicroBuild2022-1ES
+          demands: Cmd
+        # If it's not devdiv, it's dnceng
+        ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+          name: NetCore1ESPool-Internal
+          demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
-    - ${{ if eq(parameters.enableNugetValidation, 'True') }}:
-      - template: /eng/publishing/v3/nuget-validation.yml
+      steps:
+        - task: PowerShell@2
+          displayName: Validate and Locate Build
+          inputs:
+            targetType: inline
+            pwsh: true
+            script: |
+              # Keeping this script inline so that we don't need to checkout the whole repo to use just one file
+              try {
+                  $buildApiEndpoint = "$(MaestroApiEndPoint)/api/builds/${Env:BARBuildId}?api-version=$(MaestroApiVersion)"
 
-    - ${{ if eq(parameters.enableSigningValidation, 'True') }}:
-      - template: /eng/publishing/v3/signing-validation.yml
+                  $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
+                  $apiHeaders.Add('Accept', 'application/json')
+                  $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
 
-    - ${{ if eq(parameters.enableSourceLinkValidation, 'True') }}:
-      - template: /eng/publishing/v3/sourcelink-validation.yml
+                  $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
 
-  - stage: publish
-    dependsOn: ${{ parameters.publishDependsOn }}
-    variables:
-      - template: /eng/publishing/v3/common-variables.yml
-    displayName: Publishing
-    jobs:
-    - template: /eng/publishing/v3/setup-maestro-vars.yml
-      parameters:
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-        
-    - template: /eng/publishing/v3/publish-assets.yml
-      parameters:
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-        publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-        artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-        symbolPublishingAdditionalParameters: ${{parameters.symbolPublishingAdditionalParameters}}
+                  if (!$buildInfo) {
+                    Write-Host "Build with BAR ID ${Env:BARBuildId} was not found in BAR!"
+                    exit 1
+                  }
+
+                  $channels = ${Env:PromoteToChannelIds} -split "-"
+                  $channelNames = @()
+                  foreach ($channelId in $channels) {
+                    $channelApiEndpoint = "$(MaestroApiEndPoint)/api/channels/${channelId}?api-version=$(MaestroApiVersion)"
+                    $channelInfo = try { Invoke-WebRequest -Method Get -Uri $channelApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
+
+                    if (!$channelInfo) {
+                      Write-Host "Channel with ID ${channelId} was not found in BAR. Aborting."
+                      exit 1
+                    }
+
+                    $channelNames += "'$($channelInfo.name)'"
+                  }
+                  
+                  $azureDevOpsBuildNumber = $buildInfo.azureDevOpsBuildNumber
+                  $azureDevOpsRepository = "Unknown"
+                  $lastIndexOfSlash = $buildInfo.azureDevOpsRepository.LastIndexOf('/')
+
+                  if ($lastIndexOfSlash -ne -1) {
+                    $azureDevOpsRepository = $buildInfo.azureDevOpsRepository.Substring($lastIndexOfSlash + 1)
+
+                    # Invalid chars in Azdo build number: '"', '/', ':', '<', '>', '\', '|', '?', '@', and '*'
+                    $azureDevOpsRepository = $azureDevOpsRepository -replace '["/:<>\\|?@*"]', '_'
+                  }
+
+                  $channelNames = $channelNames -join ", "
+                  $buildNumberName = "Promoting $azureDevOpsRepository build $azureDevOpsBuildNumber (${Env:BARBuildId}) to channel(s) $channelNames #"
+
+                  # Maximum buildnumber length is 255 chars
+                  if ($buildNumberName.Length -GT 255) {
+                    $buildNumberName = $buildNumberName.Substring(0, 255)
+                  }
+
+                  # Set tags on publishing for visibility 
+
+                  Write-Host "##vso[build.updatebuildnumber]$buildNumberName"
+                  Write-Host "##vso[build.addbuildtag]Channel(s) - $channelNames"
+                  Write-Host "##vso[build.addbuildtag]BAR ID - ${Env:BARBuildId}"
+
+                  # Set variables used in publishing.
+                  Write-Host "##vso[task.setvariable variable=AzDOProject]$($buildInfo.azureDevOpsProject)"
+                  Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$($buildInfo.azureDevOpsBuildDefinitionId)"
+                  Write-Host "##vso[task.setvariable variable=AzDOBuildId]$($buildInfo.azureDevOpsBuildId)"
+                  Write-Host "##vso[task.setvariable variable=AzDOAccount]$($buildInfo.azureDevOpsAccount)"
+                  Write-Host "##vso[task.setvariable variable=AzDOBranch]$($buildInfo.azureDevOpsBranch)"
+              }
+              catch {
+                Write-Host $_
+                Write-Host $_.Exception
+                Write-Host $_.ScriptStackTrace
+                exit 1
+              }
+          env:
+            MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+
+        - task: DownloadBuildArtifacts@0
+          displayName: Download Build Assets
+          continueOnError: true
+          enabled: true
+          inputs:
+            buildType: specific
+            buildVersionToDownload: specific
+            project:  $(AzDOProject)
+            pipeline: $(AzDOPipelineId)
+            buildId: $(AzDOBuildId)
+            downloadType: 'specific'
+            itemPattern: |
+              AssetManifests/**
+              BlobArtifacts/MergedManifest.xml
+              PdbArtifacts/**
+              ReleaseConfigs/SymbolPublishingExclusionsFile.txt
+            downloadPath: '$(Build.ArtifactStagingDirectory)'
+
+        - task: NuGetToolInstaller@1
+          displayName: 'Install NuGet.exe'
+
+        # This is necessary whenever we want to publish/restore to an AzDO private feed
+        - task: NuGetAuthenticate@0
+          displayName: 'Authenticate to AzDO Feeds'
+
+        - task: PowerShell@2
+          displayName: Enable cross-org publishing
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1
+            arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
+
+        - task: PowerShell@2
+          displayName: Publish packages, blobs and symbols
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
+            arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
+              /p:PublishingInfraVersion=3
+              /p:BARBuildId=${{ parameters.BARBuildId }}
+              /p:TargetChannels='${{ parameters.PromoteToChannelIds }}'
+              /p:IsInternalBuild=${{ contains(variables['AzDOBranch'], 'internal/') }}
+              /p:NugetPath=$(NuGetExeToolPath)
+              /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
+              /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
+              /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
+              /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+              /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
+              /p:PublishInstallersAndChecksums=true
+              /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
+              /p:InternalInstallersAzureAccountKey=$(dotnetclimsrc-access-key)
+              /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
+              /p:InternalChecksumsAzureAccountKey=$(dotnetclichecksumsmsrc-storage-key)
+              /p:AzureDevOpsFeedsKey='$(dn-bot-dnceng-artifact-feeds-rw)'
+              /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
+              /p:AkaMSClientId=$(akams-client-id)
+              /p:AkaMSClientSecret=$(akams-client-secret)
+              ${{ parameters.artifactsPublishingAdditionalParameters }}
+              /p:PDBArtifactsBasePath='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
+              /p:SymbolPublishingExclusionsFile='$(Build.ArtifactStagingDirectory)/ReleaseConfigs/SymbolPublishingExclusionsFile.txt'
+              ${{ parameters.symbolPublishingAdditionalParameters}}
+              /p:MsdlToken=$(microsoft-symbol-server-pat)
+              /p:SymWebToken=$(symweb-symbol-server-pat)
+              /p:BuildQuality='${{ parameters.buildQuality }}'
+              /p:AzdoApiToken='$(dn-bot-all-orgs-build-rw-code-rw)'
+              /p:ArtifactsBasePath='$(Build.ArtifactStagingDirectory)/'
+              /p:BuildId='$(AzDOBuildId)'
+              /p:AzureDevOpsOrg='$(AzDOAccount)'
+              /p:AzureProject='$(AzDOProject)'
+              /p:UseStreamingPublishing='true'
+              /p:StreamingPublishingMaxClients=16
+              /p:NonStreamingPublishingMaxClients=12
+              /p:DotNetBuildsPublicUriBase64='$(dotnetbuilds-public-container-uri-base64)'
+              /p:DotNetBuildsPublicChecksumsUriBase64='$(dotnetbuilds-public-container-checksum-uri-base64)'
+              /p:DotNetBuildsInternalUriBase64='$(dotnetbuilds-internal-container-uri-base64)'
+              /p:DotNetBuildsInternalChecksumsUriBase64='$(dotnetbuilds-internal-container-checksum-uri-base64)'
+        - template: /eng/common/templates/steps/publish-logs.yml
+          parameters:
+            StageLabel: '${{ parameters.stageName }}'
+            JobLabel: 'AssetsPublishing'
diff --git a/eng/publishing/v3/setup-maestro-vars.yml b/eng/publishing/v3/setup-maestro-vars.yml
deleted file mode 100644
index 804e9faee96..00000000000
--- a/eng/publishing/v3/setup-maestro-vars.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-parameters:
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-
-jobs:
-- job: setupMaestroVars
-  displayName: Setup Maestro Vars
-  variables:
-    - template: /eng/publishing/v3/common-variables.yml
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-    - checkout: none
-
-    - task: PowerShell@2
-      name: setReleaseVars
-      displayName: Set Release Configs Vars
-      inputs:
-        targetType: inline
-        script: |
-          try {
-            dir Env:
-          
-            $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
-
-            $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
-            $apiHeaders.Add('Accept', 'application/json')
-            $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
-
-            $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-
-            $BarId = $Env:BARBuildId
-            $Channels = $Env:PromoteToMaestroChannels -split ","
-            $Channels = $Channels -join "]["
-            $Channels = "[$Channels]"
-
-            $IsStableBuild = $buildInfo.stable
-            $AzureDevOpsProject = $buildInfo.azureDevOpsProject
-            $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
-            $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
-
-            Write-Host "##vso[task.setvariable variable=BARBuildId;isOutput=true]$BarId"
-            Write-Host "##vso[task.setvariable variable=TargetChannels;isOutput=true]$Channels"
-            Write-Host "##vso[task.setvariable variable=IsStableBuild;isOutput=true]$IsStableBuild"
-
-            Write-Host "##vso[task.setvariable variable=AzDOProjectName;isOutput=true]$AzureDevOpsProject"
-            Write-Host "##vso[task.setvariable variable=AzDOPipelineId;isOutput=true]$AzureDevOpsBuildDefinitionId"
-            Write-Host "##vso[task.setvariable variable=AzDOBuildId;isOutput=true]$AzureDevOpsBuildId"
-          }
-          catch {
-            Write-Host $_
-            Write-Host $_.Exception
-            Write-Host $_.ScriptStackTrace
-            exit 1
-          }
-      env:
-        MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
diff --git a/eng/publishing/v3/signing-validation.yml b/eng/publishing/v3/signing-validation.yml
deleted file mode 100644
index 22611ddff7f..00000000000
--- a/eng/publishing/v3/signing-validation.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-jobs:
-- job:
-  displayName: Signing Validation
-  dependsOn: setupMaestroVars
-  variables:
-    - template: /eng/publishing/v3/common-variables.yml
-    - name: AzDOProjectName
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-    - name: AzDOPipelineId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-    - name: AzDOBuildId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-    - task: DownloadBuildArtifacts@0
-      displayName: Download Package Artifacts
-      inputs:
-        buildType: specific
-        buildVersionToDownload: specific
-        project: $(AzDOProjectName)
-        pipeline: $(AzDOPipelineId)
-        buildId: $(AzDOBuildId)
-        artifactName: PackageArtifacts
-        checkDownloadedFiles: true
-        itemPattern: |
-          **
-          !**/Microsoft.SourceBuild.Intermediate.*.nupkg
-
-    # This is necessary whenever we want to publish/restore to an AzDO private feed
-    # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-    # otherwise it'll complain about accessing a private feed.
-    - task: NuGetAuthenticate@0
-      displayName: 'Authenticate to AzDO Feeds'
-
-    - task: PowerShell@2
-      displayName: Enable cross-org publishing
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1
-        arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-    # Signing validation will optionally work with the buildmanifest file which is downloaded from
-    # Azure DevOps above.
-    - task: PowerShell@2
-      displayName: Validate
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
-        arguments: -task SigningValidation -restore -msbuildEngine vs
-          /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
-          /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
-          ${{ parameters.signingValidationAdditionalParameters }}
-
-    - template: /eng/common/templates/steps/publish-logs.yml
-      parameters:
-        StageLabel: 'Validation'
-        JobLabel: 'Signing'
diff --git a/eng/publishing/v3/sourcelink-validation.yml b/eng/publishing/v3/sourcelink-validation.yml
deleted file mode 100644
index b290d57e424..00000000000
--- a/eng/publishing/v3/sourcelink-validation.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-jobs:
-- job:
-  displayName: SourceLink Validation
-  dependsOn: setupMaestroVars
-  variables:
-    - template: /eng/publishing/v3/common-variables.yml
-    - name: AzDOProjectName
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-    - name: AzDOPipelineId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-    - name: AzDOBuildId
-      value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-    - task: DownloadBuildArtifacts@0
-      displayName: Download Blob Artifacts
-      inputs:
-        buildType: specific
-        buildVersionToDownload: specific
-        project: $(AzDOProjectName)
-        pipeline: $(AzDOPipelineId)
-        buildId: $(AzDOBuildId)
-        artifactName: BlobArtifacts
-        checkDownloadedFiles: true
-
-    - task: PowerShell@2
-      displayName: Validate
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
-        arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ 
-          -ExtractPath $(Agent.BuildDirectory)/Extract/ 
-          -GHRepoName $(Build.Repository.Name) 
-          -GHCommit $(Build.SourceVersion)
-          -SourcelinkCliVersion $(SourceLinkCLIVersion)
-      continueOnError: true
diff --git a/eng/test-configuration.json b/eng/test-configuration.json
new file mode 100644
index 00000000000..27fdfceca0d
--- /dev/null
+++ b/eng/test-configuration.json
@@ -0,0 +1,5 @@
+{
+  "version": 1,
+  "defaultOnFailure": "rerun",
+  "localRerunCount": 1
+}
\ No newline at end of file
diff --git a/eng/validate-sdk.yml b/eng/validate-sdk.yml
index 937f5cae1da..a519a437895 100644
--- a/eng/validate-sdk.yml
+++ b/eng/validate-sdk.yml
@@ -19,8 +19,8 @@ jobs:
           name: Logs_ValidateSdk_Windows_NT_Release
     timeoutInMinutes: 90
     pool:
-      name: NetCoreInternal-Pool
-      queue: BuildPool.Server.Amd64.VS2017.Arcade
+      name: NetCore1ESPool-Internal
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
     variables:
     - group: DotNet-Blob-Feed
     - group: Publish-Build-Assets
diff --git a/global.json b/global.json
index 859af09036f..5e698a5240e 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "tools": {
-    "dotnet": "6.0.100-preview.2.21155.3"
+    "dotnet": "6.0.100"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21207.4",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21207.4"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22103.1"
   }
 }
diff --git a/scripts/GitHubMergeBranches.ps1 b/scripts/GitHubMergeBranches.ps1
index d10323f00bc..cba51485112 100755
--- a/scripts/GitHubMergeBranches.ps1
+++ b/scripts/GitHubMergeBranches.ps1
@@ -351,7 +351,7 @@ You may need to fix this problem by merging branches with this PR. Contact .NET
         }
 
         $prBody = @"
-I detected changes in the $HeadBranch branch which have not been merged yet to $BaseBranch. I'm a robot and am configured to help you automatically keep $BaseBranch up to date, so I've opened this PR.
+I detected changes in the $HeadBranch branch which have not been merged yet to $BaseBranch. I'm a robot and am [configured](https://github.com/dotnet/versions/blob/main/Maestro/subscriptions.json) to help you automatically keep $BaseBranch up to date, so I've opened this PR.
 
 $committersList
 
diff --git a/scripts/create-net6-preview-flow.ps1 b/scripts/create-net6-preview-flow.ps1
deleted file mode 100644
index 27ee35328a0..00000000000
--- a/scripts/create-net6-preview-flow.ps1
+++ /dev/null
@@ -1,89 +0,0 @@
-param
-(
-    [Parameter(Mandatory=$true)][string]$RuntimeChannel,
-    [Parameter(Mandatory=$true)][string]$SdkChannel,
-    [Parameter(Mandatory=$true)][string]$RuntimeBranch,
-    [Parameter(Mandatory=$true)][string]$SdkBranch,
-    [Parameter(Mandatory=$true)][string]$VSChannel
-)
-
-function MakeDefaultChannel($repo, $branch, $channel)
-{
-    Write-Host "Making default channel - $repo @ $branch -> $channel"
-    & darc add-default-channel --repo "$repo" --branch "$branch" --channel "$channel" --quiet
-}
-
-function AddFlow($sourceRepo, $sourceChannel, $targetRepo, $targetBranch, $frequency)
-{
-    Write-Host "Adding flow - $sourceRepo @ $sourceChannel -> $targetRepo @ $targetBranch ($frequency)"
-    & darc add-subscription --source-repo "$sourceRepo" --channel "$sourceChannel" --target-repo "$targetRepo" --target-branch "$targetBranch" --update-frequency "$frequency" --quiet --no-trigger --standard-automerge
-}
-
-function AddArcadeFlow($targetRepo, $targetBranch)
-{
-    AddFlow https://github.com/dotnet/arcade ".NET Eng - Latest" $targetRepo $targetBranch None
-}
-
-# Make default channels
-
-Write-Host "Making default channels for runtime repos"
-MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int $RuntimeBranch $RuntimeChannel
-MakeDefaultChannel https://github.com/dotnet/aspnetcore $RuntimeBranch $RuntimeChannel
-MakeDefaultChannel https://github.com/dotnet/efcore $RuntimeBranch $RuntimeChannel
-MakeDefaultChannel https://github.com/dotnet/emsdk $RuntimeBranch $RuntimeChannel
-MakeDefaultChannel https://github.com/dotnet/icu $RuntimeBranch $RuntimeChannel
-MakeDefaultChannel https://github.com/dotnet/runtime $RuntimeBranch $RuntimeChannel
-MakeDefaultChannel https://github.com/dotnet/windowsdesktop $RuntimeBranch $RuntimeChannel
-MakeDefaultChannel https://github.com/dotnet/wpf $RuntimeBranch $RuntimeChannel
-MakeDefaultChannel https://github.com/dotnet/winforms $RuntimeBranch $RuntimeChannel
-MakeDefaultChannel https://github.com/mono/linker $RuntimeBranch $RuntimeChannel
-
-Write-Host "Making default channels for SDK repos"
-MakeDefaultChannel https://github.com/dotnet/installer $SdkBranch $SdkChannel
-MakeDefaultChannel https://github.com/dotnet/sdk $SdkBranch $SdkChannel
-MakeDefaultChannel https://github.com/dotnet/roslyn-analyzers $SdkBranch $SdkChannel
-MakeDefaultChannel https://github.com/dotnet/templating $SdkBranch $SdkChannel
-
-# Make dependency flow
-
-Write-Host "Add arcade flow"
-AddArcadeFlow https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int $RuntimeBranch
-AddArcadeFlow https://github.com/dotnet/aspnetcore $RuntimeBranch
-AddArcadeFlow https://github.com/dotnet/efcore $RuntimeBranch
-AddArcadeFlow https://github.com/dotnet/emsdk $RuntimeBranch
-AddArcadeFlow https://github.com/dotnet/icu $RuntimeBranch
-AddArcadeFlow https://github.com/dotnet/runtime $RuntimeBranch
-AddArcadeFlow https://github.com/dotnet/windowsdesktop $RuntimeBranch
-AddArcadeFlow https://github.com/dotnet/wpf $RuntimeBranch
-AddArcadeFlow https://github.com/dotnet/winforms $RuntimeBranch
-AddArcadeFlow https://github.com/mono/linker $RuntimeBranch
-AddArcadeFlow https://github.com/dotnet/installer $SdkBranch
-AddArcadeFlow https://github.com/dotnet/sdk $SdkBranch
-AddArcadeFlow https://github.com/dotnet/roslyn-analyzers $SdkBranch
-AddArcadeFlow https://github.com/dotnet/templating $SdkBranch
-
-Write-Host "Add runtime -> runtime flow"
-AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int $RuntimeChannel https://github.com/dotnet/wpf $RuntimeBranch EveryBuild
-AddFlow https://github.com/dotnet/efcore $RuntimeChannel https://github.com/dotnet/aspnetcore $RuntimeBranch EveryBuild
-AddFlow https://github.com/dotnet/emsdk $RuntimeChannel https://github.com/dotnet/aspnetcore $RuntimeBranch EveryBuild
-AddFlow https://github.com/dotnet/icu $RuntimeChannel https://github.com/dotnet/runtime $RuntimeBranch EveryBuild
-AddFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/aspnetcore $RuntimeBranch EveryBuild
-AddFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/efcore $RuntimeBranch EveryBuild
-AddFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/winforms $RuntimeBranch EveryBuild
-AddFlow https://github.com/dotnet/winforms $RuntimeChannel https://github.com/dotnet/wpf $RuntimeBranch EveryBuild
-AddFlow https://github.com/dotnet/wpf $RuntimeChannel https://github.com/dotnet/windowsdesktop $RuntimeBranch EveryBuild
-AddFlow https://github.com/mono/linker $RuntimeChannel https://github.com/dotnet/runtime $RuntimeBranch EveryBuild
-
-Write-Host "Add runtime->sdk flow"
-AddFlow https://github.com/dotnet/aspnetcore $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
-AddFlow https://github.com/dotnet/windowsdesktop $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
-AddFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
-AddFlow https://github.com/mono/linker $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
-
-Write-Host "Add sdk->sdk flow"
-AddFlow https://github.com/dotnet/sdk $SdkChannel https://github.com/dotnet/installer $SdkBranch EveryBuild
-AddFlow https://github.com/dotnet/roslyn-analyzers $SdkChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
-AddFlow https://github.com/dotnet/templating $SdkChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
-
-
-
diff --git a/scripts/create-net7-preview-flow.ps1 b/scripts/create-net7-preview-flow.ps1
new file mode 100644
index 00000000000..6f3a6ee012b
--- /dev/null
+++ b/scripts/create-net7-preview-flow.ps1
@@ -0,0 +1,187 @@
+param
+(
+    [Parameter(Mandatory=$true)][string]$RuntimeChannel,
+    [Parameter(Mandatory=$true)][string]$SdkChannel,
+    [Parameter(Mandatory=$true)][string]$RuntimeBranch,
+    [Parameter(Mandatory=$true)][string]$SdkBranch,
+    [Parameter(Mandatory=$true)][string]$VSChannel,
+    [switch]$AddInternalFlow,
+    [string]$InternalRuntimeChannel,
+    [string]$InternalSdkChannel
+)
+
+function MakeDefaultChannel($repo, $branch, $channel)
+{
+    Write-Host "Making default channel - $repo @ $branch -> $channel"
+    & darc add-default-channel --repo "$repo" --branch "$branch" --channel "$channel" --quiet
+}
+
+function DisableFlow($channel)
+{
+    Write-Host "Disabling flow on $channel"
+    & darc subscription-status --disable --channel "$channel" --quiet --exact
+}
+
+function AddFlow($sourceRepo, $sourceChannel, $targetRepo, $targetBranch, $frequency)
+{
+    Write-Host "Adding flow - $sourceRepo @ $sourceChannel -> $targetRepo @ $targetBranch ($frequency)"
+    & darc add-subscription --source-repo "$sourceRepo" --channel "$sourceChannel" --target-repo "$targetRepo" --target-branch "$targetBranch" --update-frequency "$frequency" --quiet --no-trigger --standard-automerge
+}
+
+function AddBatchedFlow($sourceRepo, $sourceChannel, $targetRepo, $targetBranch, $frequency)
+{
+    Write-Host "Adding flow - $sourceRepo @ $sourceChannel -> $targetRepo @ $targetBranch ($frequency)"
+    & darc add-subscription --source-repo "$sourceRepo" --channel "$sourceChannel" --target-repo "$targetRepo" --target-branch "$targetBranch" --update-frequency "$frequency" --quiet --no-trigger --batchable
+}
+
+function AddBatchedMergePolicy($targetRepo, $targetBranch)
+{
+    Write-Host "Setting batched merge policy for $targetRepo @ $targetBranch"
+    & darc set-repository-policies --repo "$targetRepo" --branch "$targetBranch" --standard-automerge --quiet
+}
+
+function AddArcadeFlow($targetRepo, $targetBranch)
+{
+    AddFlow https://github.com/dotnet/arcade ".NET Eng - Latest" $targetRepo $targetBranch None
+}
+
+$InternalRuntimeBranch = "internal/$RuntimeBranch"
+$InternalSdkBranch = "internal/$SdkBranch"
+
+Write-Host "Making default channels for runtime repos"
+MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int $RuntimeBranch $RuntimeChannel
+MakeDefaultChannel https://github.com/dotnet/aspnetcore $RuntimeBranch $RuntimeChannel
+MakeDefaultChannel https://github.com/dotnet/efcore $RuntimeBranch $RuntimeChannel
+MakeDefaultChannel https://github.com/dotnet/emsdk $RuntimeBranch $RuntimeChannel
+MakeDefaultChannel https://github.com/dotnet/icu $RuntimeBranch $RuntimeChannel
+MakeDefaultChannel https://github.com/dotnet/runtime $RuntimeBranch $RuntimeChannel
+MakeDefaultChannel https://github.com/dotnet/windowsdesktop $RuntimeBranch $RuntimeChannel
+MakeDefaultChannel https://github.com/dotnet/wpf $RuntimeBranch $RuntimeChannel
+MakeDefaultChannel https://github.com/dotnet/winforms $RuntimeBranch $RuntimeChannel
+MakeDefaultChannel https://github.com/dotnet/linker $RuntimeBranch $RuntimeChannel
+
+if ($AddInternalFlow) {
+    # Because of where internal fixes tend to be, we eliminate some leaves in the graph
+    # and flow them through the normal public channels: emsdk, icu, linker.
+    # wpf-int is flowed from the public channel (there is no internal branch or merge) due to
+    # an issue in the staging pipeline where it will give the test feed for the public preview build
+    # internal permissions in some cases because it sees the internal repo publishing locations before
+    # the public locations. The logic is such that if any asset has non-public permissions, the test feed will have
+    # internal permissions.
+    Write-Host "Making default channels for internal branches of runtime repos"
+    MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore $InternalRuntimeBranch $InternalRuntimeChannel
+    MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-efcore $InternalRuntimeBranch $InternalRuntimeChannel
+    MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeBranch $InternalRuntimeChannel
+    MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop $InternalRuntimeBranch $InternalRuntimeChannel
+    MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-wpf $InternalRuntimeBranch $InternalRuntimeChannel
+    MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-winforms $InternalRuntimeBranch $InternalRuntimeChannel
+}
+
+Write-Host "Making default channels for SDK repos"
+MakeDefaultChannel https://github.com/dotnet/installer $SdkBranch $SdkChannel
+MakeDefaultChannel https://github.com/dotnet/sdk $SdkBranch $SdkChannel
+MakeDefaultChannel https://github.com/dotnet/roslyn-analyzers $SdkBranch $SdkChannel
+MakeDefaultChannel https://github.com/dotnet/templating $SdkBranch $SdkChannel
+MakeDefaultChannel https://github.com/dotnet/razor-compiler $SdkBranch $SdkChannel
+
+if ($AddInternalFlow) {
+    # Because of where internal fixes tend to be, we eliminate some leaves in the sdk graph
+    # and flow them through the normal public channels: templating, roslyn-analyzers
+    Write-Host "Making default channels for SDK repos"
+    MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-installer $InternalSdkBranch $InternalSdkChannel
+    MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkBranch $InternalSdkChannel
+    MakeDefaultChannel https://dev.azure.com/dnceng/internal/_git/dotnet-templating $InternalSdkBranch $InternalSdkChannel
+}
+
+Write-Host "Setting up batched merge policies"
+AddBatchedMergePolicy https://github.com/dotnet/aspnetcore $RuntimeBranch
+
+if ($AddInternalFlow) {
+    AddBatchedMergePolicy https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore $InternalRuntimeBranch
+}
+
+Write-Host "Adding arcade flow"
+AddArcadeFlow https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int $RuntimeBranch
+AddArcadeFlow https://github.com/dotnet/aspnetcore $RuntimeBranch
+AddArcadeFlow https://github.com/dotnet/efcore $RuntimeBranch
+AddArcadeFlow https://github.com/dotnet/emsdk $RuntimeBranch
+AddArcadeFlow https://github.com/dotnet/icu $RuntimeBranch
+AddArcadeFlow https://github.com/dotnet/runtime $RuntimeBranch
+AddArcadeFlow https://github.com/dotnet/windowsdesktop $RuntimeBranch
+AddArcadeFlow https://github.com/dotnet/wpf $RuntimeBranch
+AddArcadeFlow https://github.com/dotnet/winforms $RuntimeBranch
+AddArcadeFlow https://github.com/dotnet/linker $RuntimeBranch
+AddArcadeFlow https://github.com/dotnet/installer $SdkBranch
+AddArcadeFlow https://github.com/dotnet/sdk $SdkBranch
+AddArcadeFlow https://github.com/dotnet/roslyn-analyzers $SdkBranch
+AddArcadeFlow https://github.com/dotnet/templating $SdkBranch
+AddArcadeFlow https://github.com/dotnet/razor-compiler $SdkBranch
+
+Write-Host "Adding runtime -> runtime flow"
+AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int $RuntimeChannel https://github.com/dotnet/wpf $RuntimeBranch EveryBuild
+AddBatchedFlow https://github.com/dotnet/efcore $RuntimeChannel https://github.com/dotnet/aspnetcore $RuntimeBranch EveryBuild
+AddBatchedFlow https://github.com/dotnet/emsdk $RuntimeChannel https://github.com/dotnet/aspnetcore $RuntimeBranch EveryBuild
+AddFlow https://github.com/dotnet/emsdk $RuntimeChannel https://github.com/dotnet/runtime $RuntimeBranch EveryBuild
+AddFlow https://github.com/dotnet/icu $RuntimeChannel https://github.com/dotnet/runtime $RuntimeBranch EveryBuild
+AddBatchedFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/aspnetcore $RuntimeBranch EveryBuild
+AddFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/efcore $RuntimeBranch EveryBuild
+AddFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/winforms $RuntimeBranch EveryBuild
+AddFlow https://github.com/dotnet/winforms $RuntimeChannel https://github.com/dotnet/wpf $RuntimeBranch EveryBuild
+AddFlow https://github.com/dotnet/wpf $RuntimeChannel https://github.com/dotnet/windowsdesktop $RuntimeBranch EveryBuild
+AddFlow https://github.com/dotnet/linker $RuntimeChannel https://github.com/dotnet/runtime $RuntimeBranch EveryBuild
+
+if ($AddInternalFlow) {
+    Write-Host "Adding internal runtime -> internal runtime flow"
+    AddBatchedFlow https://dev.azure.com/dnceng/internal/_git/dotnet-efcore $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore $InternalRuntimeBranch EveryBuild
+    AddBatchedFlow https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore $InternalRuntimeBranch EveryBuild
+    AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-efcore $InternalRuntimeBranch EveryBuild
+    AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-winforms $InternalRuntimeBranch EveryBuild
+    AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-winforms $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-wpf $InternalRuntimeBranch EveryBuild
+    AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-wpf $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop $InternalRuntimeBranch EveryBuild
+    
+    Write-Host "Disabling internal runtime -> internal runtime flow"
+    DisableFlow $InternalRuntimeChannel
+}
+
+Write-Host "Add runtime->sdk flow"
+AddFlow https://github.com/dotnet/aspnetcore $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+AddFlow https://github.com/dotnet/windowsdesktop $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+AddFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+AddFlow https://github.com/dotnet/runtime $RuntimeChannel https://github.com/dotnet/templating $SdkBranch EveryBuild
+AddFlow https://github.com/dotnet/linker $RuntimeChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+
+if ($AddInternalFlow) {
+    Write-Host "Adding internal runtime->internal sdk flow"
+    AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkBranch EveryBuild
+    AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkBranch EveryBuild
+    AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkBranch EveryBuild
+    AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-runtime $InternalRuntimeChannel https://dev.azure.com/dnceng/internal/_git/dotnet-templating $InternalSdkBranch EveryBuild
+    
+    Write-Host "Disabling internal runtime->internal sdk flow"
+    DisableFlow $InternalRuntimeChannel
+}
+
+Write-Host "Add sdk->sdk flow"
+AddFlow https://github.com/dotnet/sdk $SdkChannel https://github.com/dotnet/installer $SdkBranch EveryBuild
+AddFlow https://github.com/dotnet/roslyn-analyzers $SdkChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+AddFlow https://github.com/dotnet/templating $SdkChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+AddFlow https://github.com/dotnet/razor-compiler $SdkChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+
+if ($AddInternalFlow) {
+    Write-Host "Adding internal sdk->internal sdk flow"
+    # Nothing but SDK->installer flows internally
+    AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkChannel https://dev.azure.com/dnceng/internal/_git/dotnet-installer $InternalSdkBranch EveryBuild
+    AddFlow https://dev.azure.com/dnceng/internal/_git/dotnet-templating $InternalSdkChannel https://dev.azure.com/dnceng/internal/_git/dotnet-sdk $InternalSdkBranch EveryBuild
+    
+    Write-Host "Disabling internal sdk->internal sdk flow"
+    DisableFlow $InternalSdkChannel
+}
+
+Write-Host "Adding tooling->sdk flow"
+AddFlow https://github.com/nuget/nuget.client $VSChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+AddFlow https://github.com/dotnet/roslyn $VSChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+AddFlow https://github.com/dotnet/fsharp $VSChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+AddFlow https://github.com/dotnet/msbuild $VSChannel https://github.com/dotnet/sdk $SdkBranch EveryBuild
+
+
+
diff --git a/scripts/flip-previewplus-flow.ps1 b/scripts/flip-previewplus-flow.ps1
new file mode 100644
index 00000000000..d09659e7752
--- /dev/null
+++ b/scripts/flip-previewplus-flow.ps1
@@ -0,0 +1,50 @@
+param
+(
+    [Parameter(Mandatory=$true)][string]$RuntimeChannel,
+    [Parameter(Mandatory=$true)][string]$SdkChannel,
+    [Parameter(Mandatory=$true)][string]$InternalRuntimeChannel,
+    [Parameter(Mandatory=$true)][string]$InternalSdkChannel,
+    [Parameter(Mandatory=$true)][ValidateSet('Preview','Preview+')][string]$FlowType,
+    [switch]$TriggerSubscriptions
+)
+
+Write-Host "Switching flow to $FlowType"
+
+switch ( $FlowType )
+{
+    'Preview' {
+        # Switching to public flow is easy. Enable all the subscriptions in the public runtime and SDK channels
+        # and disable any on the internal channels
+        & darc subscription-status --disable --channel "$InternalRuntimeChannel" --quiet --exact
+        & darc subscription-status --disable --channel "$InternalSdkChannel" --quiet --exact
+        & darc subscription-status --enable --channel "$RuntimeChannel" --quiet --exact
+        & darc subscription-status --enable --channel "$SdkChannel" --quiet --exact
+
+        # Trigger public subscriptions
+        if ($TriggerSubscriptions) {
+            & darc trigger-subscriptions --channel "$RuntimeChannel" --quiet --exact
+            & darc trigger-subscriptions --channel "$SdkChannel" --quiet --exact
+        }
+    }
+    'Preview+' {
+        # Switching to internal flow is a little more subtle. Enable the internal subscriptions,
+        # then disable the corresponding public subscriptions, which is a subset of the full public channel
+        & darc subscription-status --enable --channel "$InternalRuntimeChannel" --quiet --exact
+        & darc subscription-status --enable --channel "$InternalSdkChannel" --quiet --exact
+
+        & darc subscription-status --disable --source-repo https://github.com/dotnet/runtime --channel "$RuntimeChannel" --quiet --exact
+        & darc subscription-status --disable --source-repo https://github.com/dotnet/winforms --channel "$RuntimeChannel" --quiet --exact
+        & darc subscription-status --disable --source-repo https://github.com/dotnet/wpf --channel "$RuntimeChannel" --quiet --exact
+        & darc subscription-status --disable --source-repo https://github.com/dotnet/windowsdesktop --channel "$RuntimeChannel" --quiet --exact
+        & darc subscription-status --disable --source-repo https://github.com/dotnet/aspnetcore --channel "$RuntimeChannel" --quiet --exact
+        & darc subscription-status --disable --source-repo https://github.com/dotnet/efcore --channel "$RuntimeChannel" --quiet --exact
+        & darc subscription-status --disable --source-repo https://github.com/dotnet/sdk --channel "$SdkChannel" --quiet --exact
+
+        # Trigger internal subscriptions
+        if ($TriggerSubscriptions) {
+            & darc trigger-subscriptions --channel "$InternalRuntimeChannel" --quiet --exact
+            & darc trigger-subscriptions --channel "$InternalSdkChannel" --quiet --exact
+        }
+    }
+    default { Write-Error "Unknown flow type $FlowType" }
+}
\ No newline at end of file
diff --git a/scripts/set-duplicate-secret.ps1 b/scripts/set-duplicate-secret.ps1
new file mode 100644
index 00000000000..619477210f3
--- /dev/null
+++ b/scripts/set-duplicate-secret.ps1
@@ -0,0 +1,60 @@
+<#
+.SYNOPSIS
+Sets a secret in one vault to be the same as another. Temporary workaround for issues in secret
+layout. Assumes that the Keyvaults are in the same subscription and that the current context
+is set to that subscription.
+
+.PARAMETER SourceVaultName
+Vault where the source secret is located
+
+.PARAMETER SourceSecretName
+Name of source secret
+
+.PARAMETER DestinationVaultName
+Vault where the destination secret is located
+
+.PARAMETER DestinationSecretName
+Name of destination secret. If not specified, the source secret name is used.
+
+#>
+
+param (
+    [Parameter(Mandatory=$true)]
+    [string]$SourceVaultName,
+    [Parameter(Mandatory=$true)]
+    [string]$SourceSecretName,
+    [Parameter(Mandatory=$true)]
+    [string]$DestinationVaultName,
+    [string]$DestinationSecretName
+)
+
+if (!$DestinationSecretName) {
+    $DestinationSecretName = $SourceSecretName
+}
+
+$sourceSecretInfo = Get-AzKeyVaultSecret -VaultName $SourceVaultName -Name $SourceSecretName
+$destinationSecretInfo = Get-AzKeyVaultSecret -VaultName $DestinationVaultName -Name $DestinationSecretName
+
+if (!$sourceSecretInfo) {
+    Write-Error "Could not find source secret '$SourceSecretName' in '$SourceVaultName'"
+    return
+}
+
+if (!$destinationSecretInfo) {
+    Write-Error "Could not find destination secret '$DestinationSecretName' in '$DestinationVaultName'"
+    return
+}
+
+if ($($sourceSecretInfo.SecretValue | ConvertFrom-SecureString -AsPlainText) -eq $($destinationSecretInfo.SecretValue | ConvertFrom-SecureString -AsPlainText)) {
+    Write-Host "Secrets are already the same, not updating."
+    return
+}
+
+$newDestinationSecret = Set-AzKeyVaultSecret -VaultName $DestinationVaultName -Name $DestinationSecretName -SecretValue $sourceSecretInfo.SecretValue -Expires $sourceSecretInfo.Expires -Tag $sourceSecretInfo.Tags -ContentType $sourceSecretInfo.ContextType
+
+if ($($sourceSecretInfo.SecretValue | ConvertFrom-SecureString -AsPlainText) -ne $($newDestinationSecret.SecretValue | ConvertFrom-SecureString -AsPlainText)) {
+    Write-Error "Destination secret was not correctly updated"
+    return
+} else {
+    Write-Host "Destination secret '$DestinationSecretName' in '$DestinationVaultName' is now the same as '$SourceSecretName' in '$SourceVaultName'"
+}
\ No newline at end of file
diff --git a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj
index 653588d240f..98b2095803f 100644
--- a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj
+++ b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>enable</Nullable>
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Common/Microsoft.Arcade.Common/FileSystem.cs b/src/Common/Microsoft.Arcade.Common/FileSystem.cs
index 51c5949d93c..1c9ab5939d4 100644
--- a/src/Common/Microsoft.Arcade.Common/FileSystem.cs
+++ b/src/Common/Microsoft.Arcade.Common/FileSystem.cs
@@ -3,24 +3,28 @@
 
 using System.IO;
 
+#nullable enable
 namespace Microsoft.Arcade.Common
 {
     public class FileSystem : IFileSystem
     {
-        public void CreateDirectory(string path)
-        {
-            Directory.CreateDirectory(path);
-        }
+        public void CreateDirectory(string path) => Directory.CreateDirectory(path);
 
-        public bool DirectoryExists(string path)
-        {
-            return Directory.Exists(path);
-        }
+        public bool DirectoryExists(string path) => Directory.Exists(path);
 
-        public bool FileExists(string path)
-        {
-            return File.Exists(path);
-        }
+        public bool FileExists(string path) => File.Exists(path);
+
+        public void DeleteFile(string path) => File.Delete(path);
+
+        public string? GetDirectoryName(string? path) => Path.GetDirectoryName(path);
+
+        public string? GetFileName(string? path) => Path.GetFileName(path);
+
+        public string? GetFileNameWithoutExtension(string? path) => Path.GetFileNameWithoutExtension(path);
+
+        public string? GetExtension(string? path) => Path.GetExtension(path);
+
+        public string PathCombine(string path1, string path2) => Path.Combine(path1, path2);
 
         public void WriteToFile(string path, string content)
         {
@@ -28,5 +32,11 @@ public void WriteToFile(string path, string content)
             Directory.CreateDirectory(dirPath);
             File.WriteAllText(path, content);
         }
+
+        public void CopyFile(string sourceFileName, string destFileName, bool overwrite = false) => File.Copy(sourceFileName, destFileName, overwrite);
+
+        public Stream GetFileStream(string path, FileMode mode, FileAccess access) => new FileStream(path, mode, access);
+
+        public FileAttributes GetAttributes(string path) => File.GetAttributes(path);
     }
 }
diff --git a/src/Common/Microsoft.Arcade.Common/IFileSystem.cs b/src/Common/Microsoft.Arcade.Common/IFileSystem.cs
index ea6d6705892..9ca0dfd2786 100644
--- a/src/Common/Microsoft.Arcade.Common/IFileSystem.cs
+++ b/src/Common/Microsoft.Arcade.Common/IFileSystem.cs
@@ -1,6 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.IO;
+
+#nullable enable
 namespace Microsoft.Arcade.Common
 {
     public interface IFileSystem
@@ -12,5 +15,23 @@ public interface IFileSystem
         bool DirectoryExists(string path);
 
         void CreateDirectory(string path);
+
+        string? GetFileName(string? path);
+
+        string? GetDirectoryName(string? path);
+
+        string? GetFileNameWithoutExtension(string? path);
+
+        string? GetExtension(string? path);
+
+        string PathCombine(string path1, string path2);
+
+        void DeleteFile(string path);
+
+        void CopyFile(string sourceFileName, string destFileName, bool overwrite = false);
+
+        Stream GetFileStream(string path, FileMode mode, FileAccess access);
+
+        FileAttributes GetAttributes(string path);
     }
 }
diff --git a/src/Common/Microsoft.Arcade.Common/IZipArchiveManager.cs b/src/Common/Microsoft.Arcade.Common/IZipArchiveManager.cs
new file mode 100644
index 00000000000..d1fecb1d6a0
--- /dev/null
+++ b/src/Common/Microsoft.Arcade.Common/IZipArchiveManager.cs
@@ -0,0 +1,59 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.IO;
+using System.IO.Compression;
+using System.Threading.Tasks;
+
+namespace Microsoft.Arcade.Common
+{
+    public interface IZipArchiveManager
+    {
+        /// <summary>
+        /// Opens a given archive.
+        /// </summary>
+        /// <param name="archivePath">Path to the zip archive</param>
+        /// <param name="mode">Access mode</param>
+        ZipArchive OpenArchive(string archivePath, ZipArchiveMode mode);
+
+        /// <summary>
+        /// Loads an embedded resource and adds it to a target archive.
+        /// </summary>
+        /// <typeparam name="TAssembly">Type from the assembly where the resource is embedded (usually the caller)</typeparam>
+        /// <param name="archivePath">Path to the archive where the file will be added</param>
+        /// <param name="resourceName">Name of the embedded resource</param>
+        /// <param name="targetFileName">New name of the file in the archive</param>
+        Task AddResourceFileToArchive<TAssembly>(string archivePath, string resourceName, string targetFileName = null);
+
+        /// <summary>
+        /// Creates a file with given content in a given archive.
+        /// </summary>
+        /// <param name="archivePath">Path to the archive</param>
+        /// <param name="targetFilename">New path of the file in the archive</param>
+        /// <param name="content">Content of the file</param>
+        Task AddContentToArchive(string archivePath, string targetFilename, Stream content);
+
+        /// <summary>
+        /// Creates a file with given content in a given archive.
+        /// </summary>
+        /// <param name="archivePath">Path to the archive</param>
+        /// <param name="targetFilename">New path of the file in the archive</param>
+        /// <param name="content">Content of the file</param>
+        Task AddContentToArchive(string archivePath, string targetFilename, string content);
+
+        /// <summary>
+        /// Compresses a directory into an archive on a given path.
+        /// </summary>
+        /// <param name="directoryPath">The directory to archive</param>
+        /// <param name="archivePath">Path where to create the archive</param>
+        /// <param name="includeBaseDirectory">When true, includes top-level directory in the archive</param>
+        void ArchiveDirectory(string directoryPath, string archivePath, bool includeBaseDirectory);
+
+        /// <summary>
+        /// Creates a new archive containing given file.
+        /// </summary>
+        /// <param name="filePath">File to archive</param>
+        /// <param name="archivePath">Path where to create the archive</param>
+        void ArchiveFile(string filePath, string archivePath);
+    }
+}
diff --git a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj
index 1f20bc3f49b..ac04f51722d 100644
--- a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj
+++ b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netstandard2.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
@@ -18,4 +19,8 @@
     <Compile Remove="MSBuildTaskBase.Desktop.cs" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <Reference Include="System.IO.Compression" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Common/Microsoft.Arcade.Common/ZipArchiveManager.cs b/src/Common/Microsoft.Arcade.Common/ZipArchiveManager.cs
new file mode 100644
index 00000000000..02fbdc0e8ab
--- /dev/null
+++ b/src/Common/Microsoft.Arcade.Common/ZipArchiveManager.cs
@@ -0,0 +1,66 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Arcade.Common
+{
+    public class ZipArchiveManager : IZipArchiveManager
+    {
+        public ZipArchive OpenArchive(string archivePath, ZipArchiveMode mode)
+            => ZipFile.Open(archivePath, mode);
+
+        public async Task AddResourceFileToArchive<TAssembly>(string archivePath, string resourceName, string targetFileName = null)
+        {
+            using Stream fileStream = GetResourceFileContent<TAssembly>(resourceName);
+            await AddContentToArchive(archivePath, targetFileName ?? resourceName, fileStream);
+        }
+
+        public void ArchiveDirectory(string directoryPath, string archivePath, bool includeBaseDirectory)
+            => ZipFile.CreateFromDirectory(directoryPath, archivePath, CompressionLevel.Fastest, includeBaseDirectory);
+
+        public void ArchiveFile(string filePath, string archivePath)
+        {
+            bool archiveExists = File.Exists(archivePath);
+            string entryName = Path.GetFileName(filePath);
+
+            using FileStream fs = File.OpenWrite(archivePath);
+            using ZipArchive zip = new(fs, archiveExists ? ZipArchiveMode.Update : ZipArchiveMode.Create, false);
+                
+            // Overwrite previous file, if any (otherwise dual records were created)
+            if (archiveExists)
+            {
+                zip.Entries.FirstOrDefault(e => e.FullName == entryName)?.Delete();
+            }
+
+            zip.CreateEntryFromFile(filePath, entryName);
+        }
+
+        public Task AddContentToArchive(string archivePath, string targetFilename, string content)
+            => AddContentToArchive(archivePath, targetFilename, new MemoryStream(Encoding.UTF8.GetBytes(content)));
+
+        public async Task AddContentToArchive(string archivePath, string targetFilename, Stream content)
+        {
+            using FileStream archiveStream = new(archivePath, FileMode.Open);
+            using ZipArchive archive = new(archiveStream, ZipArchiveMode.Update);
+
+            // Overwrite previous file, if any (otherwise dual records were created)
+            archive.Entries.FirstOrDefault(e => e.FullName == targetFilename)?.Delete();
+
+            ZipArchiveEntry entry = archive.CreateEntry(targetFilename);
+            using Stream targetStream = entry.Open();
+            await content.CopyToAsync(targetStream);
+        }
+
+        public static Stream GetResourceFileContent<TAssembly>(string resourceFileName)
+        {
+            Assembly assembly = typeof(TAssembly).Assembly;
+            return assembly.GetManifestResourceStream($"{assembly.GetName().Name}.{resourceFileName}");
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/TestDoubles/FakeHttpClient.cs b/src/Common/Microsoft.Arcade.Test.Common/FakeHttpClient.cs
similarity index 83%
rename from src/Microsoft.DotNet.Build.Tasks.Feed.Tests/TestDoubles/FakeHttpClient.cs
rename to src/Common/Microsoft.Arcade.Test.Common/FakeHttpClient.cs
index a47e3c4ee0c..20fa104296f 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/TestDoubles/FakeHttpClient.cs
+++ b/src/Common/Microsoft.Arcade.Test.Common/FakeHttpClient.cs
@@ -7,14 +7,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.DotNet.Build.Tasks.Feed.Tests.TestDoubles
+namespace Microsoft.DotNet.Arcade.Test.Common
 {
     public static class FakeHttpClient
     {
-        public static HttpClient WithResponse(HttpResponseMessage response)
-            => WithResponses(new[] { response });
-
-        public static HttpClient WithResponses(IEnumerable<HttpResponseMessage> responses)
+        public static HttpClient WithResponses(params HttpResponseMessage[] responses)
             => new HttpClient(
                 new FakeHttpMessageHandler(responses));
 
@@ -44,5 +41,4 @@ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage reques
             }
         }
     }
-
 }
diff --git a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
index 6b2a68baf03..bcc3d7179d4 100644
--- a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
+++ b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +11,12 @@
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Arcade.Common\Microsoft.Arcade.Common.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Common/Microsoft.Arcade.Test.Common/MockFileSystem.cs b/src/Common/Microsoft.Arcade.Test.Common/MockFileSystem.cs
new file mode 100644
index 00000000000..b122c2630ab
--- /dev/null
+++ b/src/Common/Microsoft.Arcade.Test.Common/MockFileSystem.cs
@@ -0,0 +1,105 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.Arcade.Common;
+
+#nullable enable
+namespace Microsoft.Arcade.Test.Common
+{
+    public class MockFileSystem : IFileSystem
+    {
+        #region File system state
+
+        public HashSet<string> Directories { get; }    
+        
+        public Dictionary<string, string> Files { get; }
+
+        public List<string> RemovedFiles { get; } = new();
+
+        #endregion
+
+        public MockFileSystem(
+            Dictionary<string, string>? files = null,
+            IEnumerable<string>? directories = null)
+        {
+            Directories = new(directories ?? new string[0]);
+            Files = files ?? new();
+        }
+
+        #region IFileSystem implementation
+
+        public void CreateDirectory(string path) => Directories.Add(path);
+
+        public bool DirectoryExists(string path) => Directories.Contains(path);
+
+        public bool FileExists(string path) => Files.ContainsKey(path);
+
+        public void DeleteFile(string path)
+        {
+            Files.Remove(path);
+            RemovedFiles.Add(path);
+        }
+
+        public string? GetDirectoryName(string? path) => Path.GetDirectoryName(path);
+
+        public string? GetFileName(string? path) => Path.GetFileName(path);
+
+        public string? GetFileNameWithoutExtension(string? path) => Path.GetFileNameWithoutExtension(path);
+
+        public string? GetExtension(string? path) => Path.GetExtension(path);
+
+        public string PathCombine(string path1, string path2) => path1 + "/" + path2;
+
+        public void WriteToFile(string path, string content) => Files[path] = content;
+
+        public void CopyFile(string sourceFileName, string destFileName, bool overwrite = false) => Files[destFileName] = Files[sourceFileName];
+
+        public Stream GetFileStream(string path, FileMode mode, FileAccess access)
+            => FileExists(path) ? new MemoryStream() : new MockFileStream(this, path);
+
+        public FileAttributes GetAttributes(string path)
+        {
+            var attributes = FileAttributes.Normal;
+
+            if (Directories.Contains(path))
+            {
+                attributes |= FileAttributes.Directory;
+            }
+
+            return  attributes;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Allows to write to a stream that will end up in the MockFileSystem.
+        /// </summary>
+        private class MockFileStream : MemoryStream
+        {
+            private readonly MockFileSystem _fileSystem;
+            private readonly string _path;
+            private bool _disposed = false;
+
+            public MockFileStream(MockFileSystem fileSystem, string path)
+                : base(fileSystem.FileExists(path) ? System.Text.Encoding.UTF8.GetBytes(fileSystem.Files[path]) : new byte[2048])
+            {
+                _fileSystem = fileSystem;
+                _path = path;
+            }
+
+            protected override void Dispose(bool disposing)
+            {
+                // flush file to our system
+                if (!_disposed)
+                {
+                    _disposed = true;
+                    using var sr = new StreamReader(this);
+                    Seek(0, SeekOrigin.Begin);
+                    _fileSystem.WriteToFile(_path, sr.ReadToEnd().Replace("\0", ""));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Common/wix/dotnethome_x64.wxs b/src/Common/wix/dotnethome_x64.wxs
new file mode 100644
index 00000000000..d62c71b0e9d
--- /dev/null
+++ b/src/Common/wix/dotnethome_x64.wxs
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?ifndef Platform?>
+    <?define Platform = "$(sys.BUILDARCH)"?>
+  <?endif?>
+
+  <!-- InstallerNativeMachine matches the expected values for image file machine constants
+       https://docs.microsoft.com/en-us/windows/win32/sysinfo/image-file-machine-constants -->
+  <?if $(var.Platform)~=x86?>
+    <?define InstallerNativeMachine=332?>
+  <?elseif $(var.Platform)~=x64?>
+    <?define InstallerNativeMachine=34404?>
+  <?elseif $(var.Platform)~=arm64?>
+    <?define InstallerNativeMachine=43620?>
+  <?else?>
+    <?error Unknown platform, $(var.Platform) ?>
+  <?endif?>
+
+  <Fragment>
+    <!-- Identify when installing in emulation as when WIX_NATIVE_MACHINE does not match the installer 
+         native machine (where supported).  Also detect running under WOW on x86 using VersionNT64, 
+         since WIX_NATIVE_MACHINE cannot be retrieved on older Windows builds. -->
+    <PropertyRef Id="WIX_NATIVE_MACHINE" />
+    <SetProperty Action="Set_NON_NATIVE_ARCHITECTURE" Id="NON_NATIVE_ARCHITECTURE" Value="true" Before="CostFinalize">
+     <?if $(var.Platform)~=x86?>
+      VersionNT64 OR
+     <?endif?>
+      WIX_NATIVE_MACHINE AND NOT WIX_NATIVE_MACHINE="$(var.InstallerNativeMachine)"
+    </SetProperty>
+  </Fragment>
+
+  <?if $(var.Platform)~=x64?>
+  <Fragment>
+    <!-- When running in a non-native architecture and user hasn't specified install directory,
+         install to an x64 subdirectory.
+         This is only define for x64, since x86 has redirection and no other native architecture can install ARM64 today -->
+    <SetProperty Action="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" Id="DOTNETHOME" Value="[ProgramFiles64Folder]dotnet\x64\" After="Set_NON_NATIVE_ARCHITECTURE">
+      NON_NATIVE_ARCHITECTURE AND NOT DOTNETHOME
+    </SetProperty>
+  </Fragment>
+  <?endif?>
+</Wix>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.ApiCompat/src/Rules/Compat/AttributeDifference.cs b/src/Microsoft.DotNet.ApiCompat/src/Rules/Compat/AttributeDifference.cs
index 8558803afd0..f3a5d13dab3 100644
--- a/src/Microsoft.DotNet.ApiCompat/src/Rules/Compat/AttributeDifference.cs
+++ b/src/Microsoft.DotNet.ApiCompat/src/Rules/Compat/AttributeDifference.cs
@@ -83,7 +83,7 @@ public override DifferenceType Diff(IDifferences differences, ITypeDefinitionMem
             if (implMethod == null || contractMethod == null)
                 return DifferenceType.Unknown;
 
-            bool changed = CheckAttributeDifferences(differences, implMethod, implMethod.Attributes, implMethod.Attributes);
+            bool changed = CheckAttributeDifferences(differences, implMethod, implMethod.Attributes, contractMethod.Attributes);
 
             IParameterDefinition[] method1Params = implMethod.Parameters.ToArray();
             IParameterDefinition[] method2Params = contractMethod.Parameters.ToArray();
diff --git a/src/Microsoft.DotNet.ApiCompat/src/Rules/Compat/ParameterModifiersCannotChange.cs b/src/Microsoft.DotNet.ApiCompat/src/Rules/Compat/ParameterModifiersCannotChange.cs
index 03fa47e2f88..bcda21f01c0 100644
--- a/src/Microsoft.DotNet.ApiCompat/src/Rules/Compat/ParameterModifiersCannotChange.cs
+++ b/src/Microsoft.DotNet.ApiCompat/src/Rules/Compat/ParameterModifiersCannotChange.cs
@@ -129,8 +129,8 @@ private string GetReturnValueModifier(IMethodDefinition method)
 
         private class ModifierComparer : IEqualityComparer<ICustomModifier>
         {
-            private readonly static IEqualityComparer<ITypeDefinition> TypeComparer =
-                CciComparers.Default.GetEqualityComparer<ITypeDefinition>();
+            private readonly static IEqualityComparer<ITypeReference> TypeComparer =
+                CciComparers.Default.GetEqualityComparer<ITypeReference>();
 
             private ModifierComparer() { }
 
@@ -144,7 +144,7 @@ public bool Equals(ICustomModifier x, ICustomModifier y)
                 }
 
                 return x.IsOptional == y.IsOptional &&
-                    TypeComparer.Equals(x.Modifier.ResolvedType, y.Modifier.ResolvedType);
+                    TypeComparer.Equals(x.Modifier, y.Modifier);
             }
 
             public int GetHashCode(ICustomModifier obj)
@@ -154,7 +154,7 @@ public int GetHashCode(ICustomModifier obj)
                     return 0;
                 }
 
-                return (obj.IsOptional ? 1 : 0) | TypeComparer.GetHashCode(obj.Modifier.ResolvedType) << 1;
+                return (obj.IsOptional ? 1 : 0) | TypeComparer.GetHashCode(obj.Modifier) << 1;
             }
         }
     }
diff --git a/src/Microsoft.DotNet.ApiCompat/tests/AttributeDifferenceTests.cs b/src/Microsoft.DotNet.ApiCompat/tests/AttributeDifferenceTests.cs
index 67019760c4b..b5d0f5d4c75 100644
--- a/src/Microsoft.DotNet.ApiCompat/tests/AttributeDifferenceTests.cs
+++ b/src/Microsoft.DotNet.ApiCompat/tests/AttributeDifferenceTests.cs
@@ -22,9 +22,10 @@ public void AttributeDifferenceIsFound()
             Assert.Contains("CannotRemoveAttribute : Attribute 'AttributeDifference.FooAttribute' exists on 'AttributeDifference.AttributeDifferenceClass1' in the implementation but not the contract.", runOutput);
             Assert.Contains("CannotRemoveAttribute : Attribute 'System.ComponentModel.DefaultValueAttribute' exists on generic param 'T' on member 'AttributeDifference.AttributeDifferenceClass1.GenericMethodWithAttribute<T>()' in the implementation but not the contract.", runOutput);
             Assert.Contains("CannotRemoveAttribute : Attribute 'System.ComponentModel.DefaultValueAttribute' exists on generic param 'T' on member 'AttributeDifference.AttributeDifferenceClass1.GenericMethodWithAttribute<T>()' in the implementation but not the contract.", runOutput);
+            Assert.Contains("CannotRemoveAttribute : Attribute 'AttributeDifference.FooAttribute' exists on 'AttributeDifference.AttributeDifferenceClass1.MethodWithAttribute()' in the implementation but not the contract.", runOutput);
             Assert.Contains("CannotRemoveAttribute : Attribute 'AttributeDifference.FooAttribute' exists on parameter 'myParameter' on member 'AttributeDifference.AttributeDifferenceClass1.MethodWithAttribute(System.String, System.Object)' in the implementation but not the contract.", runOutput);
             Assert.Contains("CannotRemoveAttribute : Attribute 'System.ComponentModel.DefaultValueAttribute' exists on generic param 'TOne' on member 'AttributeDifference.AttributeDifferenceGenericCLass<TOne, TTwo>' in the implementation but not the contract.", runOutput);
-            Assert.Contains("Total Issues: 5", runOutput);
+            Assert.Contains("Total Issues: 6", runOutput);
         }
 
         [Fact]
diff --git a/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Contract/AttributeDifference.cs b/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Contract/AttributeDifference.cs
index 11a807074ab..1344760bc70 100644
--- a/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Contract/AttributeDifference.cs
+++ b/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Contract/AttributeDifference.cs
@@ -10,6 +10,7 @@ public class AttributeDifferenceClass1
     {
         public string MethodWithAttribute(string myParameter, [DefaultValue("myObject")] object myObject) => throw null;
         public T GenericMethodWithAttribute<T>() => throw null;
+        public void MethodWithAttribute() { }
     }
     public class AttributeDifferenceGenericCLass<TOne, [DefaultValue("TTwo")] TTwo>
     {
diff --git a/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Implementation/AttributeDifferenceClass1.cs b/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Implementation/AttributeDifferenceClass1.cs
index c34b0c62efe..2e9020dd8f1 100644
--- a/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Implementation/AttributeDifferenceClass1.cs
+++ b/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Implementation/AttributeDifferenceClass1.cs
@@ -13,6 +13,8 @@ public class AttributeDifferenceClass1
     {
         public string MethodWithAttribute([Foo] string myParameter, [DefaultValue("myObject")] object myObject) => myParameter;
         public T GenericMethodWithAttribute<[DefaultValue("T")] T>() => default(T);
+        [Foo]
+        public void MethodWithAttribute() { }
     }
 
     public class AttributeDifferenceGenericCLass<[DefaultValue("TOne")] TOne, [DefaultValue("TTwo")] TTwo>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
index cb00a3c492f..32d30e285c7 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
@@ -19,7 +19,7 @@
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
     <EnableGeneratedPackageContent>false</EnableGeneratedPackageContent>
     <_GeneratedVersionFilePath>$(IntermediateOutputPath)DefaultVersions.Generated.props</_GeneratedVersionFilePath>
-    <NoWarn>3021;NU5105</NoWarn>
+    <NoWarn>3021;NU5105;SYSLIB0013</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -81,9 +81,10 @@
     <MicrosoftNetILLinkTasksVersion>$(MicrosoftNetILLinkTasksVersion)</MicrosoftNetILLinkTasksVersion>
     <MicrosoftSourceLinkVersion>$(MicrosoftSourceLinkVersion)</MicrosoftSourceLinkVersion>
     <MicrosoftDiaSymReaderPdb2PdbVersion>$(MicrosoftDiaSymReaderPdb2PdbVersion)</MicrosoftDiaSymReaderPdb2PdbVersion>
-    <XliffTasksVersion>$(XliffTasksVersion)</XliffTasksVersion>
+    <MicrosoftDotNetXliffTasksVersion>$(MicrosoftDotNetXliffTasksVersion)</MicrosoftDotNetXliffTasksVersion>
     <MicrosoftDotNetMaestroTasksVersion>$(MicrosoftDotNetMaestroTasksVersion)</MicrosoftDotNetMaestroTasksVersion>
     <MicrosoftSymbolUploaderBuildTaskVersion>$(MicrosoftSymbolUploaderBuildTaskVersion)</MicrosoftSymbolUploaderBuildTaskVersion>
+    <MicrosoftTemplateEngineTasksVersion>$(MicrosoftTemplateEngineTasksVersion)</MicrosoftTemplateEngineTasksVersion>
   </PropertyGroup>
 </Project>]]>
   </_SdkVersionPropsContent>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/CalculateAssemblyAndFileVersions.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/CalculateAssemblyAndFileVersions.cs
index b65c0985bc3..4eae5836756 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/CalculateAssemblyAndFileVersions.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/CalculateAssemblyAndFileVersions.cs
@@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Arcade.Sdk
     /// File version has 4 parts and need to increase every official build.This is especially important when building MSIs.
     /// See https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Versioning.md#assembly-version.
     /// </summary>
-    public class CalculateAssemblyAndFileVersions : Task
+    public class CalculateAssemblyAndFileVersions : Microsoft.Build.Utilities.Task
     {
         private const int MaxMinor = 654;
         private const int MaxBuild = 9999;
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/CheckRequiredDotNetVersion.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/CheckRequiredDotNetVersion.cs
index 6819daa3016..8b49d82309c 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/CheckRequiredDotNetVersion.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/CheckRequiredDotNetVersion.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.DotNet.Arcade.Sdk
 {
-    public class CheckRequiredDotNetVersion : Task
+    public class CheckRequiredDotNetVersion : Microsoft.Build.Utilities.Task
     {
         private static readonly string s_cacheKey = "CheckRequiredDotNetVersion-6ED0A075-A4B3-46B1-97D4-448558D515D3";
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/CompareVersions.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/CompareVersions.cs
index 3a8586d471a..27be9af27db 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/CompareVersions.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/CompareVersions.cs
@@ -7,7 +7,7 @@
 
 namespace Microsoft.DotNet.Arcade.Sdk
 {
-    public class CompareVersions : Task
+    public class CompareVersions : Microsoft.Build.Utilities.Task
     {
         [Required]
         public string Left { get; set; }
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/DownloadFile.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/DownloadFile.cs
index 7f75eb23dae..3c8f19e9aca 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/DownloadFile.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/DownloadFile.cs
@@ -13,7 +13,7 @@
 
 namespace Microsoft.DotNet.Arcade.Sdk
 {
-    public class DownloadFile : Task, ICancelableTask
+    public class DownloadFile : Microsoft.Build.Utilities.Task, ICancelableTask
     {
         /// <summary>
         /// List of URls to attempt download from. Accepted metadata are:
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/ExtractNgenMethodList.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/ExtractNgenMethodList.cs
index 61d1373af99..579f86475e0 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/ExtractNgenMethodList.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/ExtractNgenMethodList.cs
@@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Arcade.Sdk
     /// Used to convert a raw XML dump from IBCMerge into the set of methods which will be NGEN'd when 
     /// partial NGEN is enabled
     /// </summary>
-    public sealed class ExtractNgenMethodList : Task
+    public sealed class ExtractNgenMethodList : Microsoft.Build.Utilities.Task
     {
         /// <summary>
         /// This is the XML file produced by passing -dxml to ibcmerge. It will be transformed into the set of
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateChecksums.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateChecksums.cs
index 8fa04acf84b..6370ce65532 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateChecksums.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateChecksums.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.DotNet.Arcade.Sdk
 {
-    public class GenerateChecksums : Task
+    public class GenerateChecksums : Microsoft.Build.Utilities.Task
     {
         /// <summary>
         /// An item collection of files for which to generate checksums.  Each item must have metadata
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs
index 20eea4a6d3b..dd4168581b0 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs
@@ -14,7 +14,7 @@
 
 namespace Microsoft.DotNet.Arcade.Sdk
 {
-    public sealed class GenerateResxSource : Task
+    public sealed class GenerateResxSource : Microsoft.Build.Utilities.Task
     {
         private const int maxDocCommentLength = 256;
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateSourcePackageSourceLinkTargetsFile.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateSourcePackageSourceLinkTargetsFile.cs
index de64492076d..bdfc35ffd2f 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateSourcePackageSourceLinkTargetsFile.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateSourcePackageSourceLinkTargetsFile.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.DotNet.Arcade.Sdk
 {
-    public sealed class GenerateSourcePackageSourceLinkTargetsFile : Task
+    public sealed class GenerateSourcePackageSourceLinkTargetsFile : Microsoft.Build.Utilities.Task
     {
         [Required]
         public string ProjectDirectory { get; set; }
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GetAssemblyFullName.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GetAssemblyFullName.cs
index e507dc6f8cc..f04c6095010 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/GetAssemblyFullName.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GetAssemblyFullName.cs
@@ -7,7 +7,7 @@
 
 namespace Microsoft.DotNet.Arcade.Sdk
 {
-    public class GetAssemblyFullName : Task
+    public class GetAssemblyFullName : Microsoft.Build.Utilities.Task
     {
         [Required]
         public ITaskItem[] Items { get; set; }
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GetLicenseFilePath.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GetLicenseFilePath.cs
index 308fad34a81..d195c79398e 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/GetLicenseFilePath.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GetLicenseFilePath.cs
@@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Arcade.Sdk
     /// Finds a license file in the given directory.
     /// File is considered a license file if its name matches 'license(.txt|.md|)', ignoring case.
     /// </summary>
-    public class GetLicenseFilePath : Task
+    public class GetLicenseFilePath : Microsoft.Build.Utilities.Task
     {
         /// <summary>
         /// Full path to the directory to search for the license file.
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GroupItemsBy.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GroupItemsBy.cs
index 649668f8727..cf8b54f8e31 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/GroupItemsBy.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GroupItemsBy.cs
@@ -30,7 +30,7 @@ namespace Microsoft.DotNet.Arcade.Sdk
     /// ]]>
     /// 
     /// </summary>
-    public sealed class GroupItemsBy : Task
+    public sealed class GroupItemsBy : Microsoft.Build.Utilities.Task
     {
         /// <summary>
         /// Items to group by their ItemSpec.
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs
index 4e3a8f71e0e..c4369b78d95 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs
@@ -19,7 +19,7 @@ public class InstallDotNetCore : AppDomainIsolatedTask
     {
         static InstallDotNetCore() => AssemblyResolution.Initialize();
 #else
-    public class InstallDotNetCore : Task
+    public class InstallDotNetCore : Microsoft.Build.Utilities.Task
     {
 #endif
         public string VersionsPropsPath { get; set; }
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/LocateDotNet.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/LocateDotNet.cs
index 6a2b1433839..de9e57de048 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/LocateDotNet.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/LocateDotNet.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.DotNet.Arcade.Sdk
 {
-    public class LocateDotNet : Task
+    public class LocateDotNet : Microsoft.Build.Utilities.Task
     {
         private static readonly string s_cacheKey = "LocateDotNet-FCDFF825-F35B-4601-9CB5-74DCA498B589";
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/SaveItems.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/SaveItems.cs
index 05dc27ee121..48c57dc7dc5 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/SaveItems.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/SaveItems.cs
@@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Arcade.Sdk
     /// This task writes msbuild Items with their metadata to a props file.
     /// Useful to statically save a status of an Item that will be used later on by just importing the generated file.
     /// </summary>
-    public class SaveItems : Task
+    public class SaveItems : Microsoft.Build.Utilities.Task
     {
         [Required]
         public string ItemName { get; set; }
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/SetCorFlags.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/SetCorFlags.cs
index 6db35be225d..593ba369bc9 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/SetCorFlags.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/SetCorFlags.cs
@@ -18,7 +18,7 @@ public class SetCorFlags : AppDomainIsolatedTask
     {
         static SetCorFlags() => AssemblyResolution.Initialize();
 #else
-    public class SetCorFlags : Task
+    public class SetCorFlags : Microsoft.Build.Utilities.Task
     {
 #endif
         [Required]
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/SingleError.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/SingleError.cs
index d190df39854..779f1e2698d 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/SingleError.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/SingleError.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.DotNet.Arcade.Sdk
 {
-    public sealed class SingleError : Task
+    public sealed class SingleError : Microsoft.Build.Utilities.Task
     {
         private static readonly string s_cacheKeyPrefix = "SingleError-F88E25C6-1488-4E81-A458-A0921794E6E3:";
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/AddSourceToNuGetConfig.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/AddSourceToNuGetConfig.cs
index b30fe953721..30a5c3447b5 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/AddSourceToNuGetConfig.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/AddSourceToNuGetConfig.cs
@@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Arcade.Sdk.SourceBuild
     /// also by default adds a 'clear' element if none exists, to avoid
     /// unintended leaks from the build environment.
     /// </summary>
-    public class AddSourceToNuGetConfig : Task
+    public class AddSourceToNuGetConfig : Microsoft.Build.Utilities.Task
     {
         [Required]
         public string NuGetConfigFile { get; set; }
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/ReadSourceBuildIntermediateNupkgDependencies.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/ReadSourceBuildIntermediateNupkgDependencies.cs
index fe73e1c9f75..0a2488a9ed9 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/ReadSourceBuildIntermediateNupkgDependencies.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/SourceBuild/ReadSourceBuildIntermediateNupkgDependencies.cs
@@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Arcade.Sdk.SourceBuild
     /// Reads entries in a Version.Details.xml file to find intermediate nupkg dependencies. For
     /// each dependency with a "SourceBuild" element, adds an item to the "Dependencies" output.
     /// </summary>
-    public class ReadSourceBuildIntermediateNupkgDependencies : Task
+    public class ReadSourceBuildIntermediateNupkgDependencies : Microsoft.Build.Utilities.Task
     {
         [Required]
         public string VersionDetailsXmlFile { get; set; }
@@ -30,9 +30,14 @@ public class ReadSourceBuildIntermediateNupkgDependencies : Task
 
         /// <summary>
         /// %(Identity): NuGet package ID.
+        /// %(Name): The Name of the dependency from Version.Details.xml.
         /// %(ExactVersion): NuGet package version. This can be used to look up the restored package
         ///   contents in a package cache.
         /// %(Version): NuGet package version, wrapped in "[version]" syntax for exact match.
+        /// %(Uri): The URI for the dependency repo.
+        /// %(Sha): The commit Sha for the dependency.
+        /// %(SourceBuildRepoName): The repo name for the dependency to use in source-build.
+        /// %(SourceBuildManagedOnly): Specifies whether the dependency is managed only code.
         /// </summary>
         [Output]
         public ITaskItem[] Dependencies { get; set; }
@@ -77,6 +82,11 @@ XName CreateQualifiedName(string plainName)
 
                     string dependencyVersion = d.Attribute("Version")?.Value;
 
+                    string dependencyUri = d.Element(CreateQualifiedName("Uri"))?.Value;
+                    string dependencySha = d.Element(CreateQualifiedName("Sha"))?.Value;
+                    string sourceBuildRepoName = sourceBuildElement.Attribute("RepoName")?.Value;
+                    string sourceBuildManagedOnly = sourceBuildElement.Attribute("ManagedOnly")?.Value;
+
                     if (string.IsNullOrEmpty(dependencyVersion))
                     {
                         // We need a version to bring down an intermediate nupkg. Fail.
@@ -110,8 +120,13 @@ XName CreateQualifiedName(string plainName)
                         identity,
                         new Dictionary<string, string>
                         {
+                            ["Name"] = dependencyName,
                             ["Version"] = $"[{dependencyVersion}]",
-                            ["ExactVersion"] = dependencyVersion
+                            ["ExactVersion"] = dependencyVersion,
+                            ["Uri"] = dependencyUri,
+                            ["Sha"] = dependencySha,
+                            ["SourceBuildRepoName"] = sourceBuildRepoName,
+                            ["SourceBuildManagedOnly"] = sourceBuildManagedOnly
                         });
                 })
                 .Where(d => d != null)
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/Unsign.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/Unsign.cs
index 11ea33e31a4..934939e265d 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/Unsign.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/Unsign.cs
@@ -18,7 +18,7 @@ public sealed class Unsign : AppDomainIsolatedTask
     {
         static Unsign() => AssemblyResolution.Initialize();
 #else
-    public class Unsign : Task
+    public class Unsign : Microsoft.Build.Utilities.Task
     {
 #endif
         [Required]
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/ValidateLicense.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/ValidateLicense.cs
index 94f2e37a041..7cff00a0888 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/ValidateLicense.cs
+++ b/src/Microsoft.DotNet.Arcade.Sdk/src/ValidateLicense.cs
@@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Arcade.Sdk
     /// <summary>
     /// Checks that the content of two license files is the same modulo line breaks, leading and trailing whitespace.
     /// </summary>
-    public class ValidateLicense : Task
+    public class ValidateLicense : Microsoft.Build.Utilities.Task
     {
         /// <summary>
         /// Full path to the file that contains the license text to be validated.
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
index 5d67c1c7f62..8c8fa7ef037 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
@@ -1,5 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project DefaultTargets="Execute" TreatAsLocalProperty="RepoRoot">
+<Project DefaultTargets="Execute">
   <!--
 
   Required parameters:
@@ -33,9 +33,6 @@
   -->
 
   <PropertyGroup>
-    <_RepoRootOriginal>$(RepoRoot)</_RepoRootOriginal>
-    <RepoRoot>$([System.IO.Path]::GetFullPath('$(RepoRoot)/'))</RepoRoot>
-
     <_OriginalProjectsValue>$(Projects)</_OriginalProjectsValue>
   </PropertyGroup>
 
@@ -80,8 +77,8 @@
 
   <Target Name="Execute">
     <Error Text="No projects were found to build. Either the 'Projects' property or 'ProjectToBuild' item group must be specified." Condition="'@(ProjectToBuild)' == ''"/>
-    <Error Text="Property 'RepoRoot' must be specified" Condition="'$(_RepoRootOriginal)' == ''"/>
-    <Error Text="File 'global.json' must exist in directory specified by RepoRoot: '$(_RepoRootOriginal)'" Condition="'$(_RepoRootOriginal)' != '' and !Exists('$(RepoRoot)global.json')"/>
+    <Error Text="Property 'RepoRoot' must be specified" Condition="'$(RepoRoot)' == ''"/>
+    <Error Text="File 'global.json' must exist in directory specified by RepoRoot: '$(RepoRoot)'" Condition="'$(RepoRoot)' != '' and !Exists('$(RepoRoot)global.json')"/>
 
     <PropertyGroup>
       <!-- 'IsRunningFromVisualStudio' may be true even when running msbuild.exe from command line. This generally means that MSBuild is from a Visual Studio installation and therefore we need to find NuGet.targets in a different location. -->
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
index f5defdb54ef..d4fc4a369a5 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
@@ -66,7 +66,7 @@
   <!--
     Disable features when building from source.
   -->
-  <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+  <PropertyGroup Condition="'$(ArcadeBuildFromSource)' == 'true'">
     <UsingToolPdbConverter>false</UsingToolPdbConverter>
     <UsingToolVSSDK>false</UsingToolVSSDK>
     <UsingToolIbcOptimization>false</UsingToolIbcOptimization>
@@ -82,14 +82,13 @@
     <DropAppVersion Condition="'$(DropAppVersion)' == ''">18.165.29912-buildid11693003</DropAppVersion>
     <MicroBuildPluginsSwixBuildVersion Condition="'$(MicroBuildPluginsSwixBuildVersion)' == ''">1.0.422</MicroBuildPluginsSwixBuildVersion>
     <MicroBuildCoreVersion Condition="'$(MicroBuildCoreVersion)' == ''">0.2.0</MicroBuildCoreVersion>
-    <MicrosoftDotNetIBCMergeVersion Condition="'$(MicrosoftDotNetIBCMergeVersion)' == ''">5.0.7-beta.20159.1</MicrosoftDotNetIBCMergeVersion>
+    <MicrosoftDotNetIBCMergeVersion Condition="'$(MicrosoftDotNetIBCMergeVersion)' == ''">5.1.0-beta.21356.1</MicrosoftDotNetIBCMergeVersion>
     <MicrosoftNETTestSdkVersion Condition="'$(MicrosoftNETTestSdkVersion)' == ''">16.6.1</MicrosoftNETTestSdkVersion>
-    <MicrosoftNetFrameworkReferenceAssembliesVersion Condition="'$(MicrosoftNetFrameworkReferenceAssembliesVersion)' == ''">1.0.0-preview.2</MicrosoftNetFrameworkReferenceAssembliesVersion>
     <MicrosoftVSSDKBuildToolsVersion Condition="'$(MicrosoftVSSDKBuildToolsVersion)' == ''">16.9.1050</MicrosoftVSSDKBuildToolsVersion>
     <MicrosoftDotnetNuGetRepackTasksVersion Condition="'$(MicrosoftDotnetNuGetRepackTasksVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotnetNuGetRepackTasksVersion>
     <MicrosoftDotNetSignToolVersion Condition="'$(MicrosoftDotNetSignToolVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetSignToolVersion>
     <MicrosoftTestPlatformVersion Condition="'$(MicrosoftTestPlatformVersion)' == ''">16.5.0</MicrosoftTestPlatformVersion>
-    <XUnitVersion Condition="'$(XUnitVersion)' == ''">2.4.1</XUnitVersion>
+    <XUnitVersion Condition="'$(XUnitVersion)' == ''">2.4.2-pre.9</XUnitVersion>
     <XUnitRunnerConsoleVersion Condition="'$(XUnitRunnerConsoleVersion)' == ''">$(XUnitVersion)</XUnitRunnerConsoleVersion>
     <!-- Version 2.4.3 of xunit.runner.visualstudio was released to fix testing of net5 projects without updating any other xunit packages -->
     <XUnitRunnerVisualStudioVersion Condition="'$(XUnitRunnerVisualStudioVersion)' == ''">2.4.3</XUnitRunnerVisualStudioVersion>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
index e2d000ccc54..7ab283ab033 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
-  <!--
-    Import NuGet targets to WPF temp projects (workaround for https://github.com/dotnet/sourcelink/issues/91) 
-  -->
-  <Import Project="$(_WpfTempProjectNuGetFilePathNoExt).targets" Condition="'$(_WpfTempProjectNuGetFilePathNoExt)' != '' and Exists('$(_WpfTempProjectNuGetFilePathNoExt).targets')"/>
-
   <!-- 
     Some projects do not import Common targets, so BeforeCommonTargets.targets doesn't get imported. 
     (https://github.com/dotnet/arcade/issues/2676).
@@ -23,7 +18,7 @@
   <Import Project="Tests.targets" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
 
   <Import Project="Performance.targets" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
-  <Import Project="Localization.targets" Condition="'$(UsingToolXliff)' == 'true'"/>
+  <Import Project="Localization.targets" />
   <Import Project="VisualStudio.targets" Condition="'$(UsingToolVSSDK)' == 'true' and ('$(IsVsixProject)' == 'true' or '$(IsSwixProject)' == 'true' or '$(GeneratePkgDefFile)' == 'true') and '$(MSBuildRuntimeType)' != 'Core'"/>
   <Import Project="OptimizationData.targets" Condition="'$(UsingToolIbcOptimization)' == 'true'"/>
   <Import Project="SymStore.targets" Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OS)' == 'Windows_NT'"/>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets
index d6558f3abd5..a4c1f08916e 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets
@@ -3,11 +3,11 @@
 <Project>
 
   <!--
+    XliffTasks for localizing .resx files and generating satellite assemblies.
     When not building in CI, automatically sync .xlf files to .resx files on build.
     Otherwise, let the build fail to catch .xlf files that are not up-to-date.
   -->
-
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(UsingToolXliff)' == 'true'">
     <!-- 
       It is only intended to automatically run update during dev cycle. However, it will fail the build on CI if the XLF file is not updated.
       XLF file should be checked in and loc team will update the XLF it with translated version.
@@ -23,6 +23,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" Condition="'$(IsShippingAssembly)' == 'true'" />
+    <PackageReference Include="Microsoft.DotNet.XliffTasks" Version="$(MicrosoftDotNetXliffTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" Condition="'$(UsingToolXliff)' == 'true' and '$(IsShippingAssembly)' == 'true'" />
+  </ItemGroup>
+
+
+  <!-- TemplateLocalizer for localizing 'dotnet new' templates -->
+  <PropertyGroup Condition="'$(UsingToolTemplateLocalizer)' == 'true'">
+    <!-- Run localizer when building on dev machine. -->
+    <LocalizeTemplates Condition="'$(ContinuousIntegrationBuild)' != 'true'">true</LocalizeTemplates>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.TemplateEngine.Tasks" Version="$(MicrosoftTemplateEngineTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" Condition="'$(UsingToolTemplateLocalizer)' == 'true'" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets
index cc66fbca32b..737ec7a2924 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets
@@ -8,6 +8,7 @@
       EnableNgenOptimization             Set to true to enable NGEN optimization (partial or full).
       EnableNgenOptimizationLogDetails   Set to true to enable NGEN method logging output
       ApplyNgenOptimization              Set to 'partial' or 'full' in a project to embed partial/full NGEN optimization data to the built binary.
+      IgnoreIbcMergeErrors               Set to true to ignore certain errors encountered while running ibcmerge, those problematic IBC files will be ignored.
 
     Items:  
       OptimizeAssembly                   Set of assemblies to apply Partial NGEN optimization data to.
@@ -117,6 +118,8 @@
     <PropertyGroup>
       <_PartialNgenArg/>
       <_PartialNgenArg Condition="'$(ApplyNgenOptimization)' == 'partial'">-partialNGEN</_PartialNgenArg>
+      <_IgnoreMvidMismatchArg/>
+      <_IgnoreMvidMismatchArg Condition="'$(IgnoreIbcMergeErrors)' == 'true'">-ignoremvidmismatch</_IgnoreMvidMismatchArg>
     </PropertyGroup>
 
     <ItemGroup>
@@ -127,7 +130,7 @@
         <!--
           -delete to delete data previously embedded in the binary. 
         -->
-        <IbcMergeArgs>-q -f $(_PartialNgenArg) -minify -delete -mo "%(_AssemblyWithRawIbcData.PreviousAssemblyCopyPath)" "$([MSBuild]::ValueOrDefault('%(_AssemblyWithRawIbcData.IbcFiles)', '').Replace(';', '" "'))"</IbcMergeArgs>
+        <IbcMergeArgs>-q -f $(_PartialNgenArg) $(_IgnoreMvidMismatchArg) -minify -delete -mo "%(_AssemblyWithRawIbcData.PreviousAssemblyCopyPath)" "$([MSBuild]::ValueOrDefault('%(_AssemblyWithRawIbcData.IbcFiles)', '').Replace(';', '" "'))"</IbcMergeArgs>
       </_IbcMergeInvocation>
 
       <_IbcMergeInvocation Include="%(_AssemblyWithRawIbcData.AssemblyFileName) [MergePreviousToCurrent]">
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
index 558205ec53f..ae754b76748 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
@@ -264,6 +264,16 @@
 
   <Import Project="Sign.props" />
 
+  <!-- Update sign infos that were using Microsoft400 to use the .NET-specific cert if UseDotNetCertificate is present.
+       This will update any use, even if explicitly specified.
+       NOTE: This is outside the target on purpose, as Update will not correctly evaluate in the target. See
+       https://github.com/dotnet/msbuild/issues/1618. -->
+  <ItemGroup Condition="$(UseDotNetCertificate)">
+    <FileExtensionSignInfo Update="@(FileExtensionSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
+    <StrongNameSignInfo Update="@(StrongNameSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
+    <FileSignInfo Update="@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
+  </ItemGroup>
+
   <Import Project="SourceBuild/SourceBuildArcadePublish.targets" Condition="'$(ArcadeBuildFromSource)' == 'true'" />
 
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets
index bdb872e1f66..e5c6b9b39e1 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets
@@ -42,18 +42,20 @@
 
   <!-- 
     The convention for names of Azure DevOps repositories mirrored from GitHub is "{GitHub org name}-{GitHub repository name}"
+    In the legacy devdiv.visualstudio instance, it is instead "{GitHub org name}-{GitHub repository name}-Trusted" with no guarantees for casing.
   -->
   <PropertyGroup>
     <!-- There are quite a few git repo forms:
       https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-arcade-services
       https://dev.azure.com/dnceng/internal/_git/dotnet-arcade-services
       https://dnceng.visualstudio.com/internal/_git/dotnet-arcade-services
+      https://devdiv.visualstudio.com/DevDiv/_git/DotNet-msbuild-Trusted
       dnceng@vs-ssh.visualstudio.com:v3/dnceng/internal/dotnet-arcade-services
       git@ssh.dev.azure.com:v3/dnceng/internal/dotnet-arcade-services
     -->
     <!-- Set DisableSourceLinkUrlTranslation to true when building a tool for internal use where sources only come from internal URIs -->
     <DisableSourceLinkUrlTranslation Condition="'$(DisableSourceLinkUrlTranslation)' == ''">false</DisableSourceLinkUrlTranslation>
-    <_TranslateUrlPattern>(https://dnceng%40dev\.azure\.com/dnceng/internal/_git|https://dev\.azure\.com/dnceng/internal/_git|https://dnceng\.visualstudio\.com/internal/_git|dnceng%40vs-ssh\.visualstudio\.com:v3/dnceng/internal|git%40ssh\.dev\.azure\.com:v3/dnceng/internal)/([^/-]+)-(.+)</_TranslateUrlPattern>
+    <_TranslateUrlPattern>(https://dnceng%40dev\.azure\.com/dnceng/internal/_git|https://dev\.azure\.com/dnceng/internal/_git|https://dnceng\.visualstudio\.com/internal/_git|dnceng%40vs-ssh\.visualstudio\.com:v3/dnceng/internal|git%40ssh\.dev\.azure\.com:v3/dnceng/internal|https://devdiv\.visualstudio\.com/devdiv/_git)/([^/-]+)-(.+)</_TranslateUrlPattern>
     <_TranslateUrlReplacement>https://github.com/$2/$3</_TranslateUrlReplacement>
   </PropertyGroup>
 
@@ -63,10 +65,16 @@
           BeforeTargets="SourceControlManagerPublishTranslatedUrls">
 
     <PropertyGroup>
+      <!-- Repositories mirrored on devdiv.visualstudio will have '-Trusted' added to their name and this needs to be stripped off before translation
+           Eventually, all repos should move to dnceng/internal when possible. -->
+      <ScmRepositoryUrl Condition=" '$([MSBuild]::ValueOrDefault(`%(SourceRoot.ScmRepositoryUrl)`, ``).Contains(`devdiv.visualstudio`))' == 'true' ">$([MSBuild]::ValueOrDefault(`%(SourceRoot.ScmRepositoryUrl)`, ``).ToLower().Replace(`-trusted`,``))</ScmRepositoryUrl>
       <ScmRepositoryUrl>$([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_TranslateUrlPattern), $(_TranslateUrlReplacement)))</ScmRepositoryUrl>
     </PropertyGroup>
 
     <ItemGroup>
+      <SourceRoot Update="@(SourceRoot)">
+        <ScmRepositoryUrl Condition="$([MSBuild]::ValueOrDefault(`%(SourceRoot.ScmRepositoryUrl)`, ``).Contains(`devdiv.visualstudio`))">$([MSBuild]::ValueOrDefault(`%(SourceRoot.ScmRepositoryUrl)`, ``).ToLower().Replace(`-trusted`,``))</ScmRepositoryUrl>
+      </SourceRoot>
       <SourceRoot Update="@(SourceRoot)">
         <ScmRepositoryUrl>$([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_TranslateUrlPattern), $(_TranslateUrlReplacement)))</ScmRepositoryUrl>
       </SourceRoot>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj
index 8f24fd48158..0111d6971bf 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj
@@ -23,6 +23,10 @@
       - SymWebToken                             : Token used to publish symbol blobs, dll and pdb to Symweb
       - SymbolPublishingExclusionsFile          : Files that have to be excluded from symbol publishing 
       - PdbArtifactsBasePath                    : Path to dlls and pdbs
+      - AzdoApiToken                            : Token used to call the Azure Api to download artifacts and symbols
+      - ArtifactsBasePath                       : Staging directory 
+      - UseStreamingPublishing                  : When set to true it will use Azure Api to download the artifacts and symbols using streaming,
+                                                  else all the artifacts and symbols are downloaded before publishing.
 
       Optional aka.ms link generation parameters:
         - AkaMSClientId                         : Client ID for the aka.ms AD application
@@ -65,22 +69,19 @@
           - InternalInstallersTargetStaticFeedKey
           - InternalChecksumsTargetStaticFeed
           - InternalChecksumsTargetStaticFeedKey
+
+    NOTE: For symbol publishing using V3, ConvertPortablePdbsToWindowsPdbs is always set to false, because this is an expensive task so this is done in the staging pipeline post signing.
   -->
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
 
-    <!-- Default publishing infra target is 2. -->
-    <PublishingInfraVersion Condition="'$(PublishingInfraVersion)' == ''">2</PublishingInfraVersion>
+    <!-- Default publishing infra target is 3. -->
+    <PublishingInfraVersion Condition="'$(PublishingInfraVersion)' == ''">3</PublishingInfraVersion>
   </PropertyGroup>
 
-  <Import Project="SetupTargetFeeds.proj" Condition="'$(PublishingInfraVersion)' == '2'" />
-
   <Target Name="Execute">
-    <CallTarget Targets="SetupTargetFeeds" Condition="'$(PublishingInfraVersion)' == '2'">
-      <Output TaskParameter="TargetOutputs" ItemName="TargetFeedConfig"/>
-    </CallTarget>
 
     <Error Condition="'$(ManifestsBasePath)' == ''" Text="ManifestsBasePath is empty. Please provide the full path to asset manifest(s) directory." />
     <Error Condition="'$(BlobBasePath)' == '' OR '$(PackageBasePath)' == ''" Text="A valid full path to BlobBasePath and PackageBasePath is required." />
@@ -103,8 +104,36 @@
       <ChecksumsFeedKey>$(ChecksumsAzureAccountKey)</ChecksumsFeedKey>
       <InternalChecksumsFeedKey>$(InternalChecksumsAzureAccountKey)</InternalChecksumsFeedKey>
       <AllowFeedOverrides Condition="'$(AllowFeedOverrides)' == ''">false</AllowFeedOverrides>
+      <UseStreamingPublishing Condition="'$(UseStreamingPublishing)' == ''">false</UseStreamingPublishing>
+      <ArtifactsBasePath Condition="'$(ArtifactsBasePath)' == ''">$(BlobBasePath)</ArtifactsBasePath>
+      <NonStreamingPublishingMaxClients Condition="'$(NonStreamingPublishingMaxClients)' == ''">12</NonStreamingPublishingMaxClients>
+      <StreamingPublishingMaxClients Condition="'$(UseStreamingPublishing)' == 'true' and '$(StreamingPublishingMaxClients)' == ''">16</StreamingPublishingMaxClients>
     </PropertyGroup>
 
+    <ItemGroup>
+      <FeedKey Include="https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json" Key="$(ChecksumsFeedKey)"/>
+      <FeedKey Include="https://dotnetcli.blob.core.windows.net/dotnet/index.json" Key="$(InstallersFeedKey)"/>
+      <FeedKey Include="https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json" Key="$(InternalChecksumsFeedKey)"/>
+      <FeedKey Include="https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json" Key="$(InternalInstallersFeedKey)"/>
+      <FeedKey Include="https://pkgs.dev.azure.com/dnceng" Key="$(AzureDevOpsFeedsKey)"/>
+      <FeedKey Include="$(ChecksumsFeedOverride)" Key="$(ChecksumsFeedKey)" Condition="'$(ChecksumsFeedOverride)' != ''"/>
+      <FeedKey Include="$(InstallersFeedOverride)" Key="$(InstallersFeedKey)" Condition="'$(InstallersFeedOverride)' != ''"/>
+      <FeedSasUri Include="https://dotnetbuilds.blob.core.windows.net/public" Base64Uri="$(DotNetBuildsPublicUriBase64)"/>
+      <FeedSasUri Include="https://dotnetbuilds.blob.core.windows.net/public-checksums" Base64Uri="$(DotNetBuildsPublicChecksumsUriBase64)"/>
+      <FeedSasUri Include="https://dotnetbuilds.blob.core.windows.net/internal" Base64Uri="$(DotNetBuildsInternalUriBase64)"/>
+      <FeedSasUri Include="https://dotnetbuilds.blob.core.windows.net/internal-checksums" Base64Uri="$(DotNetBuildsInternalChecksumsUriBase64)"/>
+      <FeedOverride Include="https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json" Replacement="$(ChecksumsFeedOverride)" Condition="'$(ChecksumsFeedOverride)' != ''"/>
+      <FeedOverride Include="https://dotnetcli.blob.core.windows.net/dotnet/index.json" Replacement="$(InstallersFeedOverride)" Condition="'$(InstallersFeedOverride)' != ''"/>
+      <FeedOverride Include="https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json" Replacement="$(ChecksumsFeedOverride)" Condition="'$(ChecksumsFeedOverride)' != ''"/>
+      <FeedOverride Include="https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json" Replacement="$(InstallersFeedOverride)" Condition="'$(InstallersFeedOverride)' != ''"/>
+      <FeedOverride Include="https://dotnetbuilds.blob.core.windows.net/public-checksums" Replacement="$(ChecksumsFeedOverride)" Condition="'$(ChecksumsFeedOverride)' != ''"/>
+      <FeedOverride Include="https://dotnetbuilds.blob.core.windows.net/public" Replacement="$(InstallersFeedOverride)" Condition="'$(InstallersFeedOverride)' != ''"/>
+      <FeedOverride Include="https://dotnetbuilds.blob.core.windows.net/internal-checksums" Replacement="$(ChecksumsFeedOverride)" Condition="'$(ChecksumsFeedOverride)' != ''"/>
+      <FeedOverride Include="https://dotnetbuilds.blob.core.windows.net/internal" Replacement="$(InstallersFeedOverride)" Condition="'$(InstallersFeedOverride)' != ''"/>
+      <FeedOverride Include="transport-packages" Replacement="$(TransportFeedOverride)" Condition="'$(TransportFeedOverride)' != ''"/>
+      <FeedOverride Include="shipping-packages" Replacement="$(ShippingFeedOverride)" Condition="'$(ShippingFeedOverride)' != ''"/>
+    </ItemGroup>
+
     <Error
       Condition="'@(ManifestFiles)' == ''"
       Text="No manifest file was found in the provided path: $(ManifestsBasePath)" />
@@ -120,12 +149,6 @@
       MaestroApiEndpoint="$(MaestroApiEndpoint)"
       BuildAssetRegistryToken="$(BuildAssetRegistryToken)"
       PublishInstallersAndChecksums="$(PublishInstallersAndChecksums)"
-      ChecksumsFeedKey="$(ChecksumsFeedKey)"
-      InstallersFeedKey="$(InstallersFeedKey)"
-      InternalChecksumsFeedKey="$(InternalChecksumsFeedKey)"
-      InternalInstallersFeedKey="$(InternalInstallersFeedKey)"
-      AzureDevOpsFeedsKey="$(AzureDevOpsFeedsKey)"
-      AzureStorageTargetFeedKey="$(AzureStorageTargetFeedPAT)"
       AssetManifestPaths="@(ManifestFiles)"
       BlobAssetsBasePath="$(BlobBasePath)"
       PackageAssetsBasePath="$(PackageBasePath)"
@@ -143,11 +166,18 @@
       PublishSpecialClrFiles="$(PublishSpecialClrFiles)"
       BuildQuality="$(BuildQuality)"
       AllowFeedOverrides="$(AllowFeedOverrides)"
-      InstallersFeedOverride="$(InstallersFeedOverride)"
-      ChecksumsFeedOverride="$(ChecksumsFeedOverride)"
-      TransportFeedOverride="$(TransportFeedOverride)"
-      ShippingFeedOverride="$(ShippingFeedOverride)"
-      SymbolsFeedOverride="$(SymbolsFeedOverride)" />
+      AzdoApiToken="$(AzdoApiToken)"
+      ArtifactsBasePath="$(ArtifactsBasePath)"
+      BuildId="$(BuildId)"
+      AzureDevOpsOrg="$(AzureDevOpsOrg)"
+      AzureProject="$(AzureProject)"
+      UseStreamingPublishing="$(UseStreamingPublishing)"
+      StreamingPublishingMaxClients="$(StreamingPublishingMaxClients)"
+      NonStreamingPublishingMaxClients="$(NonStreamingPublishingMaxClients)"
+      FeedKeys="@(FeedKey)"
+      FeedSasUris="@(FeedSasUri)"
+      FeedOverrides="@(FeedOverride)"
+      />
   </Target>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj
index 484b4c35775..3f880d46e9d 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj
@@ -1,5 +1,11 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Execute">
+
+  <PropertyGroup>
+    <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+  
   <!--
     Parameters:
       - IsInternalBuild                         : true if at least an asset to be published is internal.
@@ -11,11 +17,6 @@
       - AzdoTargetFeedPAT                       : Required token to publish assets to feeds
   -->
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
-  </PropertyGroup>
-
   <Target Name="Execute">
     <Error
       Condition="'$(IsInternalBuild)' == ''"
@@ -33,19 +34,31 @@
       Condition="'$(AzdoTargetFeedPAT)' == ''"
       Text="Parameters 'AzdoTargetFeedPAT' is empty." />
 
+    <PropertyGroup>
+      <AzureDevOpsOrg Condition="'$(AzureDevOpsOrg)' == ''">dnceng</AzureDevOpsOrg>
+      <AzureDevOpsProject Condition="'(AzureDevOpsProject)' == '' and '(AzureDevOpsOrg)' == 'dnceng' and '$(IsInternalBuild)' == 'true'">internal</AzureDevOpsProject>
+      <AzureDevOpsProject Condition="'(AzureDevOpsProject)' == '' and '(AzureDevOpsOrg)' == 'dnceng' and '$(IsInternalBuild)' == 'false'">public</AzureDevOpsProject>
+    </PropertyGroup>
+
+    <Error
+      Condition="'$(AzureDevOpsProject)' == ''"
+      Text="Parameters 'AzureDevOpsProject' is empty." />
+
     <!--Create the shipping feed-->
     <CreateAzureDevOpsFeed
-        IsInternal="$(IsInternalBuild)"
         AzureDevOpsPersonalAccessToken="$(AzdoTargetFeedPAT)"
-        FeedName="$(FeedName)-shipping">
+        FeedName="$(FeedName)-shipping"
+        AzureDevOpsOrg="$(AzureDevOpsOrg)"
+        AzureDevOpsProject="$(AzureDevOpsProject)">
       <Output TaskParameter="TargetFeedURL" PropertyName="ShippingAzdoPackageFeedURL"/>
     </CreateAzureDevOpsFeed>
 
     <!--Create the nonshipping feed-->
     <CreateAzureDevOpsFeed
-        IsInternal="$(IsInternalBuild)"
         AzureDevOpsPersonalAccessToken="$(AzdoTargetFeedPAT)"
-        FeedName="$(FeedName)-nonshipping">
+        FeedName="$(FeedName)-nonshipping"
+        AzureDevOpsOrg="$(AzureDevOpsOrg)"
+        AzureDevOpsProject="$(AzureDevOpsProject)">
       <Output TaskParameter="TargetFeedURL" PropertyName="NonShippingAzdoPackageFeedURL"/>
     </CreateAzureDevOpsFeed>
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj
index 903d1b0e41b..872ec868a11 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj
@@ -37,6 +37,9 @@
       <PackagesToPublishToSymbolServer Remove="$(BlobBasePath)\Microsoft.DotNet.Maestro.Tasks.*" />
     </ItemGroup>
 
+    <!--
+    ConvertPortablePdbsToWindowsPdbs is set to true only in staging pipeline, because this is an expensive task and we don't want to do it for every build.
+    -->
     <PropertyGroup>
       <DotNetSymbolExpirationInDays Condition="'$(DotNetSymbolExpirationInDays)' == ''">3650</DotNetSymbolExpirationInDays>
       <PublishToSymbolServer>true</PublishToSymbolServer>
@@ -44,6 +47,9 @@
       <PublishToMSDL Condition="'$(PublishToMSDL)' == ''">true</PublishToMSDL>
       <PublishToSymbolServer Condition="'@(FilesToPublishToSymbolServer)' == '' and '@(PackagesToPublishToSymbolServer)' == ''">false</PublishToSymbolServer>
       <PublishSpecialClrFiles Condition="'$(PublishSpecialClrFiles)' == ''">true</PublishSpecialClrFiles>
+      <DryRun Condition="'$(DryRun)' == ''">false</DryRun>
+      <ConvertPortablePdbsToWindowsPdbs Condition="'$(ConvertPortablePdbsToWindowsPdbs)' == ''">false</ConvertPortablePdbsToWindowsPdbs>
+      <TreatPdbConversionIssuesAsInfo Condition="'$(TreatPdbConversionIssuesAsInfo)' == ''">false</TreatPdbConversionIssuesAsInfo>
     </PropertyGroup>
 
     <Message
@@ -96,11 +102,12 @@
                     SymbolServerPath="%(SymbolServerTargets.Identity)"
                     ExpirationInDays="$(DotNetSymbolExpirationInDays)"
                     VerboseLogging="true"
-                    DryRun="false"
-                    ConvertPortablePdbsToWindowsPdbs="false"
+                    DryRun="$(DryRun)"
+                    ConvertPortablePdbsToWindowsPdbs="$(ConvertPortablePdbsToWindowsPdbs)"
                     PdbConversionTreatAsWarning=""
                     PublishSpecialClrFiles="$(PublishSpecialClrFiles)"
-                    Condition="$(PublishToSymbolServer)"/>
+                    Condition="$(PublishToSymbolServer)"
+                    TreatPdbConversionIssuesAsInfo="$(TreatPdbConversionIssuesAsInfo)"/>
   </Target>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SetupTargetFeeds.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SetupTargetFeeds.proj
deleted file mode 100644
index 25aefb367f7..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SetupTargetFeeds.proj
+++ /dev/null
@@ -1,333 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-  <!--
-    This file main target, namely `SetupTargetFeeds`, is used to create an ItemGroup with
-    feed descriptors that will be used for publishing build assets.
-
-    Summary of the logic implemented here:
-      - A stable build is a non-preview build. Package versions are usually in
-        the format <Major.Minor.Patch>. To create stable builds the user have to
-        set the `DotNetFinalVersionKind` build parameter to `release`.
-
-      - An internal build is a build from a branch that has `internal` on its name.
-        The assets produced from this kind of build aren't meant for public usage.
-
-      - For business reasons package versions for stable builds don't increment
-        automatically. That means that different stable builds may produce packages
-        with different binary content but same version number.
-
-      - Since feeds don't permit overriding packages, the approach we followed
-        to publish assets from stable builds was to create a new _feed_ for every
-        stable build. Therefore, whenever we are publishing packages from a stable
-        build we create a new (public | internal) feed to publish packages to.
-
-      - Non stable builds are the usual ones. Package's version for such builds have
-        a prerelease label, e.g., preview, beta, alpha, etc. Since packages for these
-        builds have their version incremented automatically for every build we can
-        publish the packages always to the same feed.
-
-      - Non-stable internal build's assets are published to a fixed internal feed.
-
-      - Non-stable public build's assets are published to various public feeds.
-
-    Parameters:
-      - IsInternalBuild                       : true if the build is internal, i.e., created from an branch with internal on its name.
-      - IsStableBuild                         : true if the build is stable, i.e., `DotNetFinalVersionKind` == `release`.
-      - RepositoryName                        : Name of the source repo. Used when creating a stable internal feed.
-      - CommitSha                             : Commit SHA for this build. Used when creating a stable internal feed.
-      - ArtifactsCategory                     : Used to let user override target feed of public channels.
-      - AzureStorageTargetFeedPAT             : Key for Azure storage feed used to publish for non-stable, non-internal builds
-      - PublishInstallersAndChecksums         : Whether to publish installers and checksums to a secondary locations
-      - InstallersTargetStaticFeed            : Where installers should be published
-      - InstallersAzureAccountKey             : Account key for installers location
-      - ChecksumsTargetStaticFeed             : Where checksums should be published
-      - ChecksumsAzureAccountKey              : Account key forchecksums location
-      - AzureDevOpsStaticShippingFeed         : URL of the Azure DevOps NuGet feed to publish non-stable shipping packages to.
-      - AzureDevOpsStaticShippingFeedKey      : Key of the Azure DevOps NuGet feed to publish non-stable shipping packages to.
-      - AzureDevOpsStaticTransportFeed        : URL of the Azure DevOps NuGet feed to publish transport packages to.
-      - AzureDevOpsStaticTransportFeedKey     : Key of the Azure DevOps NuGet feed to publish to transport packages to.
-      - AzureDevOpsStaticSymbolsFeed          : URL of the Azure DevOps NuGet feed to publish symbol packages to.
-      - AzureDevOpsStaticSymbolsFeedKey       : Key of the Azure DevOps NuGet feed to publish to symbol packages to.
-      - LatestLinkShortUrlPrefix              : Prefix of aka.ms url's to set up latest links for each published blob.
-
-      - CreateTestConfig                      : If set to true the user will be able to test a TargetFeedConfig
-                                                constructed using parameters below:
-        - TestFeedCategories
-        - TestFeedURL
-        - TestFeedType
-        - TestFeedToken
-  -->
-  <PropertyGroup>
-    <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
-  </PropertyGroup>
-
-  <Target Name="SetupTargetFeeds" Outputs="@(TargetFeedConfig)">
-    <Error
-      Condition="'$(IsStableBuild)' == ''"
-      Text="Parameter 'IsStableBuild' is empty. A boolean value is required." />
-
-    <Error
-      Condition="'$(IsInternalBuild)' == ''"
-      Text="Parameter 'IsInternalBuild' is empty. A boolean value is required." />
-
-    <Error
-      Condition="('$(InstallersTargetStaticFeed)' == '' or '$(InstallersAzureAccountKey)' == '') and '$(PublishInstallersAndChecksums)' == 'true'"
-      Text="Parameters 'InstallersTargetStaticFeed/Key' are empty." />
-
-    <Error
-      Condition="('$(ChecksumsTargetStaticFeed)' == '' or '$(ChecksumsAzureAccountKey)' == '') and '$(PublishInstallersAndChecksums)' == 'true'"
-      Text="Parameters 'ChecksumsTargetStaticFeed/Key' are empty." />
-
-    <Error
-      Condition="('$(AzureDevOpsStaticShippingFeed)' == '' or '$(AzureDevOpsStaticShippingFeedKey)' == '')"
-      Text="Parameters 'AzureDevOpsStaticShippingFeed/AzureDevOpsStaticShippingFeedKey' are empty." />
-
-    <Error
-      Condition="('$(AzureDevOpsStaticTransportFeed)' == '' or '$(AzureDevOpsStaticTransportFeedKey)' == '')"
-      Text="Parameters 'AzureDevOpsStaticTransportFeed/AzureDevOpsStaticTransportFeedKey' are empty." />
-
-    <Error
-      Condition="('$(AzureDevOpsStaticSymbolsFeed)' == '' or '$(AzureDevOpsStaticSymbolsFeedKey)' == '')"
-      Text="Parameters 'AzureDevOpsStaticSymbolsFeed/AzureDevOpsStaticSymbolsFeedKey' are empty." />
-
-    <!--
-      - Adding this to let repos that want to override the TargetFeed be able to do so.
-      - I'm reusing the parameter that was introduced by RM pipelines so that no further
-        changes are needed in customer repos.
-      - Eventually this will be deprecated or at least modified so that the build TargetFeed
-        is selected based on build intent ('channel').
-    -->
-    <PropertyGroup>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == '.NETCORE'">https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == '.NETCOREVALIDATION'">https://dotnetfeed.blob.core.windows.net/arcade-validation/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETCORE'">https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETCORETOOLING'">https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ENTITYFRAMEWORKCORE'">https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETEXTENSIONS'">https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'CORECLR'">https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'CORESDK'">https://dotnetfeed.blob.core.windows.net/dotnet-sdk/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'TOOLSINTERNAL'">https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'TOOLSET'">https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'WINDOWSDESKTOP'">https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'NUGETCLIENT'">https://dotnetfeed.blob.core.windows.net/nuget-nugetclient/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETENTITYFRAMEWORK6'">https://dotnetfeed.blob.core.windows.net/aspnet-entityframework6/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETBLAZOR'">https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'IOT'">https://dotnetfeed.blob.core.windows.net/dotnet-iot/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'EXPERIMENTAL'">https://dotnetfeed.blob.core.windows.net/dotnet-experimental/index.json</TargetStaticFeed>
-      <TargetStaticFeed Condition="'$(TargetStaticFeed)' == ''">https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</TargetStaticFeed>
-    </PropertyGroup>
-
-    <!--
-      When a build is stable we ask `CreateAzureDevOpsFeed` in Tasks.Feed to
-      create two new AzDo feeds.  One for symbols and one for packages. Package
-      IDs overlap with symbol package IDs, so they cannot be published to the
-      same azure devops feed.
-    -->
-    <CreateAzureDevOpsFeed
-        Condition="'@(TargetFeedConfig)' == '' AND '$(IsStableBuild)' == 'true'"
-        IsInternal="$(IsInternalBuild)"
-        AzureDevOpsPersonalAccessToken="$(AzdoTargetFeedPAT)"
-        RepositoryName="$(RepositoryName)"
-        CommitSha="$(CommitSha)">
-      <Output TaskParameter="TargetFeedURL" PropertyName="NewAzDoIsolatedPackageFeedURL"/>
-    </CreateAzureDevOpsFeed>
-
-    <CreateAzureDevOpsFeed
-        Condition="'@(TargetFeedConfig)' == '' AND '$(IsStableBuild)' == 'true'"
-        IsInternal="$(IsInternalBuild)"
-        AzureDevOpsPersonalAccessToken="$(AzdoTargetFeedPAT)"
-        RepositoryName="$(RepositoryName)"
-        CommitSha="$(CommitSha)"
-        ContentIdentifier="sym">
-      <Output TaskParameter="TargetFeedURL" PropertyName="NewAzDoIsolatedSymbolsFeedURL"/>
-    </CreateAzureDevOpsFeed>
-
-    <Error
-      Condition="'@(TargetFeedConfig)' == '' AND '$(AzureStorageTargetFeedPAT)' == '' AND '$(IsInternalBuild)' == 'false'"
-      Text="Parameter 'AzureStorageTargetFeedPAT' is empty. A valid storage account key for $(TargetStaticFeed) is required." />
-
-    <!--
-        Config for:
-        - Stable = true
-        - Internal = true/false
-
-        Publish:
-          - Shipping (stable) packages to new azure devops package feed url
-          - Shipping (stable) symbol packages to new azure devops symbol feed url
-          - NonShipping (non-stable) packages to azure devops transport feed url
-          - NonShipping (non-stable) symbol packages to azure devops symbol feed url
-          - NonShipping (non-stable) assets to legacy blob feed url
-          - Installers and checksums to desired storage accounts.
-
-        We leave the 'Internal' property off of these so that the
-        publish task will determine whether the feed is public or private by attempting to access
-        the URL anonymously.
-    -->
-    <ItemGroup Condition="'@(TargetFeedConfig)' == '' AND '$(IsStableBuild)' == 'true'">
-
-      <TargetFeedConfig
-        AssetSelection="ShippingOnly"
-        Include="Package"
-        TargetURL="$(NewAzDoIsolatedPackageFeedURL)"
-        Isolated="true"
-        Type="AzDoNugetFeed"
-        Token="$(AzdoTargetFeedPAT)" />
-
-      <TargetFeedConfig
-        AssetSelection="ShippingOnly"
-        Include="Symbols"
-        TargetURL="$(NewAzDoIsolatedSymbolsFeedURL)"
-        Isolated="true"
-        Type="AzDoNugetFeed"
-        Token="$(AzdoTargetFeedPAT)" />
-
-      <TargetFeedConfig
-        AssetSelection="NonShippingOnly"
-        Include="Package"
-        TargetURL="$(AzureDevOpsStaticTransportFeed)"
-        Isolated="false"
-        Type="AzDoNugetFeed"
-        Token="$(AzureDevOpsStaticTransportFeedKey)" />
-
-      <!-- These feeds are marked as isolated even though they are not. We allow overwrite
-           the old data with the new. -->
-      <TargetFeedConfig
-        Condition="'$(PublishInstallersAndChecksums)' == 'true'"
-        Include="OSX;Deb;Rpm;Node;BinaryLayout;Installer;Maven;VSIX;Badge;Other"
-        TargetURL="$(InstallersTargetStaticFeed)"
-        Isolated="true"
-        AllowOverwrite="true"
-        Type="AzureStorageFeed"
-        Token="$(InstallersAzureAccountKey)" />
-
-      <TargetFeedConfig
-        Condition="'$(PublishInstallersAndChecksums)' == 'true'"
-        Include="Checksum"
-        TargetURL="$(ChecksumsTargetStaticFeed)"
-        Isolated="true"
-        AllowOverwrite="true"
-        Type="AzureStorageFeed"
-        Token="$(ChecksumsAzureAccountKey)" />
-    </ItemGroup>
-
-    <!--
-      Config for:
-        - Stable = false
-        - Internal = true
-
-        Publish:
-          - Shipping (non-stable) assets to azure devops shipping feed url
-          - NonShipping (non-stable) assets to azure devops transport feed url
-          - Symbol assets to azure devops symbol feed url
-          - Installers and checksums to desired storage accounts.
-    -->
-    <ItemGroup Condition="'@(TargetFeedConfig)' == '' AND '$(IsStableBuild)' == 'false' AND '$(IsInternalBuild)' == 'true'">
-      <TargetFeedConfig
-        AssetSelection="ShippingOnly"
-        Include="Package"
-        TargetURL="$(AzureDevOpsStaticShippingFeed)"
-        Isolated="false"
-        Type="AzDoNugetFeed"
-        Token="$(AzureDevOpsStaticShippingFeedKey)" />
-
-      <TargetFeedConfig
-        AssetSelection="NonShippingOnly"
-        Include="Package"
-        TargetURL="$(AzureDevOpsStaticTransportFeed)"
-        Isolated="false"
-        Type="AzDoNugetFeed"
-        Token="$(AzureDevOpsStaticTransportFeedKey)" />
-
-      <TargetFeedConfig
-        Include="Symbols"
-        TargetURL="$(AzureDevOpsStaticSymbolsFeed)"
-        Isolated="false"
-        Type="AzDoNugetFeed"
-        Token="$(AzureDevOpsStaticSymbolsFeedKey)" />
-
-      <TargetFeedConfig
-        Condition="'$(PublishInstallersAndChecksums)' == 'true'"
-        Include="OSX;Deb;Rpm;Node;BinaryLayout;Installer;Maven;VSIX;Badge;Other"
-        TargetURL="$(InstallersTargetStaticFeed)"
-        Isolated="false"
-        Type="AzureStorageFeed"
-        Token="$(InstallersAzureAccountKey)" />
-
-      <TargetFeedConfig
-        Condition="'$(PublishInstallersAndChecksums)' == 'true'"
-        Include="Checksum"
-        TargetURL="$(ChecksumsTargetStaticFeed)"
-        Isolated="false"
-        Type="AzureStorageFeed"
-        Token="$(ChecksumsAzureAccountKey)" />
-    </ItemGroup>
-
-    <!--
-      Config for:
-        - Stable = false
-        - Internal = false
-
-        Publish:
-          - Shipping (non-stable) package assets to azure devops shipping feed url
-          - NonShipping (non-stable) package assets to azure devops transport feed url
-          - Shipping and NonShipping symbol package assets to azure devops symbol feed url
-          - All assets to legacy blob feed url
-          - Installers and checksums to desired storage accounts.
-    -->
-    <ItemGroup Condition="'@(TargetFeedConfig)' == '' AND '$(IsStableBuild)' == 'false' AND '$(IsInternalBuild)' == 'false'">
-      <TargetFeedConfig Condition="'$(PublishInstallersAndChecksums)' == 'true'"
-        Include="Symbols"
-        TargetURL="$(TargetStaticFeed)"
-        Isolated="false"
-        Type="AzureStorageFeed"
-        Token="$(AzureStorageTargetFeedPAT)" />
-
-      <TargetFeedConfig Condition="'$(PublishInstallersAndChecksums)' != 'true'"
-        Include="Symbols;OSX;Deb;Rpm;Node;BinaryLayout;Installer;Checksum;Maven;VSIX;Badge;Other"
-        TargetURL="$(TargetStaticFeed)"
-        Isolated="false"
-        Type="AzureStorageFeed"
-        Token="$(AzureStorageTargetFeedPAT)" />
-
-      <TargetFeedConfig Condition="'$(PublishInstallersAndChecksums)' == 'true'"
-        Include="OSX;Deb;Rpm;Node;BinaryLayout;Installer;Maven;VSIX;Badge;Other"
-        TargetURL="$(InstallersTargetStaticFeed)"
-        Isolated="false"
-        Type="AzureStorageFeed"
-        Token="$(InstallersAzureAccountKey)"
-        LatestLinkShortUrlPrefix="$(LatestLinkShortUrlPrefix)" />
-
-      <TargetFeedConfig Condition="'$(PublishInstallersAndChecksums)' == 'true'"
-        Include="Checksum"
-        TargetURL="$(ChecksumsTargetStaticFeed)"
-        Isolated="false"
-        Type="AzureStorageFeed"
-        Token="$(ChecksumsAzureAccountKey)"
-        LatestLinkShortUrlPrefix="$(LatestLinkShortUrlPrefix)" />
-
-      <TargetFeedConfig
-        Include="Package"
-        TargetURL="$(AzureDevOpsStaticShippingFeed)"
-        Isolated="false"
-        Type="AzDoNugetFeed"
-        Token="$(AzureDevOpsStaticShippingFeedKey)"
-        AssetSelection="ShippingOnly" />
-
-      <TargetFeedConfig
-        Include="Package"
-        TargetURL="$(AzureDevOpsStaticTransportFeed)"
-        Isolated="false"
-        Type="AzDoNugetFeed"
-        Token="$(AzureDevOpsStaticTransportFeedKey)"
-        AssetSelection="NonShippingOnly" />
-    </ItemGroup>
-
-    <Error
-      Condition="'@(TargetFeedConfig)' == ''"
-      Text="It wasn't possible to determine which target feed configuration to use." />
-
-    <Message
-      Text="Artifacts with category '%(TargetFeedConfig.Identity)', Isolated='%(TargetFeedConfig.Isolated)', Internal='%(TargetFeedConfig.Internal)', AssetSelection='%(TargetFeedConfig.AssetSelection)' should go to %(TargetFeedConfig.Type) -> '%(TargetFeedConfig.TargetURL)'"
-      Importance="high" />
-  </Target>
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props
index 5fcc69357d0..48c1e91c0ee 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props
@@ -24,8 +24,4 @@
   <Import Project="Linker.props" Condition="'$(UsingToolMicrosoftNetILLinkTasks)' == 'true'" />
   <Import Project="VisualStudio.props" Condition="'$(UsingToolVSSDK)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'"/>
 
-  <!--
-    Import NuGet props to WPF temp projects (workaround for https://github.com/dotnet/sourcelink/issues/91) 
-  -->
-  <Import Project="$(_WpfTempProjectNuGetFilePathNoExt).props" Condition="'$(_WpfTempProjectNuGetFilePathNoExt)' != '' and Exists('$(_WpfTempProjectNuGetFilePathNoExt).props')"/>
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
index 399d129ea5d..8bd296befef 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
@@ -6,6 +6,16 @@
 
   <Import Project="Sign.props" />
 
+  <!-- Update sign infos that were using Microsoft400 to use the .NET-specific cert if UseDotNetCertificate is present.
+       This will update any use, even if explicitly specified.
+       NOTE: This is outside the target on purpose, as Update will not correctly evaluate in the target. See
+       https://github.com/dotnet/msbuild/issues/1618. -->
+  <ItemGroup Condition="$(UseDotNetCertificate)">
+    <FileExtensionSignInfo Update="@(FileExtensionSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
+    <StrongNameSignInfo Update="@(StrongNameSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
+    <FileSignInfo Update="@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
+  </ItemGroup>
+    
   <Target Name="Sign">
     <Error Text="The value of DotNetSignType is invalid: '$(DotNetSignType)'"
            Condition="'$(DotNetSignType)' != 'real' and '$(DotNetSignType)' != 'test' and '$(DotNetSignType)' != ''" />
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props
index d545816a66e..bdd8ebf8558 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props
@@ -37,12 +37,20 @@
     -->
     <FileExtensionSignInfo Include=".jar" CertificateName="MicrosoftJARSHA2" />
     <FileExtensionSignInfo Include=".js;.ps1;.psd1;.psm1;.psc1;.py" CertificateName="Microsoft400" />
-    <FileExtensionSignInfo Include=".dll;.exe" CertificateName="Microsoft400" />
+    <FileExtensionSignInfo Include=".dll;.exe;.mibc" CertificateName="Microsoft400" />
     <FileExtensionSignInfo Include=".nupkg" CertificateName="NuGet" />
     <FileExtensionSignInfo Include=".vsix" CertificateName="VsixSHA2" />
     <FileExtensionSignInfo Include=".zip" CertificateName="None" />
   </ItemGroup>
 
+  <!-- The name of the .NET specific certificate, which is a general replacement for Microsoft400
+       If UseDotNetCert is specific in a repo's eng/Signing.props, all usage of Microsoft400 is replaced
+       with MicrosoftDotNet500 -->
+  <PropertyGroup>
+    <DotNetCertificateName>MicrosoftDotNet500</DotNetCertificateName>
+    <UseDotNetCertificate>false</UseDotNetCertificate>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- Flags for controlling whether empty signing lists are detected for in build and post-build signing.
          These flags are split (rather than just a single check based on PostBuildSign == true/false because
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SymStore.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SymStore.targets
index 22e107abd2b..fae532946a5 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SymStore.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SymStore.targets
@@ -25,13 +25,7 @@
       <_BuildsPortablePdb>false</_BuildsPortablePdb>
       <_BuildsPortablePdb Condition="'$(DebugType)' == 'portable' or '$(DebugType)' == 'embedded'">true</_BuildsPortablePdb>
 
-      <!--
-        Support Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk TargetFrameworkSuffix property.
-        TODO: Remove when https://github.com/dotnet/arcade/issues/4859 is fixed.
-      -->
       <_SymStoreTargetFramework>$(TargetFramework)</_SymStoreTargetFramework>
-      <_SymStoreTargetFramework Condition="'$(TargetFrameworkSuffix)' != ''">$(_SymStoreTargetFramework)-$(TargetFrameworkSuffix)</_SymStoreTargetFramework>
-
       <_SymStoreOutputDir>$(ArtifactsSymStoreDirectory)$(OutDirName)\$(_SymStoreTargetFramework)\</_SymStoreOutputDir>
       <_SymStoreOutputDir Condition="'$(PlatformName)' != 'AnyCPU'">$(_SymStoreOutputDir)$(PlatformName)\</_SymStoreOutputDir>
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj
index 34f7d5cd158..c7fc78f29b8 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj
@@ -29,7 +29,7 @@
     <PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)"  IsImplicitlyDefined="true" />
     <PackageReference Include="MicroBuild.Core.Sentinel" Version="1.0.0" IsImplicitlyDefined="true" />
     <PackageReference Include="vswhere" Version="$(VSWhereVersion)" IsImplicitlyDefined="true" />
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" Condition="'$(Publish)' == 'true'" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.NuGetRepack.Tasks" Version="$(MicrosoftDotnetNuGetRepackTasksVersion)" Condition="'$(UsingToolNuGetRepack)' == 'true'" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.SignTool" Version="$(MicrosoftDotNetSignToolVersion)" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.SymbolUploader.Build.Task" Version="$(MicrosoftSymbolUploaderBuildTaskVersion)" Condition="'$(PublishToSymbolServer)' == 'true'" IsImplicitlyDefined="true" />
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.targets
index 95f6e729771..818dc305efe 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.targets
@@ -82,7 +82,7 @@
 #define VER_ORIGINALFILENAME_STR    VER_FILEDESCRIPTION_STR
 #endif
 #ifndef VER_PRODUCTNAME_STR
-#define VER_PRODUCTNAME_STR         "Microsoft\xae .NET Framework"
+#define VER_PRODUCTNAME_STR         ".NET"
 #endif
 #undef VER_PRODUCTVERSION
 #define VER_PRODUCTVERSION          $(_WindowsFileVersion)
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.props
index 1072b3aa83b..259a5c65733 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.props
@@ -22,8 +22,6 @@
     It's also not necessary to generate these assets.
   -->
   <PropertyGroup Condition="'$(IsWpfTempProject)' == 'true'">
-    <_WpfTempProjectNuGetFilePathNoExt>$(ArtifactsObjDir)$(_TargetAssemblyProjectName)\$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g</_WpfTempProjectNuGetFilePathNoExt>
-
     <EnableSourceLink>false</EnableSourceLink>
     <EmbedUntrackedSources>false</EmbedUntrackedSources>
     <DeterministicSourcePaths>false</DeterministicSourcePaths>
diff --git a/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj b/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj
index dca4d958f8d..84cc31bf5ad 100644
--- a/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj
+++ b/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj
@@ -21,7 +21,7 @@
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="$(McMasterExtensionsCommandLineUtils)" />
     <!-- Arcade only makes shipping assemblies localizable by default, we'd like to localize this tool without treating it as "shipping". -->
-    <PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.DotNet.XliffTasks" Version="$(MicrosoftDotNetXliffTasksVersion)" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.AsmDiff/README.md b/src/Microsoft.DotNet.AsmDiff/README.md
index 80623812281..2dad02c4859 100644
--- a/src/Microsoft.DotNet.AsmDiff/README.md
+++ b/src/Microsoft.DotNet.AsmDiff/README.md
@@ -13,8 +13,8 @@ AsmDiff is a command line tool which may be used to check the API changes betwee
 - `-osn|--OldSetName` - Provide a name for the old set in output. If this parameter is not provided the file or directory name will be used.
 - `-u|--Unchanged` - Include members, types, and namespaces that are unchanged.
 - `-r|--Removed` - Include members, types, and namespaces that were removed. (default is removed and added)
-- `-a|--Added` - Include members, types, and namespaces that were removed. (default is removed and added)
-- `-c|--Changed` - Include members, types, and namespaces that were removed. (default is removed and added)
+- `-a|--Added` - Include members, types, and namespaces that were added. (default is removed and added)
+- `-c|--Changed` - Include members, types, and namespaces that were changed. (default is removed and added)
 - `-to|--TypesOnly` - Only show down to the type level not the member level.
 - `-sr|--StrikeRemoved` - For removed API's also strike them out. This option currently only works with the HTML writer which is the default.
 - `-da|--DiffAttributes` - Enables diffing of the attributes as well, by default all attributes are ignored. For CSV writer causes the assembly name to be included in the column for types.
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.cs.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.cs.xlf
index 2b886d8a1fa..9955162a2f7 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.cs.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.cs.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated"># Seznam rozhraní API pro {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">Výpis rozhraní API se řídí standardním formátováním rozdílů.
+Řádky před znakem + jsou přidané a znak - označuje odebrání.</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># Rozdíly v rozhraních API mezi {0} a {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.de.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.de.xlf
index 934bce41566..920aaeec945 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.de.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.de.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API Liste von {0}</target>
+        <target state="translated"># API-Liste von {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">Die Änderungen sind im standard diff-Format aufgezählt.
-Die API-Zeilen, die mit einem '+' beginnen wurden hinzugefügt und die mit einem '-' wurden entfernt.</target>
+        <target state="translated">Die API-Auflistung folgt der Standard-Diff-Formatierung.
+Zeilen, denen ein "+" vorangestellt ist, sind Ergänzungen, und ein "-" gibt das Entfernen an.</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Änderungen von {0} zu {1}</target>
+        <target state="translated"># API-Unterschiede {0} im Vergleich zu {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.es.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.es.xlf
index a95e4aa5cc0..333e4e351b8 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.es.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.es.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated"># Lista de API de {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">La lista de API sigue el formato de diff estándar.
+Las líneas precedidas por un signo "+" son adiciones y un "-" indica una eliminación.</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># Diferencias de API {0} frente a {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.fr.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.fr.xlf
index 3baf33dba93..b3a0136388a 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.fr.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.fr.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated"># Liste des API de {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">La liste des API respecte la mise en forme diff standard.
+Les lignes précédées d’un signe « + » sont des ajouts et « - » indique une suppression.</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># Différence d’API {0} vs {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.it.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.it.xlf
index 1f910332f7e..35d6b35f3e4 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.it.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.it.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated"># Elenco delle API di {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">Per l'elenco delle API viene usata la formattazione standard delle differenze.
+Le righe precedute dal segno più ('+') sono aggiunte, mentre il segno meno ('-') contraddistingue quelle rimosse.</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># Differenza API {0} rispetto a {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ja.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ja.xlf
index a2e082aaadc..dd529a8a0ba 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ja.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ja.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated">{0} の # API リスト</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">API 一覧は、標準の差分形式に従います。
+ + ' が続く行は追加、'-' は削除を示します。</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># API 差分 {0} 対 {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ko.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ko.xlf
index 15cd02fd8ba..adbcf69d360 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ko.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ko.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated"># {0}의 API 목록</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">API 목록은 표준 차이 서식을 따릅니다.
+앞에 '+'로 시작하는 줄은 추가이며 '-'는 제거를 나타냅니다.</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># API 차이 {0} 및 {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.pl.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.pl.xlf
index 262941aec35..05323de3b8a 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.pl.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.pl.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated">Lista interfejsów API # z {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">Lista interfejsów API jest zgodna ze standardowym formatowaniem różnicowym.
+Wiersze poprzedzone znakiem "+" są dodawaniem, a znak "-" wskazuje usuwanie.</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated">Różnica interfejsu API # {0} w stosunku do {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.pt-BR.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.pt-BR.xlf
index e481c3ebaae..c5ea35bc9a8 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.pt-BR.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated"># Lista de APIs de {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">A listagem da API segue a formatação de comparação padrão.
+Linhas precedidas por '+' são adições e '-' indica remoção.</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># Diferença da API {0} vs {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ru.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ru.xlf
index fc2423c0378..9d1156bffe6 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ru.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.ru.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated"># Список API {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">Списки API следуют стандартному форматированию различий.
+Строки, начинающиеся символом "+", являются дополнениями, а символ "-" означает удаление.</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># Различие API {0} и {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.tr.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.tr.xlf
index e690363aed2..2972a564b9d 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.tr.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.tr.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated"># {0} API listesi</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">API listesi, standart fark biçimlendirmeyi izler.
+Başında '+' olması satırların ekleneceğini, '-' olması ise kaldırılacağını belirtir.</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># {0} ile {1} arasındaki API farkı</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.zh-Hans.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.zh-Hans.xlf
index 607aea34bfc..ae88e93fcfe 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.zh-Hans.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated"># API {0} 列表</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">API 列表遵循标准差异格式。
+行前面有 "+" 的是添加，而 "-" 表示删除。</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># API 差异 {0} 与 {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.zh-Hant.xlf b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.zh-Hant.xlf
index 0435ed37712..837f19474a7 100644
--- a/src/Microsoft.DotNet.AsmDiff/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.DotNet.AsmDiff/xlf/Resources.zh-Hant.xlf
@@ -4,19 +4,19 @@
     <body>
       <trans-unit id="MarkdownAPIListTitle">
         <source># API List of {0}</source>
-        <target state="new"># API List of {0}</target>
+        <target state="translated"># {0} 的 API 清單</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownDiffDescription">
         <source>API listing follows standard diff formatting.
 Lines preceded by a '+' are additions and a '-' indicates removal.</source>
-        <target state="new">API listing follows standard diff formatting.
-Lines preceded by a '+' are additions and a '-' indicates removal.</target>
+        <target state="translated">API 清單遵循標準差異格式。
+前面加上 '+' 的行是加法，而 '-' 表示移除。</target>
         <note />
       </trans-unit>
       <trans-unit id="MarkdownTitle">
         <source># API Difference {0} vs {1}</source>
-        <target state="new"># API Difference {0} vs {1}</target>
+        <target state="translated"># API 差異 {0} 與 {1}</target>
         <note />
       </trans-unit>
     </body>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj b/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj
index af826e9d5df..c09d77629ea 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj
@@ -1,4 +1,4 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/BuildModelFactoryTests.cs b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/BuildModelFactoryTests.cs
index 0906695c73a..7420d9e661f 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/BuildModelFactoryTests.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/BuildModelFactoryTests.cs
@@ -23,13 +23,16 @@ public class BuildModelFactoryTests
         #region Standard test values
 
         private const string _testAzdoRepoUri = "https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-buildtest";
+        private const string _normalizedTestAzdoRepoUri = "https://dev.azure.com/dnceng/internal/_git/dotnet-buildtest";
         private const string _testBuildBranch = "foobranch";
         private const string _testBuildCommit = "664996a16fa9228cfd7a55d767deb31f62a65f51";
         private const string _testAzdoBuildId = "89999999";
-        private const string _testInitialLocation = "As they say....Location Location Location!";
+        private const string _testInitialLocation = "https://dnceng.visualstudio.com/project/_apis/build/builds/id/artifacts";
+        private const string _normalizedTestInitialLocation = "https://dev.azure.com/dnceng/project/_apis/build/builds/id/artifacts";
         private static readonly string[] _defaultManifestBuildData = new string[]
         {
-            $"InitialAssetsLocation={_testInitialLocation}"
+            $"InitialAssetsLocation={_testInitialLocation}",
+            $"AzureDevOpsRepository={_testAzdoRepoUri}"
         };
 
         #endregion
@@ -165,6 +168,8 @@ public void ManifestArtifactParsingTest()
                     package.Attributes.Should().Contain("Id", "test-package-a");
                     package.Attributes.Should().Contain("Version", "1.0.0");
                 });
+
+            model.Identity.Attributes.Should().Contain("AzureDevOpsRepository", _normalizedTestAzdoRepoUri);
         }
 
         /// <summary>
@@ -290,7 +295,7 @@ public void InitialLocationInformationAttributesAreAccepted(string attributeName
             _taskLoggingHelper.HasLoggedErrors.Should().BeFalse();
 
             // Check that the build model has the initial assets location
-            model.Identity.Attributes.Should().Contain(attributeName, _testInitialLocation);
+            model.Identity.Attributes.Should().Contain(attributeName, _normalizedTestInitialLocation);
         }
 
         #endregion
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/GeneralTests.cs b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/GeneralTests.cs
index 604985edbd8..0eb9ae620a4 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/GeneralTests.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/GeneralTests.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.IO;
 using System.Net;
 using System.Net.Http;
@@ -10,6 +11,7 @@
 using Xunit;
 using static Microsoft.DotNet.Build.Tasks.Feed.GeneralUtils;
 using FluentAssertions;
+using Microsoft.DotNet.Arcade.Test.Common;
 
 namespace Microsoft.DotNet.Build.Tasks.Feed.Tests
 {
@@ -23,15 +25,29 @@ public void ChannelConfigsHaveAllConfigs()
             foreach (var channelConfig in PublishingConstants.ChannelInfos)
             {
                 channelConfig.Id.Should().BeGreaterThan(0);
-                channelConfig.ShippingFeed.Should().NotBeNullOrEmpty();
-                channelConfig.ShippingFeed.Should().NotBeNullOrEmpty();
-                channelConfig.TransportFeed.Should().NotBeNullOrEmpty();
-                channelConfig.SymbolsFeed.Should().NotBeNullOrEmpty();
-                channelConfig.ChecksumsFeed.Should().NotBeNullOrEmpty();
-                channelConfig.InstallersFeed.Should().NotBeNullOrEmpty();
+                channelConfig.TargetFeeds.Should().NotBeEmpty();
+                foreach (TargetFeedContentType type in Enum.GetValues(typeof(TargetFeedContentType)))
+                {
+                    if (type == TargetFeedContentType.None)
+                        continue;
+                    channelConfig.TargetFeeds.Should().Contain(f => f.ContentTypes.Contains(type));
+                }
             }
         }
 
+        [Theory]
+        [InlineData("foo/bar/baz/bop.symbols.nupkg", true)]
+        [InlineData("foo/bar/baz/bop.symbols.nupkg.sha512", false)]
+        [InlineData("foo/bar/baz/bip.snupkg.sha512", false)]
+        [InlineData("foo/bar/baz/bip.snupkg", true)]
+        [InlineData("foo/bar/baz/bip.SNUpkg", true)]
+        [InlineData("foo/bar/baz/bop.SYMBOLS.nupkg", true)]
+        [InlineData("foo/bar/symbols.nupkg/bop.nupkg", false)]
+        public void IsSymbolPackage(string package, bool isSymbolPackage)
+        {
+            GeneralUtils.IsSymbolPackage(package).Should().Be(isSymbolPackage);
+        }
+
         [Theory]
         [InlineData(HttpStatusCode.OK, true)]
         [InlineData(HttpStatusCode.Accepted, true)]
@@ -42,7 +58,7 @@ public async Task IsFeedPublicShouldCorrectlyInterpretFeedResponseStatusCode(
             HttpStatusCode feedResponseStatusCode,
             bool? expectedResult)
         {
-            using var httpClient = FakeHttpClient.WithResponse(
+            using var httpClient = FakeHttpClient.WithResponses(
                 new HttpResponseMessage(feedResponseStatusCode));
             var retryHandler = new MockRetryHandler();
 
@@ -104,7 +120,7 @@ public async Task CompareLocalPackageToFeedPackageShouldCorrectlyInterpretFeedRe
                 response.Content = new ByteArrayContent(content);
             };
 
-            var httpClient = FakeHttpClient.WithResponse(response);
+            var httpClient = FakeHttpClient.WithResponses(response);
 
             var result = await GeneralUtils.CompareLocalPackageToFeedPackage(
                 localPackagePath,
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj
index d100e0d8321..d782557cdbb 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj
@@ -5,24 +5,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.0.2.0" />
+    <PackageReference Include="Azure.Core" Version="$(AzureCoreVersion)" />
     <PackageReference Include="Azure.Storage.Blobs" Version="$(AzureStorageBlobsVersion)" />
     <PackageReference Include="DotNet.SleetLib" Version="$(DotNetSleetLibVersion)" />
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
+    <PackageReference Include="Microsoft.Data.OData" Version="$(MicrosoftDataODataVersion)" />
     <PackageReference Include="Microsoft.DotNet.Maestro.Client" Version="$(MicrosoftDotNetMaestroClientVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
     <PackageReference Include="Microsoft.SymbolUploader" Version="$(MicrosoftSymbolUploaderVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <!-- This is here so that we agree with the feed tasks project's transitive reference to NewtonSoft.Json and Azure.Core -->
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Azure.Core" Version="1.0.2.0" />
-    <PackageReference Include="DotNet.SleetLib" Version="$(DotNetSleetLibVersion)" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="$(AzureStorageBlobsVersion)" />
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -38,4 +34,5 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishArtifactsInManifestTests.cs b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishArtifactsInManifestTests.cs
index f46aa8abea8..3d2d18e68aa 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishArtifactsInManifestTests.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishArtifactsInManifestTests.cs
@@ -28,33 +28,6 @@ public class PublishArtifactsInManifestTests
         private const string RandomToken = "abcd";
         private const string BlobFeedUrl = "https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json";
 
-        // This test should be refactored: https://github.com/dotnet/arcade/issues/6715
-        [Fact]
-        public void ConstructV2PublishingTask()
-        {
-            var manifestFullPath = TestInputs.GetFullPath(Path.Combine("Manifests", "SampleV2.xml"));
-
-            var buildEngine = new MockBuildEngine();
-            var task = new PublishArtifactsInManifest()
-            {
-                BuildEngine = buildEngine,
-                TargetChannels = GeneralTestingChannelId
-            };
-
-            // Dependency Injection setup
-            var collection = new ServiceCollection()
-                .AddSingleton<IFileSystem, FileSystem>()
-                .AddSingleton<IBuildModelFactory, BuildModelFactory>();
-            task.ConfigureServices(collection);
-            using var provider = collection.BuildServiceProvider();
-
-            // Act and Assert
-            task.InvokeExecute(provider);
-
-            var which = task.WhichPublishingTask(manifestFullPath);
-            which.Should().BeOfType<PublishArtifactsInManifestV2>();
-        }
-
         // This test should be refactored: https://github.com/dotnet/arcade/issues/6715
         [Fact]
         public void ConstructV3PublishingTask()
@@ -136,7 +109,7 @@ public async Task FeedConfigParserTests2Async()
             await task.ParseTargetFeedConfigAsync();
             task.Log.HasLoggedErrors.Should().BeTrue();
             buildEngine.BuildErrorEvents.Should().Contain(e =>
-                e.Message.Equals("Invalid feed config type 'MyUnknownFeedType'. Possible values are: AzDoNugetFeed, AzureStorageFeed"));
+                e.Message.Equals("Invalid feed config type 'MyUnknownFeedType'. Possible values are: AzDoNugetFeed, AzureStorageFeed, AzureStorageContainer"));
         }
 
         [Fact]
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishToSymbolServerTest.cs b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishToSymbolServerTest.cs
index 3216cf23dba..0a619f55a62 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishToSymbolServerTest.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishToSymbolServerTest.cs
@@ -1,8 +1,14 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
-using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Arcade.Common;
 using Microsoft.Arcade.Test.Common;
+using Microsoft.DotNet.Arcade.Test.Common;
 using Microsoft.DotNet.Build.Tasks.Feed.Model;
+using Microsoft.DotNet.Maestro.Client.Models;
 using Xunit;
 
 namespace Microsoft.DotNet.Build.Tasks.Feed.Tests
@@ -27,7 +33,7 @@ public void PublishToSymbolServersTest(SymbolTargetType symbolTargetType , strin
                 "TargetUrl",
                 FeedType.AzureStorageFeed,
                 MsdlToken,
-                string.Empty,
+                new List<string>(),
                 AssetSelection.All,
                 isolated: true,
                 @internal: false,
@@ -40,7 +46,6 @@ public void PublishToSymbolServersTest(SymbolTargetType symbolTargetType , strin
             Assert.True(test.Count == 1);
         }
 
-
         [Fact]
         public void PublishToBothSymbolServerTest()
         {
@@ -51,7 +56,7 @@ public void PublishToBothSymbolServerTest()
                 "testUrl",
                 FeedType.AzureStorageFeed,
                 SymWebToken,
-                string.Empty,
+                new List<string>(),
                 AssetSelection.All,
                 isolated: true,
                 @internal: false,
@@ -62,7 +67,7 @@ public void PublishToBothSymbolServerTest()
                 TargetUrl,
                 FeedType.AzDoNugetFeed,
                 MsdlToken,
-                string.Empty,
+                new List<string>(),
                 AssetSelection.All,
                 isolated: true,
                 @internal: false,
@@ -77,7 +82,7 @@ public void PublishToBothSymbolServerTest()
         }
 
         [Fact]
-        public void TemporarySymbolDirectoryDoesNotExists()
+        public async Task TemporarySymbolDirectoryDoesNotExists()
         {
             var buildEngine = new MockBuildEngine();
             var task = new PublishArtifactsInManifestV3()
@@ -85,25 +90,29 @@ public void TemporarySymbolDirectoryDoesNotExists()
                 BuildEngine = buildEngine,
             };
             var path = TestInputs.GetFullPath("Symbol");
-            var publish = task.HandleSymbolPublishingAsync(path, MsdlToken, SymWebToken, "", path, false);
+            var buildAsset = new Dictionary<string, HashSet<Asset>>();
+            await task.HandleSymbolPublishingAsync(path, MsdlToken, SymWebToken, "", false, buildAsset, null, path);
             Assert.True(task.Log.HasLoggedErrors);
         }
 
         [Fact]
         public void TemporarySymbolsDirectoryTest()
         {
-            var publishTask = new PublishArtifactsInManifestV3();
+            var buildEngine = new MockBuildEngine();
+            var publishTask = new PublishArtifactsInManifestV3()
+            {
+                BuildEngine = buildEngine,
+            };
             var path = TestInputs.GetFullPath("Test");
-            publishTask.EnsureTemporarySymbolDirectoryExists(path);
+            publishTask.EnsureTemporaryDirectoryExists(path);
             Assert.True(Directory.Exists(path));
-            publishTask.DeleteSymbolTemporaryDirectory(path);
+            publishTask.DeleteTemporaryDirectory(path);
             Assert.False(Directory.Exists(path));
         }
 
         [Fact]
         public void PublishSymbolApiIsCalledTest()
         {
-            var publishTask = new PublishArtifactsInManifestV3();
             var path = TestInputs.GetFullPath("Symbols");
             string[] fileEntries = Directory.GetFiles(path);
             var feedConfigsForSymbols = new HashSet<TargetFeedConfig>();
@@ -112,28 +121,249 @@ public void PublishSymbolApiIsCalledTest()
                 TargetUrl,
                 FeedType.AzureStorageFeed,
                 SymWebToken,
-                string.Empty,
+                new List<string>(),
                 AssetSelection.All,
                 isolated: true,
                 @internal: false,
                 allowOverwrite: true,
                 SymbolTargetType.SymWeb));
-            Dictionary<string, string> test =
-                publishTask.GetTargetSymbolServers(feedConfigsForSymbols, MsdlToken, SymWebToken);
-            Assert.True(PublishSymbolsHelper.PublishAsync(null,
-                path,
-                SymWebToken,
-                fileEntries,
-                fileEntries,
-                null,
-                365,
-                false,
-                false,
-                null,
-                false,
-                false,
-                false).IsCompleted);
+            Assert.True(PublishSymbolsHelper.PublishAsync(
+                log: null,
+                symbolServerPath: path,
+                personalAccessToken: SymWebToken,
+                inputPackages: fileEntries,
+                inputFiles: fileEntries,
+                packageExcludeFiles: null,
+                expirationInDays: 365,
+                convertPortablePdbsToWindowsPdbs: false,
+                publishSpecialClrFiles: false,
+                pdbConversionTreatAsWarning: null,
+                treatPdbConversionIssuesAsInfo: false,
+                dryRun: false,
+                timer: false,
+                verboseLogging: false).IsCompleted);
+        }
+
+        [Fact]
+        public void DownloadFileAsyncSucceedsForValidUrl()
+        {
+            var buildEngine = new MockBuildEngine();
+            var publishTask = new PublishArtifactsInManifestV3
+            {
+                BuildEngine = buildEngine,
+            };
+
+            var testFile = Path.Combine("Symbols", "test.txt");
+            var responseContent = TestInputs.ReadAllBytes(testFile);
+            var response = new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new ByteArrayContent(responseContent)
+            };
+
+            using HttpClient client = FakeHttpClient.WithResponses(response);
+            var path = TestInputs.GetFullPath(Guid.NewGuid().ToString());
+
+            var test = publishTask.DownloadFileAsync(
+                client,
+                PublishArtifactsInManifestBase.ArtifactName.BlobArtifacts,
+                "1234",
+                "test.txt",
+                path);
+
+            Assert.True(File.Exists(path));
+            publishTask.DeleteTemporaryFiles(path);
+            publishTask.DeleteTemporaryDirectory(path);
         }
 
+        [Theory]
+        [InlineData(HttpStatusCode.BadRequest)]
+        [InlineData(HttpStatusCode.NotFound)]
+        [InlineData(HttpStatusCode.GatewayTimeout)]
+        public async Task DownloadFileAsyncFailsForInValidUrlTest(HttpStatusCode httpStatus)
+        {
+            var buildEngine = new MockBuildEngine();
+            var publishTask = new PublishArtifactsInManifestV3
+            {
+                BuildEngine = buildEngine,
+            };
+            var testFile = Path.Combine("Symbols", "test.txt");
+            var responseContent = TestInputs.ReadAllBytes(testFile);
+            publishTask.RetryHandler = new ExponentialRetry() { MaxAttempts = 3, DelayBase = 1 };
+
+            var responses = new[]
+            {
+                new HttpResponseMessage(httpStatus)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                },
+                new HttpResponseMessage(httpStatus)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                },
+                new HttpResponseMessage(httpStatus)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                }
+            };
+            using HttpClient client = FakeHttpClient.WithResponses(responses);
+            var path = TestInputs.GetFullPath(Guid.NewGuid().ToString());
+
+            var actualError = await Assert.ThrowsAsync<Exception>(() =>
+                publishTask.DownloadFileAsync(
+                    client,
+                    PublishArtifactsInManifestBase.ArtifactName.BlobArtifacts,
+                    "1234",
+                    "test.txt",
+                    path));
+            Assert.Contains($"Failed to download local file '{path}' after {publishTask.RetryHandler.MaxAttempts} attempts.  See inner exception for details.", actualError.Message);
+        }
+
+        [Theory]
+        [InlineData(HttpStatusCode.BadRequest)]
+        [InlineData(HttpStatusCode.NotFound)]
+        [InlineData(HttpStatusCode.GatewayTimeout)]
+        public async Task DownloadFailureWhenStatusCodeIsInvalid(HttpStatusCode httpStatus)
+        {
+            var buildEngine = new MockBuildEngine();
+            var publishTask = new PublishArtifactsInManifestV3
+            {
+                BuildEngine = buildEngine,
+            };
+            var testFile = Path.Combine("Symbols", "test.txt");
+            var responseContent = TestInputs.ReadAllBytes(testFile);
+            publishTask.RetryHandler = new ExponentialRetry() { MaxAttempts = 3, DelayBase = 1 };
+
+            var responses = new[]
+            {
+                new HttpResponseMessage(httpStatus)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                },
+                new HttpResponseMessage(httpStatus)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                },
+                new HttpResponseMessage(httpStatus)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                }
+            };
+            using HttpClient client = FakeHttpClient.WithResponses(responses);
+            var path = TestInputs.GetFullPath(Guid.NewGuid().ToString());
+
+            var actualError = await Assert.ThrowsAsync<Exception>(() =>
+                publishTask.DownloadFileAsync(
+                    client,
+                    PublishArtifactsInManifestBase.ArtifactName.BlobArtifacts,
+                    "1234",
+                    "test.txt",
+                    path));
+            Assert.Contains($"Failed to download local file '{path}' after {publishTask.RetryHandler.MaxAttempts} attempts.  See inner exception for details.", actualError.Message);
+        }
+
+        [Theory]
+        [InlineData(HttpStatusCode.BadRequest)]
+        [InlineData(HttpStatusCode.NotFound)]
+        [InlineData(HttpStatusCode.GatewayTimeout)]
+        public async Task DownloadFileSuccessfulAfterRetryTest(HttpStatusCode httpStatus)
+        {
+            var buildEngine = new MockBuildEngine();
+            var publishTask = new PublishArtifactsInManifestV3
+            {
+                BuildEngine = buildEngine,
+            };
+            var testFile = Path.Combine("Symbols", "test.txt");
+            var responseContent = TestInputs.ReadAllBytes(testFile);
+            publishTask.RetryHandler = new ExponentialRetry() { MaxAttempts = 2, DelayBase = 1 };
+
+            var responses = new[]
+            {
+                new HttpResponseMessage(httpStatus)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                },
+                new HttpResponseMessage(HttpStatusCode.OK)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                }
+            };
+            using HttpClient client = FakeHttpClient.WithResponses(responses);
+            var path = TestInputs.GetFullPath(Guid.NewGuid().ToString());
+
+            await publishTask.DownloadFileAsync(
+                client,
+                PublishArtifactsInManifestBase.ArtifactName.BlobArtifacts,
+                "1234",
+                "test.txt",
+                path);
+            Assert.True(File.Exists(path));
+            publishTask.DeleteTemporaryFiles(path);
+            publishTask.DeleteTemporaryDirectory(path);
+        }
+
+        [Theory]
+        [InlineData(PublishArtifactsInManifestBase.ArtifactName.BlobArtifacts, "1")]
+        [InlineData(PublishArtifactsInManifestBase.ArtifactName.PackageArtifacts, "1234")]
+        public async Task GetContainerIdToDownloadArtifactAsync(PublishArtifactsInManifestBase.ArtifactName artifactName, string containerId)
+        {
+            var buildEngine = new MockBuildEngine();
+            var publishTask = new PublishArtifactsInManifestV3
+            {
+                BuildEngine = buildEngine,
+            };
+            publishTask.BuildId = "1243456";
+            var testPackageName = Path.Combine("Symbols", "test.txt");
+            var responseContent = TestInputs.ReadAllBytes(testPackageName);
+            var responses = new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new ByteArrayContent(responseContent)
+            };
+
+            using HttpClient client = FakeHttpClient.WithResponses(responses);
+            var test = await publishTask.GetContainerIdAsync(
+                client,
+                artifactName);
+            Assert.Equal(containerId, test);
+        }
+
+        [Theory]
+        [InlineData(HttpStatusCode.BadRequest)]
+        [InlineData(HttpStatusCode.NotFound)]
+        public async Task ErrorAfterMaxRetriesToGetContainerId(HttpStatusCode httpStatus)
+        {
+            var buildEngine = new MockBuildEngine();
+            var publishTask = new PublishArtifactsInManifestV3
+            {
+                BuildEngine = buildEngine,
+            };
+            publishTask.BuildId = "1243456";
+            publishTask.RetryHandler = new ExponentialRetry() {MaxAttempts = 3, DelayBase = 1};
+
+            var testPackageName = Path.Combine("Symbols", "test.txt");
+            var responseContent = TestInputs.ReadAllBytes(testPackageName);
+            var responses = new[]
+            {
+                new HttpResponseMessage(httpStatus)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                },
+                new HttpResponseMessage(httpStatus)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                },
+                new HttpResponseMessage(httpStatus)
+                {
+                    Content = new ByteArrayContent(responseContent)
+                }
+            };
+
+            using HttpClient client = FakeHttpClient.WithResponses(responses);
+
+            var actualError = await Assert.ThrowsAsync<Exception>(() =>
+                publishTask.GetContainerIdAsync(
+                    client,
+                    PublishArtifactsInManifestBase.ArtifactName.BlobArtifacts));
+            Assert.Contains($"Failed to get container id after {publishTask.RetryHandler.MaxAttempts} attempts.  See inner exception for details,", actualError.Message);
+        }
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/SetupTargetFeedConfigV3Tests.cs b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/SetupTargetFeedConfigV3Tests.cs
index db7559468e5..99d0850bb68 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/SetupTargetFeedConfigV3Tests.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/SetupTargetFeedConfigV3Tests.cs
@@ -1,11 +1,15 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using FluentAssertions;
 using Microsoft.Arcade.Test.Common;
 using Microsoft.DotNet.Build.Tasks.Feed.Model;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -31,12 +35,12 @@ public class SetupTargetFeedConfigV3Tests
         private const string AzureDevOpsStaticTransportFeed = "AzureDevOpsStaticTransportFeed";
         private const string AzureDevOpsStaticSymbolsFeed = "AzureDevOpsStaticSymbolsFeed";
 
-        private static List<string> FilesToExclude = new List<string>() { 
+        private static ImmutableList<string> FilesToExclude = ImmutableList.Create(
             "filename",
             "secondfilename"
-        };
+        );
 
-        private readonly List<TargetFeedContentType> Installers = new List<TargetFeedContentType>() { 
+        private readonly List<TargetFeedContentType> InstallersAndSymbols = new List<TargetFeedContentType>() { 
             TargetFeedContentType.OSX,
             TargetFeedContentType.Deb,
             TargetFeedContentType.Rpm,
@@ -46,10 +50,29 @@ public class SetupTargetFeedConfigV3Tests
             TargetFeedContentType.Maven,
             TargetFeedContentType.VSIX,
             TargetFeedContentType.Badge,
+            TargetFeedContentType.Symbols,
             TargetFeedContentType.Other
         };
 
-        private const SymbolTargetType symbolTargetType = SymbolTargetType.None;
+        private readonly ITaskItem[] FeedKeys = GetFeedKeys();
+
+        private static ITaskItem[] GetFeedKeys()
+        {
+            var installersKey = new TaskItem(PublishingConstants.FeedForInstallers);
+            installersKey.SetMetadata("Key", InstallersTargetStaticFeedKey);
+            var checksumsKey = new TaskItem(PublishingConstants.FeedForChecksums);
+            checksumsKey.SetMetadata("Key", ChecksumsTargetStaticFeedKey);
+            var azureDevops = new TaskItem("https://pkgs.dev.azure.com/dnceng");
+            azureDevops.SetMetadata("Key", AzureDevOpsFeedsKey);
+            return new ITaskItem[]
+            {
+                installersKey,
+                checksumsKey,
+                azureDevops,
+            };
+        }
+
+        private const SymbolTargetType symbolTargetType = SymbolTargetType.Msdl;
 
         private readonly ITestOutputHelper Output;
 
@@ -67,50 +90,16 @@ public void StableFeeds(bool publishInstallersAndChecksums, bool isInternalBuild
         {
             var expectedFeeds = new List<TargetFeedConfig>();
 
-            if (publishInstallersAndChecksums)
-            {
-                expectedFeeds.Add(
-                    new TargetFeedConfig(
-                        TargetFeedContentType.Checksum,
-                        ChecksumsTargetStaticFeed,
-                        FeedType.AzureStorageFeed,
-                        ChecksumsTargetStaticFeedKey,
-                        latestLinkShortUrlPrefix: $"{LatestLinkShortUrlPrefix}/{BuildQuality}",
-                        assetSelection: AssetSelection.All,
-                        isolated: true,
-                        @internal: false,
-                        allowOverwrite: true,
-                        symbolTargetType: symbolTargetType,
-                        filenamesToExclude: FilesToExclude));
-
-                foreach (var contentType in Installers)
-                {
-                    expectedFeeds.Add(
-                        new TargetFeedConfig(
-                            contentType,
-                            InstallersTargetStaticFeed,
-                            FeedType.AzureStorageFeed,
-                            InstallersTargetStaticFeedKey,
-                            latestLinkShortUrlPrefix: $"{LatestLinkShortUrlPrefix}/{BuildQuality}",
-                            assetSelection: AssetSelection.All,
-                            isolated: true,
-                            @internal: false,
-                            allowOverwrite: true,
-                            symbolTargetType: symbolTargetType,
-                            filenamesToExclude: FilesToExclude));
-                }
-            }
-
             expectedFeeds.Add(
                 new TargetFeedConfig(
                     TargetFeedContentType.Package,
                     StablePackageFeed,
                     FeedType.AzDoNugetFeed,
                     AzureDevOpsFeedsKey,
-                    latestLinkShortUrlPrefix: string.Empty,
+                    latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
                     assetSelection: AssetSelection.ShippingOnly,
                     isolated: true,
-                    @internal: false,
+                    @internal: isInternalBuild,
                     allowOverwrite: false,
                     symbolTargetType: symbolTargetType,
                     filenamesToExclude: FilesToExclude));
@@ -121,10 +110,10 @@ public void StableFeeds(bool publishInstallersAndChecksums, bool isInternalBuild
                     StableSymbolsFeed,
                     FeedType.AzDoNugetFeed,
                     AzureDevOpsFeedsKey,
-                    latestLinkShortUrlPrefix: string.Empty,
+                    latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
                     assetSelection: AssetSelection.All,
                     isolated: true,
-                    @internal: false,
+                    @internal: isInternalBuild,
                     allowOverwrite: false,
                     symbolTargetType: symbolTargetType,
                     filenamesToExclude: FilesToExclude));
@@ -132,34 +121,68 @@ public void StableFeeds(bool publishInstallersAndChecksums, bool isInternalBuild
             expectedFeeds.Add(
                 new TargetFeedConfig(
                     TargetFeedContentType.Package,
-                    AzureDevOpsStaticTransportFeed,
+                    PublishingConstants.FeedDotNet5Transport,
                     FeedType.AzDoNugetFeed,
                     AzureDevOpsFeedsKey,
-                    latestLinkShortUrlPrefix: string.Empty,
+                    latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
                     assetSelection: AssetSelection.NonShippingOnly,
                     isolated: false,
-                    @internal: false,
+                    @internal: isInternalBuild,
                     allowOverwrite: false,
                     symbolTargetType: symbolTargetType,
                     filenamesToExclude: FilesToExclude));
 
+            if (publishInstallersAndChecksums)
+            {
+                foreach (var contentType in InstallersAndSymbols)
+                {
+                    if (contentType == TargetFeedContentType.Symbols)
+                    {
+                        continue;
+                    }
+                    expectedFeeds.Add(
+                        new TargetFeedConfig(
+                            contentType,
+                            PublishingConstants.FeedForInstallers,
+                            FeedType.AzureStorageFeed,
+                            InstallersTargetStaticFeedKey,
+                            latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
+                            assetSelection: AssetSelection.All,
+                            isolated: false,
+                            @internal: isInternalBuild,
+                            allowOverwrite: false,
+                            symbolTargetType: symbolTargetType,
+                            filenamesToExclude: FilesToExclude));
+                }
+                expectedFeeds.Add(
+                    new TargetFeedConfig(
+                        TargetFeedContentType.Checksum,
+                        PublishingConstants.FeedForChecksums,
+                        FeedType.AzureStorageFeed,
+                        ChecksumsTargetStaticFeedKey,
+                        latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
+                        assetSelection: AssetSelection.All,
+                        isolated: false,
+                        @internal: isInternalBuild,
+                        allowOverwrite: false,
+                        symbolTargetType: symbolTargetType,
+                        filenamesToExclude: FilesToExclude));
+            }
+
+
             var buildEngine = new MockBuildEngine();
+            var channelConfig = PublishingConstants.ChannelInfos.First(c => c.Id == 131);
             var config = new SetupTargetFeedConfigV3(
+                    channelConfig,
                     isInternalBuild,
-                    isStableBuild: true,
+                    true,
                     repositoryName: "test-repo",
                     commitSha: "c0c0c0c0",
-                    AzureStorageTargetFeedPAT,
                     publishInstallersAndChecksums,
-                    InstallersTargetStaticFeed,
-                    InstallersTargetStaticFeedKey,
-                    ChecksumsTargetStaticFeed,
-                    ChecksumsTargetStaticFeedKey,
-                    AzureDevOpsStaticShippingFeed,
-                    AzureDevOpsStaticTransportFeed,
-                    AzureDevOpsStaticSymbolsFeed,
-                    $"{LatestLinkShortUrlPrefix}/{BuildQuality}",
-                    AzureDevOpsFeedsKey,
+                    FeedKeys,
+                    Array.Empty<ITaskItem>(),
+                    Array.Empty<ITaskItem>(),
+                    new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
                     buildEngine,
                     symbolTargetType,
                     StablePackageFeed,
@@ -179,17 +202,43 @@ public void NonStableAndInternal(bool publishInstallersAndChecksums)
         {
             var expectedFeeds = new List<TargetFeedConfig>();
 
+            expectedFeeds.Add(new TargetFeedConfig(
+                TargetFeedContentType.Package,
+                PublishingConstants.FeedDotNet5Shipping,
+                FeedType.AzDoNugetFeed,
+                AzureDevOpsFeedsKey,
+                latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
+                AssetSelection.ShippingOnly,
+                false,
+                true,
+                false,
+                symbolTargetType: symbolTargetType,
+                filenamesToExclude: FilesToExclude));
+
+            expectedFeeds.Add(new TargetFeedConfig(
+                TargetFeedContentType.Package,
+                PublishingConstants.FeedDotNet5Transport,
+                FeedType.AzDoNugetFeed,
+                AzureDevOpsFeedsKey,
+                latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
+                AssetSelection.NonShippingOnly,
+                false,
+                true,
+                false,
+                symbolTargetType: symbolTargetType,
+                filenamesToExclude: FilesToExclude));
+
             if (publishInstallersAndChecksums)
             {
-                foreach (var contentType in Installers)
+                foreach (var contentType in InstallersAndSymbols)
                 {
                     expectedFeeds.Add(
                         new TargetFeedConfig(
                             contentType,
-                            InstallersTargetStaticFeed,
+                            PublishingConstants.FeedForInstallers,
                             FeedType.AzureStorageFeed,
                             InstallersTargetStaticFeedKey,
-                            latestLinkShortUrlPrefix: $"{LatestLinkShortUrlPrefix}/{BuildQuality}",
+                            latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
                             assetSelection: AssetSelection.All,
                             isolated: false,
                             @internal: true,
@@ -201,10 +250,10 @@ public void NonStableAndInternal(bool publishInstallersAndChecksums)
                 expectedFeeds.Add(
                     new TargetFeedConfig(
                         TargetFeedContentType.Checksum,
-                        ChecksumsTargetStaticFeed,
+                        PublishingConstants.FeedForChecksums,
                         FeedType.AzureStorageFeed,
                         ChecksumsTargetStaticFeedKey,
-                        latestLinkShortUrlPrefix: $"{LatestLinkShortUrlPrefix}/{BuildQuality}",
+                        latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
                         assetSelection: AssetSelection.All,
                         isolated: false,
                         @internal: true,
@@ -213,66 +262,36 @@ public void NonStableAndInternal(bool publishInstallersAndChecksums)
                         filenamesToExclude: FilesToExclude));
 
             }
-
-            expectedFeeds.Add(
-                new TargetFeedConfig(
-                    TargetFeedContentType.Package,
-                    AzureDevOpsStaticShippingFeed,
-                    FeedType.AzDoNugetFeed,
-                    AzureDevOpsFeedsKey,
-                    latestLinkShortUrlPrefix: string.Empty,
-                    assetSelection: AssetSelection.ShippingOnly,
-                    isolated: false,
-                    @internal: true,
-                    allowOverwrite: false,
-                    symbolTargetType: symbolTargetType,
-                    filenamesToExclude: FilesToExclude));
-
-            expectedFeeds.Add(
-                new TargetFeedConfig(
-                    TargetFeedContentType.Package,
-                    AzureDevOpsStaticTransportFeed,
-                    FeedType.AzDoNugetFeed,
-                    AzureDevOpsFeedsKey,
-                    latestLinkShortUrlPrefix: string.Empty,
-                    assetSelection: AssetSelection.NonShippingOnly,
-                    isolated: false,
-                    @internal: true,
-                    allowOverwrite: false,
-                    symbolTargetType: symbolTargetType,
-                    filenamesToExclude: FilesToExclude));
-
-            expectedFeeds.Add(
-                new TargetFeedConfig(
-                    TargetFeedContentType.Symbols,
-                    AzureDevOpsStaticSymbolsFeed,
-                    FeedType.AzDoNugetFeed,
-                    AzureDevOpsFeedsKey,
-                    latestLinkShortUrlPrefix: string.Empty,
-                    assetSelection: AssetSelection.All,
-                    isolated: false,
-                    @internal: true,
-                    allowOverwrite: false,
-                    symbolTargetType: symbolTargetType,
-                    filenamesToExclude: FilesToExclude));
+            else
+            {
+                expectedFeeds.Add(
+                    new TargetFeedConfig(
+                        TargetFeedContentType.Symbols,
+                        PublishingConstants.FeedForInstallers,
+                        FeedType.AzureStorageFeed,
+                        InstallersTargetStaticFeedKey,
+                        latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
+                        assetSelection: AssetSelection.All,
+                        isolated: false,
+                        @internal: true,
+                        allowOverwrite: false,
+                        symbolTargetType: symbolTargetType,
+                        filenamesToExclude: FilesToExclude));
+            }
 
             var buildEngine = new MockBuildEngine();
+            var channelConfig = PublishingConstants.ChannelInfos.First(c => c.Id == 131);
             var config = new SetupTargetFeedConfigV3(
+                    channelConfig,
                     isInternalBuild: true,
                     isStableBuild: false,
                     repositoryName: "test-repo",
                     commitSha: "c0c0c0c0",
-                    AzureStorageTargetFeedPAT,
                     publishInstallersAndChecksums,
-                    InstallersTargetStaticFeed,
-                    InstallersTargetStaticFeedKey,
-                    ChecksumsTargetStaticFeed,
-                    ChecksumsTargetStaticFeedKey,
-                    AzureDevOpsStaticShippingFeed,
-                    AzureDevOpsStaticTransportFeed,
-                    AzureDevOpsStaticSymbolsFeed,
-                    $"{LatestLinkShortUrlPrefix}/{BuildQuality}",
-                    AzureDevOpsFeedsKey,
+                    FeedKeys,
+                    Array.Empty<ITaskItem>(),
+                    Array.Empty<ITaskItem>(),
+                    latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
                     buildEngine: buildEngine,
                     symbolTargetType,
                     filesToExclude: FilesToExclude
@@ -290,61 +309,13 @@ public void NonStableAndPublic(bool publishInstallersAndChecksums)
         {
             var expectedFeeds = new List<TargetFeedConfig>();
 
-            if (publishInstallersAndChecksums)
-            {
-                expectedFeeds.Add(
-                    new TargetFeedConfig(
-                        TargetFeedContentType.Checksum,
-                        ChecksumsTargetStaticFeed,
-                        FeedType.AzureStorageFeed,
-                        ChecksumsTargetStaticFeedKey,
-                        latestLinkShortUrlPrefix: $"{LatestLinkShortUrlPrefix}/{BuildQuality}",
-                        assetSelection: AssetSelection.All,
-                        isolated: false,
-                        @internal: false,
-                        allowOverwrite: false,
-                        symbolTargetType: symbolTargetType,
-                        filenamesToExclude: FilesToExclude));
-
-                foreach (var contentType in Installers)
-                {
-                    expectedFeeds.Add(
-                        new TargetFeedConfig(
-                            contentType,
-                            InstallersTargetStaticFeed,
-                            FeedType.AzureStorageFeed,
-                            InstallersTargetStaticFeedKey,
-                            latestLinkShortUrlPrefix: $"{LatestLinkShortUrlPrefix}/{BuildQuality}",
-                            assetSelection: AssetSelection.All,
-                            isolated: false,
-                            @internal: false,
-                            allowOverwrite: false,
-                            symbolTargetType: symbolTargetType,
-                            filenamesToExclude: FilesToExclude));
-                }
-            }
-
-            expectedFeeds.Add(
-                new TargetFeedConfig(
-                    TargetFeedContentType.Symbols,
-                    PublishingConstants.LegacyDotNetBlobFeedURL,
-                    FeedType.AzureStorageFeed,
-                    AzureStorageTargetFeedPAT,
-                    latestLinkShortUrlPrefix: string.Empty,
-                    assetSelection: AssetSelection.All,
-                    isolated: false,
-                    @internal: false,
-                    allowOverwrite: false,
-                    symbolTargetType: symbolTargetType,
-                    filenamesToExclude: FilesToExclude));
-
             expectedFeeds.Add(
                 new TargetFeedConfig(
                     TargetFeedContentType.Package,
-                    AzureDevOpsStaticShippingFeed,
+                    PublishingConstants.FeedDotNet5Shipping,
                     FeedType.AzDoNugetFeed,
                     AzureDevOpsFeedsKey,
-                    latestLinkShortUrlPrefix: string.Empty,
+                    latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
                     assetSelection: AssetSelection.ShippingOnly,
                     isolated: false,
                     @internal: false,
@@ -355,10 +326,10 @@ public void NonStableAndPublic(bool publishInstallersAndChecksums)
             expectedFeeds.Add(
                 new TargetFeedConfig(
                     TargetFeedContentType.Package,
-                    AzureDevOpsStaticTransportFeed,
+                    PublishingConstants.FeedDotNet5Transport,
                     FeedType.AzDoNugetFeed,
                     AzureDevOpsFeedsKey,
-                    latestLinkShortUrlPrefix: string.Empty,
+                    latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
                     assetSelection: AssetSelection.NonShippingOnly,
                     isolated: false,
                     @internal: false,
@@ -366,23 +337,69 @@ public void NonStableAndPublic(bool publishInstallersAndChecksums)
                     symbolTargetType: symbolTargetType,
                     filenamesToExclude: FilesToExclude));
 
+            if (publishInstallersAndChecksums)
+            {
+                foreach (var contentType in InstallersAndSymbols)
+                {
+                    expectedFeeds.Add(
+                        new TargetFeedConfig(
+                            contentType,
+                            PublishingConstants.FeedForInstallers,
+                            FeedType.AzureStorageFeed,
+                            InstallersTargetStaticFeedKey,
+                            latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
+                            assetSelection: AssetSelection.All,
+                            isolated: false,
+                            @internal: false,
+                            allowOverwrite: false,
+                            symbolTargetType: symbolTargetType,
+                            filenamesToExclude: FilesToExclude));
+                }
+
+                expectedFeeds.Add(
+                    new TargetFeedConfig(
+                        TargetFeedContentType.Checksum,
+                        PublishingConstants.FeedForChecksums,
+                        FeedType.AzureStorageFeed,
+                        ChecksumsTargetStaticFeedKey,
+                        latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
+                        assetSelection: AssetSelection.All,
+                        isolated: false,
+                        @internal: false,
+                        allowOverwrite: false,
+                        symbolTargetType: symbolTargetType,
+                        filenamesToExclude: FilesToExclude));
+            }
+            else
+            {
+                expectedFeeds.Add(
+                    new TargetFeedConfig(
+                        TargetFeedContentType.Symbols,
+                        PublishingConstants.FeedForInstallers,
+                        FeedType.AzureStorageFeed,
+                        InstallersTargetStaticFeedKey,
+                        latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
+                        assetSelection: AssetSelection.All,
+                        isolated: false,
+                        @internal: false,
+                        allowOverwrite: false,
+                        symbolTargetType: symbolTargetType,
+                        filenamesToExclude: FilesToExclude));
+            }
+
             var buildEngine = new MockBuildEngine();
+            var channelConfig = PublishingConstants.ChannelInfos.First(c => c.Id == 131);
             var config = new SetupTargetFeedConfigV3(
+                    channelConfig,
                     isInternalBuild: false,
                     isStableBuild: false,
                     repositoryName: "test-repo",
                     commitSha: "c0c0c0c0",
-                    AzureStorageTargetFeedPAT,
                     publishInstallersAndChecksums,
-                    InstallersTargetStaticFeed,
-                    InstallersTargetStaticFeedKey,
-                    ChecksumsTargetStaticFeed,
-                    ChecksumsTargetStaticFeedKey,
-                    AzureDevOpsStaticShippingFeed,
-                    AzureDevOpsStaticTransportFeed,
-                    AzureDevOpsStaticSymbolsFeed,
-                    $"{LatestLinkShortUrlPrefix}/{BuildQuality}",
-                    AzureDevOpsFeedsKey,
+                    FeedKeys,
+                    Array.Empty<ITaskItem>(),
+                    Array.Empty<ITaskItem>(),
+                    latestLinkShortUrlPrefixes: new List<string>() { $"{LatestLinkShortUrlPrefix}/{BuildQuality}" },
                     buildEngine: buildEngine,
                     symbolTargetType,
                     filesToExclude: FilesToExclude
@@ -420,5 +437,18 @@ private bool AreEquivalent(List<TargetFeedConfig> expectedItems, List<TargetFeed
 
             return true;
         }
+
+        [Fact]
+        public void MustHaveSeparateTargetFeedSpecificationsForShippingAndNonShipping()
+        {
+            Action shouldFail = () => new TargetFeedSpecification(new TargetFeedContentType[] { TargetFeedContentType.Package }, "FooFeed", AssetSelection.All);
+            shouldFail.Should().Throw<ArgumentException>();
+
+            Action shouldPassShippingOnly = () => new TargetFeedSpecification(new TargetFeedContentType[] { TargetFeedContentType.Package }, "FooFeed", AssetSelection.ShippingOnly);
+            shouldPassShippingOnly.Should().NotThrow();
+
+            Action shouldPassNonShippingOnly = () => new TargetFeedSpecification(new TargetFeedContentType[] { TargetFeedContentType.Package }, "FooFeed", AssetSelection.NonShippingOnly);
+            shouldPassNonShippingOnly.Should().NotThrow();
+        }
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/TestInputs/Symbols/test.txt b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/TestInputs/Symbols/test.txt
new file mode 100644
index 00000000000..5a604136aeb
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/TestInputs/Symbols/test.txt
@@ -0,0 +1,35 @@
+{
+   "count":1,
+   "value":[
+      {
+         "id":2124,
+         "name":"PackageArtifacts",
+         "source":"testSource",
+         "resource":{
+            "type":"Container",
+            "data":"#/1234/PackageArtifacts",
+            "properties":{
+               "localpath":"D:\\workspace\\_work\\1\\s\\artifacts\\output\\packages",
+               "artifactsize":"7644905"
+            },
+            "url":"https://dev.azure.com/dnceng/url",
+            "downloadUrl":"https://dev.azure.com/dnceng/_apis/build/builds/buildId/artifacts?artifactName=PackageArtifacts&api-version=6.0&%24format=zip"
+         }
+      },
+      {
+         "id":2123,
+         "name":"BlobArtifacts",
+         "source":"testSource",
+         "resource":{
+            "type":"Container",
+            "data":"#/1/BlobArtifacts",
+            "properties":{
+               "localpath":"D:\\workspace\\_work\\1\\s\\artifacts\\output\\packages",
+               "artifactsize":"7644905"
+            },
+            "url":"https://dev.azure.com/dnceng/_apis/build/builds/buildId/artifacts?artifactName=BlobArtifacts&api-version=6.0",
+            "downloadUrl":"https://dev.azure.com/dnceng/_apis/build/builds/buildId/artifacts?artifactName=PackageArtifacts&api-version=6.0&%24format=zip"
+         }
+      }
+   ]
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj b/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
index a5b108be7f0..0c344554efe 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
@@ -13,14 +13,27 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.Core" Version="$(AzureCoreVersion)" />
     <PackageReference Include="Azure.Storage.Blobs" Version="$(AzureStorageBlobsVersion)" />
+    <PackageReference Include="DotNet.SleetLib" Version="$(DotNetSleetLibVersion)" />
     <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
-    <PackageReference Include="Microsoft.DotNet.Maestro.Client" Version="$(MicrosoftDotNetMaestroClientVersion)" />
+    <PackageReference Include="Microsoft.Data.Services.Client" Version="$(MicrosoftDataServicesClientVersion)" />
+    <PackageReference Include="Microsoft.Data.OData" Version="$(MicrosoftDataODataVersion)" />
+
+    <!-- Maestro.Client stopped supporting .NET 4.7.2 long ago. 
+         This functionality should eventually be moved into an arcade-services package, 
+         but for users consuming other functionality we'll still support 4.7.2 by ifdefing it out. -->
+    <PackageReference Condition="'$(TargetFramework)' != 'net472'" Include="Microsoft.DotNet.Maestro.Client" Version="$(MicrosoftDotNetMaestroClientVersion)" />    
+
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsVersion)" />
-    <PackageReference Include="DotNet.SleetLib" Version="$(DotNetSleetLibVersion)" />
     <PackageReference Include="Microsoft.SymbolUploader" Version="$(MicrosoftSymbolUploaderVersion)" />
+    <!-- Override the vulnerable version brought in by Microsoft.DotNet.Maestro.Client -->
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/AssetPublisherFactory.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AssetPublisherFactory.cs
new file mode 100644
index 00000000000..2af60e1e488
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AssetPublisherFactory.cs
@@ -0,0 +1,37 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#if !NET472_OR_GREATER
+using System;
+using Microsoft.Build.Utilities;
+using Microsoft.DotNet.Build.Tasks.Feed.Model;
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+    public class AssetPublisherFactory
+    {
+        private readonly TaskLoggingHelper _log;
+
+        public AssetPublisherFactory(TaskLoggingHelper log)
+        {
+            _log = log;
+        }
+
+        public virtual IAssetPublisher CreateAssetPublisher(TargetFeedConfig feedConfig, PublishArtifactsInManifestBase task)
+        {
+            switch (feedConfig.Type)
+            {
+                case FeedType.AzDoNugetFeed:
+                    return new AzureDevOpsNugetFeedAssetPublisher(_log, feedConfig.TargetURL, feedConfig.Token, task);
+                case FeedType.AzureStorageFeed:
+                    var action = new BlobFeedAction(feedConfig.TargetURL, feedConfig.Token, _log);
+                    return new AzureStorageFeedAssetPublisher(action.AccountName, action.AccountKey, action.ContainerName, _log);
+                case FeedType.AzureStorageContainer:
+                    return new AzureStorageContainerAssetPublisher(new Uri(feedConfig.TargetURL), _log);
+                default:
+                    throw new NotImplementedException();
+            }
+        }
+    }
+}
+#endif
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureDevOpsArtifactFeed.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureDevOpsArtifactFeed.cs
new file mode 100644
index 00000000000..58efcc50e38
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureDevOpsArtifactFeed.cs
@@ -0,0 +1,69 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+    /// <summary>
+    /// Represents the body of a request sent when creating a new feed.
+    /// </summary>
+    /// <remarks>>
+    /// When creating a new feed, we want to set up permissions based on the org and project.
+    /// Right now, only dnceng's public and internal projects are supported.
+    /// New feeds automatically get the feed administrators and project collection administrators as owners,
+    /// but we want to automatically add some additional permissions so that the build services can push to them,
+    /// and organization users can read from them.
+    ///
+    /// Note that there are two ways of providing read access to the feed:
+    /// 1. Providing explicit access in the permissions list to the "Project Collection Valid Users"
+    /// 2. Updating the Local feed view to allow 'collection' users access.
+    ///
+    /// The second is probably preferrable from a an AzDO pattern and usage standpoint. BUT the AzDO API has a drawback where
+    /// the create feed operation cannot create the local view with the appropriate access. Instead, it must be updated after the
+    /// feed is created. This would be fine except that updating a feed's permissions requires administrative permissions, while
+    /// creating a feed only requires contributor permissions. This would require passing around a PAT with management permissions,
+    /// instead of just r/w permissions, which is not ideal.
+    /// </remarks>
+    public class AzureDevOpsArtifactFeed
+    {
+        public AzureDevOpsArtifactFeed(string name, string organization, string project)
+        {
+            Name = name;
+            switch (organization)
+            {
+                case "dnceng":
+                    switch (project)
+                    {
+                        case "public":
+                        case "internal":
+                            Permissions = new List<AzureDevOpsFeedPermission>
+                            {
+                                // Project Collection Build Service
+                                new AzureDevOpsFeedPermission("Microsoft.TeamFoundation.ServiceIdentity;116cce53-b859-4624-9a95-934af41eccef:Build:7ea9116e-9fac-403d-b258-b31fcf1bb293", "contributor"),
+                                // internal Build Service
+                                new AzureDevOpsFeedPermission("Microsoft.TeamFoundation.ServiceIdentity;116cce53-b859-4624-9a95-934af41eccef:Build:b55de4ed-4b5a-4215-a8e4-0a0a5f71e7d8", "contributor"),
+                                // Project administrators
+                                new AzureDevOpsFeedPermission("Microsoft.TeamFoundation.Identity;S-1-9-1551374245-1349140002-2196814402-2899064621-3782482097-0-0-0-0-1", "administrator"),
+                                // Project Collection value users (see class comment for info)
+                                new AzureDevOpsFeedPermission("Microsoft.TeamFoundation.Identity;S-1-9-1551374245-3991166389-1514870082-2833517066-1601300440-0-0-0-0-3", "reader"),
+                            };
+                            break;
+                        default:
+                            throw new NotImplementedException($"Project '{project}' within organization '{organization}' contains no feed permissions information.");
+                    }
+                    break;
+                default:
+                    //  Use the default permissions
+                    Permissions = null;
+                    break;
+
+            }
+        }
+
+        public string Name { get; set; }
+
+        public List<AzureDevOpsFeedPermission> Permissions { get; private set; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureDevOpsFeedPermission.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureDevOpsFeedPermission.cs
new file mode 100644
index 00000000000..f081ee5eb8e
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureDevOpsFeedPermission.cs
@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+    public class AzureDevOpsFeedPermission
+    {
+        public AzureDevOpsFeedPermission(string identityDescriptor, string role)
+        {
+            IdentityDescriptor = identityDescriptor;
+            Role = role;
+        }
+
+        public string IdentityDescriptor { get; set; }
+
+        public string Role { get; set; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureDevOpsNugetFeedAssetPublisher.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureDevOpsNugetFeedAssetPublisher.cs
new file mode 100644
index 00000000000..78987038f40
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureDevOpsNugetFeedAssetPublisher.cs
@@ -0,0 +1,102 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using Microsoft.Build.Utilities;
+using Microsoft.DotNet.Build.Tasks.Feed.Model;
+#if !NET472_OR_GREATER
+using Microsoft.DotNet.Maestro.Client.Models;
+using NuGet.Packaging;
+using NuGet.Packaging.Core;
+using Task = System.Threading.Tasks.Task;
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+    public class AzureDevOpsNugetFeedAssetPublisher : IAssetPublisher, IDisposable
+    {
+        private readonly TaskLoggingHelper _log;
+        private readonly string _targetUrl;
+        private readonly string _accessToken;
+        private readonly PublishArtifactsInManifestBase _task;
+        private readonly string _feedAccount;
+        private readonly string _feedVisibility;
+        private readonly string _feedName;
+        private readonly HttpClient _httpClient;
+
+        public AzureDevOpsNugetFeedAssetPublisher(TaskLoggingHelper log, string targetUrl, string accessToken, PublishArtifactsInManifestBase task)
+        {
+            _log = log;
+            _targetUrl = targetUrl;
+            _accessToken = accessToken;
+            _task = task;
+
+            var parsedUri = Regex.Match(_targetUrl, PublishingConstants.AzDoNuGetFeedPattern);
+            if (!parsedUri.Success)
+            {
+                throw new ArgumentException(
+                    $"Azure DevOps NuGetFeed was not in the expected format '{PublishingConstants.AzDoNuGetFeedPattern}'");
+            }
+            _feedAccount = parsedUri.Groups["account"].Value;
+            _feedVisibility = parsedUri.Groups["visibility"].Value;
+            _feedName = parsedUri.Groups["feed"].Value;
+
+            _httpClient = new HttpClient(new HttpClientHandler {CheckCertificateRevocationList = true})
+            {
+                Timeout = GeneralUtils.NugetFeedPublisherHttpClientTimeout,
+                DefaultRequestHeaders =
+                {
+                    Authorization = new AuthenticationHeaderValue(
+                        "Basic",
+                        Convert.ToBase64String(Encoding.ASCII.GetBytes($":{_accessToken}")))
+                },
+            };
+        }
+
+        public void Dispose()
+        {
+            _httpClient?.Dispose();
+        }
+
+        public LocationType LocationType => LocationType.NugetFeed;
+
+        public async Task PublishAssetAsync(string file, string blobPath, PushOptions options, SemaphoreSlim clientThrottle = null)
+        {
+            if (!file.EndsWith(GeneralUtils.PackageSuffix, StringComparison.OrdinalIgnoreCase))
+            {
+                _log.LogWarning(
+                    $"AzDO feed publishing not available for blobs. Blob '{file}' was not published.");
+                return;
+            }
+
+            string id;
+            string version;
+            using (var packageReader = new PackageArchiveReader(file))
+            {
+                PackageIdentity packageIdentity = packageReader.GetIdentity();
+                id = packageIdentity.Id;
+                version = packageIdentity.Version.ToString();
+            }
+
+            try
+            {
+                var config = new TargetFeedConfig(default, _targetUrl, default, default);
+                await _task.PushNugetPackageAsync(config, _httpClient, file, id, version, _feedAccount, _feedVisibility, _feedName);
+            }
+            catch (Exception e)
+            {
+                _log.LogErrorFromException(e);
+            }
+        }
+    }
+}
+#else
+public class AzureDevOpsNugetFeedAssetPublisher : Task
+{
+    public override bool Execute() => throw new NotSupportedException("AzureDevOpsNugetFeedAssetPublisher depends on Maestro.Client, which has discontinued support for desktop frameworks.");
+}
+#endif
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageAssetPublisher.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageAssetPublisher.cs
new file mode 100644
index 00000000000..5fefec303a2
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageAssetPublisher.cs
@@ -0,0 +1,85 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Threading;
+using Azure.Storage.Blobs;
+using Azure.Storage.Blobs.Models;
+using Microsoft.Build.Utilities;
+using Microsoft.DotNet.Build.CloudTestTasks;
+#if !NET472_OR_GREATER
+using Microsoft.DotNet.Maestro.Client.Models;
+#endif
+using Task = System.Threading.Tasks.Task;
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+#if !NET472_OR_GREATER
+    public abstract class AzureStorageAssetPublisher : IAssetPublisher
+    {
+        private readonly TaskLoggingHelper _log;
+
+        protected AzureStorageAssetPublisher(TaskLoggingHelper log)
+        {
+            _log = log;
+        }
+
+        public LocationType LocationType => LocationType.Container;
+
+        public abstract BlobClient CreateBlobClient(string blobPath);
+
+        public async Task PublishAssetAsync(string file, string blobPath, PushOptions options, SemaphoreSlim clientThrottle = null)
+        {
+            using (await SemaphoreLock.LockAsync(clientThrottle))
+            {
+                blobPath = blobPath.Replace("\\", "/");
+                var blobClient = CreateBlobClient(blobPath);
+                if (!options.AllowOverwrite && await blobClient.ExistsAsync())
+                {
+                    if (options.PassIfExistingItemIdentical)
+                    {
+                        if (!await blobClient.IsFileIdenticalToBlobAsync(file))
+                        {
+                            _log.LogError($"Asset '{file}' already exists with different contents at '{blobPath}'");
+                        }
+
+                        return;
+                    }
+
+                    _log.LogError($"Asset '{file}' already exists at '{blobPath}'");
+                    return;
+                }
+
+                _log.LogMessage($"Uploading '{file}' to '{blobPath}'");
+
+                try
+                {
+                    BlobUploadOptions blobUploadOptions = new()
+                    {
+                        HttpHeaders = AzureStorageUtils.GetBlobHeadersByExtension(file)
+                    };
+                    await blobClient.UploadAsync(file, blobUploadOptions);
+                }
+                catch (Exception e)
+                {
+                    _log.LogError($"Unexpected exception publishing file {file} to {blobPath}: {e.Message}");
+                }
+            }
+        }
+    }
+#else
+    public abstract class AzureStorageAssetPublisher : IAssetPublisher
+    {
+        private readonly TaskLoggingHelper _log;
+
+        protected AzureStorageAssetPublisher(TaskLoggingHelper log)
+        {
+            _log = log;
+        }
+
+        public abstract BlobClient CreateBlobClient(string blobPath);
+
+        public Task PublishAssetAsync(string file, string blobPath, PushOptions options, SemaphoreSlim clientThrottle = null) => throw new NotImplementedException();
+    }
+#endif
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageContainerAssetPublisher.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageContainerAssetPublisher.cs
new file mode 100644
index 00000000000..f03080c0fc9
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageContainerAssetPublisher.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Azure.Storage.Blobs;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+    public class AzureStorageContainerAssetPublisher : AzureStorageAssetPublisher
+    {
+        private readonly Uri _containerUri;
+
+        public AzureStorageContainerAssetPublisher(Uri containerUri, TaskLoggingHelper log) : base(log)
+        {
+            _containerUri = containerUri;
+        }
+
+        public override BlobClient CreateBlobClient(string blobPath)
+        {
+            var containerClient = new BlobContainerClient(_containerUri); 
+            return containerClient.GetBlobClient(blobPath);
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageExtensions.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageExtensions.cs
new file mode 100644
index 00000000000..84c2c882454
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageExtensions.cs
@@ -0,0 +1,80 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Storage.Blobs;
+using Azure.Storage.Blobs.Models;
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+    public static class AzureStorageExtensions
+    {
+        public static string CalculateMD5(string filename)
+        {
+            using var md5 = MD5.Create();
+            using var stream = File.OpenRead(filename);
+            byte[] hash = md5.ComputeHash(stream);
+            return Convert.ToBase64String(hash);
+        }
+
+        public static async Task<bool> IsFileIdenticalToBlobAsync(this BlobClient client, string file)
+        {
+            BlobProperties properties = await client.GetPropertiesAsync();
+            if (properties.ContentHash != null)
+            {
+                var localMD5 = CalculateMD5(file);
+                var blobMD5 = Convert.ToBase64String(properties.ContentHash);
+                return blobMD5.Equals(localMD5, StringComparison.OrdinalIgnoreCase);
+            }
+
+            var localFileSize = new FileInfo(file).Length;
+            var blobSize = (await client.GetPropertiesAsync()).Value.ContentLength;
+
+            if (localFileSize != blobSize)
+            {
+                return false;
+            }
+
+            int bytesPerMegabyte = 1 * 1024 * 1024;
+            using Stream localFileStream = File.OpenRead(file);
+            byte[] localBuffer = new byte[bytesPerMegabyte];
+            byte[] remoteBuffer = new byte[bytesPerMegabyte];
+            int localBytesRead = 0;
+
+            do
+            {
+                long start = localFileStream.Position;
+                localBytesRead = await localFileStream.ReadAsync(localBuffer, 0, bytesPerMegabyte);
+                if (localBytesRead == 0)
+                {
+                    // eof == we are done, we have already validated that they are the same size
+                    return true;
+                }
+
+                var range = new HttpRange(start, localBytesRead);
+                BlobDownloadInfo download = await client.DownloadAsync(range).ConfigureAwait(false);
+                if (download.ContentLength != localBytesRead)
+                {
+                    return false;
+                }
+
+                using (var stream = new MemoryStream(remoteBuffer, true))
+                {
+                    await download.Content.CopyToAsync(stream).ConfigureAwait(false);
+                }
+                if (!remoteBuffer.SequenceEqual(localBuffer))
+                {
+                    return false;
+                }
+            }
+            while (localBytesRead > 0);
+
+            return true;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageFeedAssetPublisher.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageFeedAssetPublisher.cs
new file mode 100644
index 00000000000..9cf5f645a54
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/AzureStorageFeedAssetPublisher.cs
@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Azure.Storage;
+using Azure.Storage.Blobs;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+    public class AzureStorageFeedAssetPublisher : AzureStorageAssetPublisher
+    {
+        private readonly string _accountName;
+        private readonly string _accountKey;
+        private readonly string _containerName;
+
+        public AzureStorageFeedAssetPublisher(string accountName, string accountKey, string containerName,
+            TaskLoggingHelper log) : base(log)
+        {
+            _accountName = accountName;
+            _accountKey = accountKey;
+            _containerName = containerName;
+        }
+
+        public override BlobClient CreateBlobClient(string blobPath)
+        {
+            var cred = new StorageSharedKeyCredential(_accountName, _accountKey);
+            var endpoint = new Uri($"https://{_accountName}.blob.core.windows.net");
+            var service = new BlobServiceClient(endpoint, cred);
+            var container = service.GetBlobContainerClient(_containerName);
+            return container.GetBlobClient(blobPath);
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/BlobFeedAction.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/BlobFeedAction.cs
index 77d64e62215..c90253e0cfe 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/BlobFeedAction.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/BlobFeedAction.cs
@@ -1,23 +1,21 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Build.Framework;
 using Microsoft.DotNet.Build.CloudTestTasks;
 using Microsoft.WindowsAzure.Storage;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
-using NuGet.Packaging;
 using NuGet.Packaging.Core;
 using Sleet;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
 using MSBuild = Microsoft.Build.Utilities;
 
 namespace Microsoft.DotNet.Build.Tasks.Feed
@@ -32,10 +30,10 @@ sealed class BlobFeedAction
         private SleetSource source;
         private bool hasToken = false;
 
-        private string AccountName { get; set; }
-        public string AccountKey { get; set; }
-        private string ContainerName { get; set; }
-        public string RelativePath { get; set; }
+        public string AccountName { get; }
+        public string AccountKey { get; }
+        public string ContainerName { get; }
+        public string RelativePath { get; }
 
         public BlobFeedAction(string expectedFeedUrl, string accountKey, MSBuild.TaskLoggingHelper Log)
         {
@@ -124,17 +122,15 @@ public async Task<bool> PushItemsToFeedAsync(
             return !Log.HasLoggedErrors;
         }
 
-        public async Task PublishToFlatContainerAsync(IEnumerable<ITaskItem> taskItems, int maxClients, PushOptions pushOptions)
+        public async Task PublishToFlatContainerAsync(IEnumerable<ITaskItem> taskItems, int maxClients,
+            PushOptions pushOptions)
         {
             if (taskItems.Any())
             {
                 using (var clientThrottle = new SemaphoreSlim(maxClients, maxClients))
                 {
                     await System.Threading.Tasks.Task.WhenAll(taskItems.Select(
-                        item =>
-                        {
-                            return UploadAssetAsync(item, clientThrottle, pushOptions);
-                        }
+                        item => { return UploadAssetAsync(item, pushOptions, clientThrottle); }
                     ));
                 }
             }
@@ -142,8 +138,8 @@ await System.Threading.Tasks.Task.WhenAll(taskItems.Select(
 
         public async Task UploadAssetAsync(
             ITaskItem item,
-            SemaphoreSlim clientThrottle,
-            PushOptions options)
+            PushOptions options,
+            SemaphoreSlim clientThrottle = null)
         {
             string relativeBlobPath = item.GetMetadata("RelativeBlobPath");
 
@@ -154,58 +150,72 @@ public async Task UploadAssetAsync(
                 relativeBlobPath = $"{recursiveDir}{fileName}";
             }
 
-            relativeBlobPath = $"{RelativePath}{relativeBlobPath}".Replace("\\", "/");
-
-            if (relativeBlobPath.Contains("//"))
+            if (!string.IsNullOrEmpty(relativeBlobPath))
             {
-                Log.LogError(
-                    $"Item '{item.ItemSpec}' RelativeBlobPath contains virtual directory " +
-                    $"without name (double forward slash): '{relativeBlobPath}'");
-                return;
-            }
+                relativeBlobPath = $"{RelativePath}{relativeBlobPath}".Replace("\\", "/");
 
-            Log.LogMessage($"Uploading {relativeBlobPath}");
+                if (relativeBlobPath.StartsWith("//"))
+                {
+                    Log.LogError(
+                        $"Item '{item.ItemSpec}' RelativeBlobPath contains virtual directory " +
+                        $"without name (double forward slash): '{relativeBlobPath}'");
+                    return;
+                }
 
-            await clientThrottle.WaitAsync();
+                Log.LogMessage($"Uploading {relativeBlobPath}");
 
-            try
-            {
-                AzureStorageUtils blobUtils = new AzureStorageUtils(AccountName, AccountKey, ContainerName);
+                if (clientThrottle != null)
+                {
+                    await clientThrottle.WaitAsync();
+                }
 
-                if (!options.AllowOverwrite && await blobUtils.CheckIfBlobExistsAsync(relativeBlobPath))
+                try
                 {
-                    if (options.PassIfExistingItemIdentical)
+                    AzureStorageUtils blobUtils = new AzureStorageUtils(AccountName, AccountKey, ContainerName);
+
+                    if (!options.AllowOverwrite && await blobUtils.CheckIfBlobExistsAsync(relativeBlobPath))
                     {
-                        if (!await blobUtils.IsFileIdenticalToBlobAsync(item.ItemSpec, relativeBlobPath))
+                        if (options.PassIfExistingItemIdentical)
                         {
-                            Log.LogError(
-                                $"Item '{item}' already exists with different contents " +
-                                $"at '{relativeBlobPath}'");
+                            if (!await blobUtils.IsFileIdenticalToBlobAsync(item.ItemSpec, relativeBlobPath))
+                            {
+                                Log.LogError(
+                                    $"Item '{item}' already exists with different contents " +
+                                    $"at '{relativeBlobPath}'");
+                            }
+                        }
+                        else
+                        {
+                            Log.LogError($"Item '{item}' already exists at '{relativeBlobPath}'");
                         }
                     }
                     else
                     {
-                        Log.LogError($"Item '{item}' already exists at '{relativeBlobPath}'");
+                        using (FileStream stream =
+                            new FileStream(item.ItemSpec, FileMode.Open, FileAccess.Read, FileShare.Read))
+                        {
+                            Log.LogMessage($"Uploading {item} to {relativeBlobPath}.");
+                            await blobUtils.UploadBlockBlobAsync(item.ItemSpec, relativeBlobPath, stream);
+                        }
                     }
                 }
-                else
+                catch (Exception exc)
                 {
-                    using (FileStream stream =
-                        new FileStream(item.ItemSpec, FileMode.Open, FileAccess.Read, FileShare.Read))
+                    Log.LogError(
+                        $"Unable to upload to {relativeBlobPath} in Azure Storage account {AccountName}/{ContainerName} due to {exc}.");
+                    throw;
+                }
+                finally
+                {
+                    if (clientThrottle != null)
                     {
-                        Log.LogMessage($"Uploading {item} to {relativeBlobPath}.");
-                        await blobUtils.UploadBlockBlobAsync(item.ItemSpec, relativeBlobPath, stream);
+                        clientThrottle.Release();
                     }
                 }
             }
-            catch (Exception exc)
-            {
-                Log.LogError($"Unable to upload to {relativeBlobPath} in Azure Storage account {AccountName}/{ContainerName} due to {exc}.");
-                throw;
-            }
-            finally
+            else
             {
-                clientThrottle.Release();
+                Log.LogError($"Relative blob path is empty.");
             }
         }
 
@@ -332,7 +342,7 @@ private ISleetFileSystem GetAzureFileSystem(LocalCache fileCache)
             }
         }
 
-        private async Task<bool> PushAsync(IEnumerable<string> items, PushOptions options)
+        public async Task<bool> PushAsync(IEnumerable<string> items, PushOptions options)
         {
             LocalSettings settings = GetSettings();
             SleetLogger log = new SleetLogger(Log, NuGet.Common.LogLevel.Verbose);
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/BuildModelFactory.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/BuildModelFactory.cs
index c8317f7e147..e72224383c5 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/BuildModelFactory.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/BuildModelFactory.cs
@@ -8,6 +8,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
 using System.Xml.Linq;
 
 namespace Microsoft.DotNet.Build.Tasks.Feed
@@ -71,6 +73,11 @@ public BuildModelFactory(
 
         private const string AssetsVirtualDir = "assets/";
 
+        private static readonly string AzureDevOpsHostPattern = @"dev\.azure\.com\";
+
+        private readonly Regex LegacyRepositoryUriPattern = new Regex(
+            @"^https://(?<account>[a-zA-Z0-9]+)\.visualstudio\.com/");
+
         /// <summary>
         /// Create a build manifest for packages, blobs, and associated signing information
         /// </summary>
@@ -149,8 +156,7 @@ public BuildModel CreateModelFromItems(
                     continue;
                 }
 
-                var isSymbolsPackage = artifact.ItemSpec.EndsWith(".symbols.nupkg", StringComparison.OrdinalIgnoreCase)
-                    || artifact.ItemSpec.EndsWith(".snupkg", StringComparison.OrdinalIgnoreCase);
+                var isSymbolsPackage = GeneralUtils.IsSymbolPackage(artifact.ItemSpec);
 
                 if (artifact.ItemSpec.EndsWith(".nupkg", StringComparison.OrdinalIgnoreCase) && !isSymbolsPackage)
                 {
@@ -205,6 +211,9 @@ private BuildModel CreateModel(
             {
                 _log.LogError("Missing 'location' property from ManifestBuildData");
             }
+
+            NormalizeUrisInBuildData(attributes);
+
             BuildModel buildModel = new BuildModel(
                     new BuildIdentity
                     {
@@ -242,5 +251,43 @@ private bool ManifestBuildDataHasLocationInformation(IDictionary<string, string>
         {
             return attributes.ContainsKey("Location") || attributes.ContainsKey("InitialAssetsLocation");
         }
+
+        private void NormalizeUrisInBuildData(IDictionary<string, string> attributes)
+        {
+            foreach(var attribute in attributes.ToList())
+            {
+                attributes[attribute.Key] = NormalizeAzureDevOpsUrl(attribute.Value);
+            }
+        }
+
+        /// <summary>
+        // If repoUri includes the user in the account we remove it from URIs like
+        // https://dnceng@dev.azure.com/dnceng/internal/_git/repo
+        // If the URL host is of the form "dnceng.visualstudio.com" like
+        // https://dnceng.visualstudio.com/internal/_git/repo we replace it to "dev.azure.com/dnceng"
+        // for consistency
+        /// </summary>
+        /// <param name="repoUri">The original url</param>
+        /// <returns>Transformed url</returns>
+        private string NormalizeAzureDevOpsUrl(string repoUri)
+        {
+            if (Uri.TryCreate(repoUri, UriKind.Absolute, out Uri parsedUri))
+            {
+                if (!string.IsNullOrEmpty(parsedUri.UserInfo))
+                {
+                    repoUri = repoUri.Replace($"{parsedUri.UserInfo}@", string.Empty);
+                }
+
+                Match m = LegacyRepositoryUriPattern.Match(repoUri);
+
+                if (m.Success)
+                {
+                    string replacementUri = $"{Regex.Unescape(AzureDevOpsHostPattern)}/{m.Groups["account"].Value}";
+                    repoUri = repoUri.Replace(parsedUri.Host, replacementUri);
+                }
+            }
+
+            return repoUri;
+        }
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/ConfigureInputFeed.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/ConfigureInputFeed.cs
index fc3817a1235..4ccefc8586c 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/ConfigureInputFeed.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/ConfigureInputFeed.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.DotNet.Build.Tasks.Feed
 {
-    public class ConfigureInputFeed : Task
+    public class ConfigureInputFeed : Microsoft.Build.Utilities.Task
     {
         [Required]
         public ITaskItem[] EnableFeeds { get; set; }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/CreateAzureDevOpsFeed.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/CreateAzureDevOpsFeed.cs
index 2a808d1ce72..3c53d6da07f 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/CreateAzureDevOpsFeed.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/CreateAzureDevOpsFeed.cs
@@ -23,8 +23,24 @@ public class CreateAzureDevOpsFeed : MSBuild.Task
         [Output]
         public string TargetFeedName { get; set; }
 
+        /// <summary>
+        /// Organization that the feed should be created in
+        /// </summary>
+        [Required]
+        public string AzureDevOpsOrg { get; set; }
+
+        /// <summary>
+        /// Project that that feed should be created in. The public/internal visibility
+        /// of this project will determine whether the feed is public.
+        /// </summary>
+        [Required]
+        public string AzureDevOpsProject { get; set; }
+
+        /// <summary>
+        /// Personal access token used to authorize to the API and create the feed
+        /// </summary>
         [Required]
-        public bool IsInternal { get; set; }
+        public string AzureDevOpsPersonalAccessToken { get; set; }
 
         public string RepositoryName { get; set; }
 
@@ -40,14 +56,9 @@ public class CreateAzureDevOpsFeed : MSBuild.Task
         /// </summary>
         public string ContentIdentifier { get; set; }
 
-        [Required]
-        public string AzureDevOpsPersonalAccessToken { get; set; }
-
-        public string AzureDevOpsFeedsApiVersion { get; set; } = "5.0-preview.1";
+        public string AzureDevOpsFeedsApiVersion { get; set; } = "5.1-preview.1";
 
-        public static string AzureDevOpsOrg { get; set; } = "dnceng";
-
-        private readonly string AzureDevOpsFeedsBaseUrl = $"https://feeds.dev.azure.com/{AzureDevOpsOrg}/";
+        public string LocalViewVisibility { get; set; } = "collection";
 
         /// <summary>
         /// Number of characters from the commit SHA prefix that should be included in the feed name.
@@ -88,16 +99,18 @@ private async Task<bool> ExecuteAsync()
                 // or contain any of these: @ ~ ; { } ' + = , < > | / \ ? : & $ * " # [ ] %
                 string feedCompatibleRepositoryName = RepositoryName?.Replace('/', '-');
 
-                string accessType = IsInternal ? "internal" : "public";
-                string publicSegment = IsInternal ? string.Empty : "public/";
-                string accessId = IsInternal ? "int" : "pub";
+                // For clarity, and compatibility with existing infrastructure, we include the feed visibility tag.
+                // This serves two purposes:
+                // 1. In nuget.config files (and elsewhere), the name at a glance can identify its visibility
+                // 2. Existing automation has knowledge of "darc-int" and "darc-pub" for purposes of injecting authentication for internal builds
+                //    and managing the isolated feeds within the NuGet.config files.
                 string extraContentInfo = !string.IsNullOrEmpty(ContentIdentifier) ? $"-{ContentIdentifier}" : "";
-                string baseFeedName = FeedName ?? $"darc-{accessId}{extraContentInfo}-{feedCompatibleRepositoryName}-{CommitSha.Substring(0, ShaUsableLength)}";
+                string baseFeedName = FeedName ?? $"darc-{GetFeedVisibilityTag(AzureDevOpsOrg, AzureDevOpsProject)}{extraContentInfo}-{feedCompatibleRepositoryName}-{CommitSha.Substring(0, ShaUsableLength)}";
                 string versionedFeedName = baseFeedName;
                 bool needsUniqueName = false;
                 int subVersion = 0;
 
-                Log.LogMessage(MessageImportance.High, $"Creating the new {accessType} Azure DevOps artifacts feed '{baseFeedName}'...");
+                Log.LogMessage(MessageImportance.High, $"Creating the new Azure DevOps artifacts feed '{baseFeedName}'...");
 
                 if (baseFeedName.Length > MaxLengthForAzDoFeedNames)
                 {
@@ -105,11 +118,12 @@ private async Task<bool> ExecuteAsync()
                     return false;
                 }
 
+                string azureDevOpsFeedsBaseUrl = $"https://feeds.dev.azure.com/{AzureDevOpsOrg}/";
                 do
                 {
                     using (HttpClient client = new HttpClient(new HttpClientHandler { CheckCertificateRevocationList = true })
                     {
-                        BaseAddress = new Uri(AzureDevOpsFeedsBaseUrl)
+                        BaseAddress = new Uri(azureDevOpsFeedsBaseUrl)
                     })
                     {
                         client.DefaultRequestHeaders.Add(
@@ -119,21 +133,24 @@ private async Task<bool> ExecuteAsync()
                             "Basic",
                             Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Format("{0}:{1}", "", AzureDevOpsPersonalAccessToken))));
 
-                        AzureDevOpsArtifactFeed newFeed = new AzureDevOpsArtifactFeed(versionedFeedName);
-
-                        string body = JsonConvert.SerializeObject(newFeed, _serializerSettings);
+                        AzureDevOpsArtifactFeed newFeed = new AzureDevOpsArtifactFeed(versionedFeedName, AzureDevOpsOrg, AzureDevOpsProject);
 
-                        HttpRequestMessage postMessage = new HttpRequestMessage(HttpMethod.Post, $"{publicSegment}_apis/packaging/feeds");
-                        postMessage.Content = new StringContent(body, Encoding.UTF8, "application/json");
+                        string createBody = JsonConvert.SerializeObject(newFeed, _serializerSettings);
 
-                        HttpResponseMessage response = await client.SendAsync(postMessage);
+                        using HttpRequestMessage createFeedMessage = new HttpRequestMessage(HttpMethod.Post, $"{AzureDevOpsProject}/_apis/packaging/feeds");
+                        createFeedMessage.Content = new StringContent(createBody, Encoding.UTF8, "application/json");
+                        using HttpResponseMessage createFeedResponse = await client.SendAsync(createFeedMessage);
 
-                        if (response.StatusCode == HttpStatusCode.Created)
+                        if (createFeedResponse.StatusCode == HttpStatusCode.Created)
                         {
                             needsUniqueName = false;
                             baseFeedName = versionedFeedName;
+
+                            /// This is where we would potentially update the Local feed view with permissions to the organization's
+                            /// valid users. But, see <seealso cref="AzureDevOpsArtifactFeed"/> for more info on why this is not
+                            /// done this way.
                         }
-                        else if (response.StatusCode == HttpStatusCode.Conflict)
+                        else if (createFeedResponse.StatusCode == HttpStatusCode.Conflict)
                         {
                             versionedFeedName = $"{baseFeedName}-{++subVersion}";
                             needsUniqueName = true;
@@ -146,12 +163,12 @@ private async Task<bool> ExecuteAsync()
                         }
                         else
                         {
-                            throw new Exception($"Feed '{baseFeedName}' was not created. Request failed with status code {response.StatusCode}. Exception: {await response.Content.ReadAsStringAsync()}");
+                            throw new Exception($"Feed '{baseFeedName}' was not created. Request failed with status code {createFeedResponse.StatusCode}. Exception: {await createFeedResponse.Content.ReadAsStringAsync()}");
                         }
                     }
                 } while (needsUniqueName);
 
-                TargetFeedURL = $"https://pkgs.dev.azure.com/{AzureDevOpsOrg}/{publicSegment}_packaging/{baseFeedName}/nuget/v3/index.json";
+                TargetFeedURL = $"https://pkgs.dev.azure.com/{AzureDevOpsOrg}/{AzureDevOpsProject}/_packaging/{baseFeedName}/nuget/v3/index.json";
                 TargetFeedName = baseFeedName;
 
                 Log.LogMessage(MessageImportance.High, $"Feed '{TargetFeedURL}' created successfully!");
@@ -163,37 +180,31 @@ private async Task<bool> ExecuteAsync()
 
             return !Log.HasLoggedErrors;
         }
-    }
 
-    public class Permission
-    {
-        public Permission(string identityDescriptor, int role)
-        {
-            IdentityDescriptor = identityDescriptor;
-            Role = role;
-        }
-
-        public string IdentityDescriptor { get; set; }
-
-        public int Role { get; set; }
-    }
-
-    public class AzureDevOpsArtifactFeed
-    {
-        public AzureDevOpsArtifactFeed(string name)
+        /// <summary>
+        /// Returns a tag for feed visibility that will be added to the feed name
+        /// </summary>
+        /// <param name="organization">Organization containing the feed</param>
+        /// <param name="project">Project within <paramref name="organization"/> containing the feed</param>
+        /// <returns>Feed tag</returns>
+        /// <exception cref="NotImplementedException"></exception>
+        private string GetFeedVisibilityTag(string organization, string project)
         {
-            Name = name;
+            switch (organization)
+            {
+                case "dnceng":
+                    switch (project)
+                    {
+                        case "internal":
+                            return "int";
+                        case "public":
+                            return "pub";
+                        default:
+                            throw new NotImplementedException($"Project '{project}' within organization '{organization}' has no visibility mapping.");
+                    }
+                default:
+                    return project.Substring(0, Math.Min(3, project.Length));
+            }
         }
-
-        public string Name { get; set; }
-
-        public readonly List<Permission> Permissions = new List<Permission>
-        {
-            // Mimic the permissions added to a feed when created in the browser
-            new Permission("Microsoft.TeamFoundation.ServiceIdentity;116cce53-b859-4624-9a95-934af41eccef:Build:b55de4ed-4b5a-4215-a8e4-0a0a5f71e7d8", 3),                      // Project Collection Build Service
-            new Permission("Microsoft.TeamFoundation.ServiceIdentity;116cce53-b859-4624-9a95-934af41eccef:Build:7ea9116e-9fac-403d-b258-b31fcf1bb293", 3),                      // internal Build Service
-            new Permission("Microsoft.TeamFoundation.Identity;S-1-9-1551374245-1349140002-2196814402-2899064621-3782482097-0-0-0-0-1", 4),                                      // Feed administrators
-            new Permission("Microsoft.TeamFoundation.Identity;S-1-9-1551374245-1846651262-2896117056-2992157471-3474698899-1-2052915359-1158038602-2757432096-2854636005", 4)   // Feed administrators and contributors
-        };
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/IAssetPublisher.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/IAssetPublisher.cs
new file mode 100644
index 00000000000..8d9446e90dc
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/IAssetPublisher.cs
@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading;
+#if !NET472_OR_GREATER
+using Microsoft.DotNet.Maestro.Client.Models;
+#endif
+using Task = System.Threading.Tasks.Task;
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+    public interface IAssetPublisher
+    {
+#if !NET472_OR_GREATER
+        LocationType LocationType { get; }
+#endif
+
+        Task PublishAssetAsync(string file, string blobPath, PushOptions options, SemaphoreSlim clientThrottle = null);
+    }
+}
+
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/LaunchDebugger.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/LaunchDebugger.cs
index a85b837ff22..86eba95f8e1 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/LaunchDebugger.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/LaunchDebugger.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.DotNet.Build.Tasks.Feed
 {
-    public class LaunchDebugger : Task
+    public class LaunchDebugger : Microsoft.Build.Utilities.Task
     {
         public override bool Execute()
         {
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifest.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifest.cs
index fef9005240e..a174c7c6b0b 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifest.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifest.cs
@@ -4,6 +4,7 @@
 using Microsoft.Arcade.Common;
 using Microsoft.Build.Framework;
 using Microsoft.DotNet.Build.Tasks.Feed.Model;
+#if !NET472_OR_GREATER
 using Microsoft.DotNet.Maestro.Client;
 using Microsoft.DotNet.VersionTools.Automation;
 using Microsoft.DotNet.VersionTools.BuildManifest.Model;
@@ -11,7 +12,9 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
+using Task = System.Threading.Tasks.Task;
 
 namespace Microsoft.DotNet.Build.Tasks.Feed
 {
@@ -46,7 +49,7 @@ public class PublishArtifactsInManifest : MSBuildTaskBase
         ///                                     If false, an error is thrown if an asset already exists
         ///                                     If not provided then defaults to false.
         ///                                     Azure DevOps feeds can never be overwritten.
-        /// Metadata LatestLinkShortUrlPrefix (optional): If provided, AKA ms links are generated (for artifacts blobs only)
+        /// Metadata LatestLinkShortUrlPrefixes (optional): If provided, AKA ms links are generated (for artifacts blobs only)
         ///                                               that target this short url path. The link is construct as such:
         ///                                               aka.ms/AkaShortUrlPath/BlobArtifactPath -> Target blob url
         ///                                               If specified, then AkaMSClientId, AkaMSClientSecret and AkaMSTenant must be provided.
@@ -91,11 +94,6 @@ public class PublishArtifactsInManifest : MSBuildTaskBase
         [Required]
         public string BuildAssetRegistryToken { get; set; }
 
-        /// <summary>
-        /// Maximum number of parallel uploads for the upload tasks
-        /// </summary>
-        public int MaxClients { get; set; } = 16;
-
         /// <summary>
         /// Directory where "nuget.exe" is installed. This will be used to publish packages.
         /// </summary>
@@ -110,29 +108,12 @@ public class PublishArtifactsInManifest : MSBuildTaskBase
 
         public bool PublishInstallersAndChecksums { get; set; } = false;
 
-        public string AzureStorageTargetFeedKey { get; set; }
-
         public bool AllowFeedOverrides { get; set; }
 
-        public string ChecksumsFeedOverride { get; set; }
-
-        public string ChecksumsFeedKey { get; set; }
-
-        public string InstallersFeedOverride { get; set; }
-
-        public string InstallersFeedKey { get; set; }
-
-        public string InternalInstallersFeedKey { get; set; }
-
-        public string InternalCheckSumsFeedKey { get; set; }
-
-        public string AzureDevOpsFeedsKey { get; set; }
-
-        public string TransportFeedOverride { get; set; }
-        
-        public string ShippingFeedOverride { get; set; }
+        public ITaskItem[] FeedKeys { get; set; }
+        public ITaskItem[] FeedSasUris { get; set; }
 
-        public string SymbolsFeedOverride { get; set; }
+        public ITaskItem[] FeedOverrides { get; set; }
 
         /// <summary>
         /// Path to dll and pdb files
@@ -183,6 +164,25 @@ public string BuildQuality
             get { return _buildQuality.GetDescription(); }
             set { Enum.TryParse<PublishingConstants.BuildQuality>(value, true, out _buildQuality); }
         }
+        public string AzdoApiToken {get; set;}
+
+        public string ArtifactsBasePath { get; set;}
+
+        public string BuildId { get; set; }
+
+        public string AzureProject { get; set; }
+
+        public string AzureDevOpsOrg { get; set; }
+
+        /// <summary>
+        /// If true, uses Azdo Api to download artifacts and symbols files one file at a time during publishing process.
+        /// If it is set to false, then artifacts and symbols are downloaded in PackageArtifacts and BlobArtifacts directory before publishing. 
+        /// </summary>
+        public bool UseStreamingPublishing { get; set; } = false;
+
+        public int StreamingPublishingMaxClients {get; set;}
+
+        public int NonStreamingPublishingMaxClients {get; set;}
 
         /// <summary>
         /// Just an internal flag to keep track whether we published assets via a V3 manifest or not.
@@ -306,35 +306,15 @@ public PublishArtifactsInManifestBase WhichPublishingTask(string manifestFullPat
 
         internal PublishArtifactsInManifestBase ConstructPublishingV2Task(BuildModel buildModel)
         {
-            return new PublishArtifactsInManifestV2()
-            {
-                BuildEngine = this.BuildEngine,
-                TargetFeedConfig = this.TargetFeedConfig,
-                BuildModel = buildModel,
-                BlobAssetsBasePath = this.BlobAssetsBasePath,
-                PackageAssetsBasePath = this.PackageAssetsBasePath,
-                BARBuildId = this.BARBuildId,
-                MaestroApiEndpoint = this.MaestroApiEndpoint,
-                BuildAssetRegistryToken = this.BuildAssetRegistryToken,
-                MaxClients = this.MaxClients,
-                NugetPath = this.NugetPath,
-                InternalBuild = this.InternalBuild,
-                SkipSafetyChecks = this.SkipSafetyChecks,
-                AkaMSClientId = this.AkaMSClientId,
-                AkaMSClientSecret = this.AkaMSClientSecret,
-                AkaMSCreatedBy = this.AkaMSCreatedBy,
-                AkaMSGroupOwner = this.AkaMSGroupOwner,
-                AkaMsOwners = this.AkaMsOwners,
-                AkaMSTenant = this.AkaMSTenant,
-                BuildQuality = this.BuildQuality
-            };
+            Log.LogError("V2 Publishing is no longer supported.");
+            return null;
         }
 
         internal PublishArtifactsInManifestBase ConstructPublishingV3Task(BuildModel buildModel)
         {
             PublishedV3Manifest = true;
 
-            return new PublishArtifactsInManifestV3()
+            return new PublishArtifactsInManifestV3(new AssetPublisherFactory(Log))
             {
                 BuildEngine = this.BuildEngine,
                 TargetChannels = this.TargetChannels,
@@ -344,7 +324,6 @@ internal PublishArtifactsInManifestBase ConstructPublishingV3Task(BuildModel bui
                 BARBuildId = this.BARBuildId,
                 MaestroApiEndpoint = this.MaestroApiEndpoint,
                 BuildAssetRegistryToken = this.BuildAssetRegistryToken,
-                MaxClients = this.MaxClients,
                 NugetPath = this.NugetPath,
                 InternalBuild = this.InternalBuild,
                 SkipSafetyChecks = this.SkipSafetyChecks,
@@ -355,25 +334,31 @@ internal PublishArtifactsInManifestBase ConstructPublishingV3Task(BuildModel bui
                 AkaMsOwners = this.AkaMsOwners,
                 AkaMSTenant = this.AkaMSTenant,
                 PublishInstallersAndChecksums = this.PublishInstallersAndChecksums,
-                AzureDevOpsFeedsKey = this.AzureDevOpsFeedsKey,
-                InstallersFeedKey = this.InstallersFeedKey,
-                CheckSumsFeedKey = this.ChecksumsFeedKey,
-                InternalCheckSumsFeedKey = this.InternalCheckSumsFeedKey,
-                InternalInstallersFeedKey = this.InternalInstallersFeedKey,
-                AzureStorageTargetFeedKey = this.AzureStorageTargetFeedKey,
+                FeedKeys = this.FeedKeys,
+                FeedSasUris = this.FeedSasUris,
+                FeedOverrides = this.FeedOverrides,
+                AllowFeedOverrides = this.AllowFeedOverrides,
                 PdbArtifactsBasePath = this.PdbArtifactsBasePath,
                 SymWebToken = this.SymWebToken,
                 MsdlToken = this.MsdlToken,
                 SymbolPublishingExclusionsFile = this.SymbolPublishingExclusionsFile,
                 PublishSpecialClrFiles = this.PublishSpecialClrFiles,
                 BuildQuality = this.BuildQuality,
-                AllowFeedOverrides = this.AllowFeedOverrides,
-                InstallersFeedOverride = this.InstallersFeedOverride,
-                ChecksumsFeedOverride = this.ChecksumsFeedOverride,
-                ShippingFeedOverride = this.ShippingFeedOverride,
-                TransportFeedOverride = this.TransportFeedOverride,
-                SymbolsFeedOverride = this.SymbolsFeedOverride
+                ArtifactsBasePath =  this.ArtifactsBasePath,
+                AzdoApiToken = this.AzdoApiToken,
+                BuildId = this.BuildId,
+                AzureProject = this.AzureProject,
+                AzureDevOpsOrg = this.AzureDevOpsOrg,
+                UseStreamingPublishing = this.UseStreamingPublishing,
+                StreamingPublishingMaxClients = this.StreamingPublishingMaxClients,
+                NonStreamingPublishingMaxClients = this.NonStreamingPublishingMaxClients,
             };
         }
     }
 }
+#else
+public class PublishArtifactsInManifest : Microsoft.Build.Utilities.Task
+{
+    public override bool Execute() => throw new System.NotSupportedException("PublishArtifactsInManifest depends on Maestro.Client, which has discontinued support for desktop frameworks.");
+}
+#endif
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs
index 722e9e011f7..e50c114ee6b 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs
@@ -5,20 +5,29 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Net.Sockets;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Arcade.Common;
 using Microsoft.Build.Framework;
 using Microsoft.DotNet.Build.Tasks.Feed.Model;
+#if !NET472_OR_GREATER
 using Microsoft.DotNet.Maestro.Client;
 using Microsoft.DotNet.Maestro.Client.Models;
+#endif
 using Microsoft.DotNet.VersionTools.BuildManifest.Model;
+using Newtonsoft.Json;
+using NuGet.Packaging;
 using NuGet.Packaging.Core;
 using NuGet.Versioning;
 using static Microsoft.DotNet.Build.Tasks.Feed.GeneralUtils;
@@ -26,12 +35,16 @@
 
 namespace Microsoft.DotNet.Build.Tasks.Feed
 {
+
+#if !NET472_OR_GREATER
     /// <summary>
     /// The intended use of this task is to push artifacts described in
     /// a build manifest to a static package feed.
     /// </summary>
     public abstract class PublishArtifactsInManifestBase : Microsoft.Build.Utilities.Task
     {
+        public AssetPublisherFactory AssetPublisherFactory { get; }
+
         /// <summary>
         /// Full path to the folder containing blob assets.
         /// </summary>
@@ -65,9 +78,22 @@ public abstract class PublishArtifactsInManifestBase : Microsoft.Build.Utilities
         public string NugetPath { get; set; }
 
         /// <summary>
-        /// Maximum number of parallel uploads for the upload tasks
+        /// We are setting StreamingPublishingMaxClients=16 and NonStreamingPublishingMaxClients=12 through publish-asset.yml as we were hitting OOM issue 
+        /// https://github.com/dotnet/core-eng/issues/13098 for more details.
+        /// </summary>
+        public int StreamingPublishingMaxClients { get; set; }
+        public int NonStreamingPublishingMaxClients { get; set; }
+
+        /// <summary>
+        /// Maximum number of parallel uploads for the upload tasks.
+        /// For streaming publishing, 20 is used as the most optimal.
+        /// For non-streaming publishing, 16 is used (there are multiple sets of 16-parallel uploads)
+        ///
+        /// NOTE: Due to the desire to run on hosted agents and drastic memory changes in these VMs 
+        /// (see https://github.com/dotnet/core-eng/issues/13098 for details) these numbers are 
+        /// currently reduced below optimal to prevent OOM.
         /// </summary>
-        public int MaxClients { get; set; } = 16;
+        public int MaxClients { get { return UseStreamingPublishing ? StreamingPublishingMaxClients : NonStreamingPublishingMaxClients; } }
 
         /// <summary>
         /// Whether this build is internal or not. If true, extra checks are done to avoid accidental
@@ -103,17 +129,43 @@ public abstract class PublishArtifactsInManifestBase : Microsoft.Build.Utilities
 
         public string BuildQuality { get; set; }
 
-        public readonly Dictionary<TargetFeedContentType, HashSet<TargetFeedConfig>> FeedConfigs = 
+        public string AzdoApiToken { get; set; }
+
+        public string ArtifactsBasePath { get; set; }
+
+        public string AzureDevOpsFeedsApiVersion { get; set; } = "6.0";
+
+        public string AzureApiVersionForFileDownload { get; set; } = "4.1-preview.4";
+
+        public string AzureProject { get; set; }
+
+        public string BuildId { get; set; }
+
+        public string AzureDevOpsOrg { get; set; }
+
+        private readonly string AzureDevOpsBaseUrl = $"https://dev.azure.com";
+
+        /// <summary>
+        /// Instead of relying on pre-downloaded artifacts, 'stream' artifacts in from the input build.
+        /// Artifacts are downloaded one by one from the input build, and then immediately published and deleted.
+        /// This allows for faster publishing by utilizing both upload and download pipes at the same time,
+        /// and reduces maximum disk usage.
+        /// This is not appplicable if the input build does not contain the artifacts for publishing
+        /// (e.g. when publishing post-build signed assets)
+        /// </summary>
+        public bool UseStreamingPublishing { get; set; }
+
+        public readonly Dictionary<TargetFeedContentType, HashSet<TargetFeedConfig>> FeedConfigs =
             new Dictionary<TargetFeedContentType, HashSet<TargetFeedConfig>>();
 
-        private readonly Dictionary<TargetFeedContentType, HashSet<PackageArtifactModel>> PackagesByCategory = 
+        private readonly Dictionary<TargetFeedContentType, HashSet<PackageArtifactModel>> PackagesByCategory =
             new Dictionary<TargetFeedContentType, HashSet<PackageArtifactModel>>();
 
-        private readonly Dictionary<TargetFeedContentType, HashSet<BlobArtifactModel>> BlobsByCategory = 
+        private readonly Dictionary<TargetFeedContentType, HashSet<BlobArtifactModel>> BlobsByCategory =
             new Dictionary<TargetFeedContentType, HashSet<BlobArtifactModel>>();
 
-        private readonly ConcurrentDictionary<(int AssetId, string AssetLocation, AddAssetLocationToAssetAssetLocationType LocationType), ValueTuple> NewAssetLocations =
-            new ConcurrentDictionary<(int AssetId, string AssetLocation, AddAssetLocationToAssetAssetLocationType LocationType), ValueTuple>();
+        private readonly ConcurrentDictionary<(int AssetId, string AssetLocation, LocationType LocationType), ValueTuple> NewAssetLocations =
+            new ConcurrentDictionary<(int AssetId, string AssetLocation, LocationType LocationType), ValueTuple>();
 
         // Matches versions such as 1.0.0.1234
         private static readonly string FourPartVersionPattern = @"\d+\.\d+\.\d+\.\d+";
@@ -126,6 +178,8 @@ public abstract class PublishArtifactsInManifestBase : Microsoft.Build.Utilities
 
         private const int ExpirationInDays = 3650;
 
+        public int TimeoutInMinutes { get; set; } = 5;
+
         protected LatestLinksManager LinkManager { get; set; } = null;
 
         /// <summary>
@@ -138,6 +192,28 @@ public abstract class PublishArtifactsInManifestBase : Microsoft.Build.Utilities
         /// </summary>
         public int RetryDelayMilliseconds { get; set; } = 5000;
 
+        public ExponentialRetry RetryHandler = new ExponentialRetry
+        {
+            MaxAttempts = 5,
+            DelayBase = 2.5 // 2.5 ^ 5 = ~1.5 minutes max wait between retries
+        };
+
+        public enum ArtifactName
+        {
+            [Description("PackageArtifacts")]
+            PackageArtifacts,
+
+            [Description("BlobArtifacts")]
+            BlobArtifacts
+        }
+
+        private int TimeoutInSeconds = 300;
+
+        protected PublishArtifactsInManifestBase(AssetPublisherFactory assetPublisherFactory = null)
+        {
+            AssetPublisherFactory = assetPublisherFactory ?? new AssetPublisherFactory(new MsBuildUtils.TaskLoggingHelper(this));
+        }
+
         public override bool Execute()
         {
             return ExecuteAsync().GetAwaiter().GetResult();
@@ -213,7 +289,7 @@ protected Dictionary<string, HashSet<Asset>> CreateBuildAssetDictionary(Maestro.
         /// <param name="feedConfig">Configuration of where the asset was published.</param>
         /// <param name="assetLocationType">Type of feed location that is being added.</param>
         /// <returns>True if that asset didn't have the informed location recorded already.</returns>
-        private bool TryAddAssetLocation(string assetId, string assetVersion, Dictionary<string, HashSet<Asset>> buildAssets, TargetFeedConfig feedConfig, AddAssetLocationToAssetAssetLocationType assetLocationType)
+        private bool TryAddAssetLocation(string assetId, string assetVersion, Dictionary<string, HashSet<Asset>> buildAssets, TargetFeedConfig feedConfig, LocationType assetLocationType)
         {
             Asset assetRecord = string.IsNullOrEmpty(assetVersion) ?
                 LookupAsset(assetId, buildAssets) :
@@ -226,7 +302,7 @@ private bool TryAddAssetLocation(string assetId, string assetVersion, Dictionary
                 return false;
             }
 
-            return NewAssetLocations.TryAdd((assetRecord.Id, feedConfig.TargetURL, assetLocationType), ValueTuple.Create());
+            return NewAssetLocations.TryAdd((assetRecord.Id, feedConfig.SafeTargetURL, assetLocationType), ValueTuple.Create());
         }
 
         /// <summary>
@@ -246,7 +322,6 @@ protected Task PersistPendingAssetLocationAsync(IMaestroApi client)
         /// <summary>
         /// Protect against accidental publishing of internal assets to non-internal feeds.
         /// </summary>
-        /// <returns></returns>
         protected void CheckForInternalBuildsOnPublicFeeds(TargetFeedConfig feedConfig)
         {
             // If separated out for clarity.
@@ -317,28 +392,277 @@ public void CheckForStableAssetsInNonIsolatedFeeds()
         }
 
         /// <summary>
-        /// Publishes symbol, dll and pdb files to symbol server.
+        /// Publishes files to symbol server(s) one by one using Azure api to download files
+        /// </summary>
+        /// <param name="pdbArtifactsBasePath">Path to dll and pdb files</param>
+        /// <param name="msdlToken">Token to authenticate msdl</param>
+        /// <param name="symWebToken">Token to authenticate symweb</param>
+        /// <param name="symbolPublishingExclusionsFile">Right now we do not add any files to this, so this is going to be null</param>
+        /// <param name="publishSpecialClrFiles">If true, the special coreclr module indexed files like DBI, DAC and SOS are published</param>
+        /// <param name="clientThrottle">To avoid starting too many processes</param>
+        /// <returns>Task</returns>
+        public async Task PublishSymbolsUsingStreamingAsync(
+            string pdbArtifactsBasePath,
+            string msdlToken,
+            string symWebToken,
+            string symbolPublishingExclusionsFile,
+            bool publishSpecialClrFiles,
+            Dictionary<string, HashSet<Asset>> buildAssets,
+            SemaphoreSlim clientThrottle)
+        {
+            Log.LogMessage(MessageImportance.High,
+                $"Performing symbol publishing... \nExpirationInDays : {ExpirationInDays} \nConvertPortablePdbsToWindowsPdb : false \ndryRun: false ");
+            var symbolCategory = TargetFeedContentType.Symbols;
+
+            using HttpClient httpClient = CreateAzdoClient(AzureDevOpsOrg, false, AzureProject);
+            string containerId = await GetContainerIdAsync(httpClient, ArtifactName.BlobArtifacts);
+
+            if (Log.HasLoggedErrors)
+            {
+                return;
+            }
+            HashSet<string> symbolsToPublish = new HashSet<string>();
+
+            //Get all the symbol file names
+            foreach (var asset in buildAssets)
+            {
+                var name = asset.Key;
+                if (GeneralUtils.IsSymbolPackage(name))
+                {
+                    symbolsToPublish.Add(Path.GetFileName(name));
+                }
+            }
+
+            Log.LogMessage(MessageImportance.High, $"Total number of symbol files : {symbolsToPublish.Count}");
+
+            HashSet<TargetFeedConfig> feedConfigsForSymbols = FeedConfigs[symbolCategory];
+            Dictionary<string, string> serversToPublish =
+                GetTargetSymbolServers(feedConfigsForSymbols, msdlToken, symWebToken);
+            HashSet<string> excludeFiles = null;
+
+            if (File.Exists(symbolPublishingExclusionsFile))
+            {
+                Log.LogMessage(MessageImportance.Normal, $"SymbolPublishingExclusionFile exists");
+                string[] files = File.ReadAllLines(symbolPublishingExclusionsFile);
+                excludeFiles = new HashSet<string>();
+
+                foreach (var file in files)
+                {
+                    if (!string.IsNullOrEmpty(file))
+                    {
+                        Log.LogMessage(MessageImportance.Normal, $"Exclude the file {file} from publishing to symbol server");
+                        excludeFiles.Add(file);
+                    }
+                }
+            }
+            else
+            {
+                Log.LogMessage(MessageImportance.Normal, $"SymbolPublishingExclusionFile was not found at ${symbolPublishingExclusionsFile} ");
+            }
+
+            if (symbolsToPublish != null && symbolsToPublish.Any())
+            {
+                using (HttpClient client = CreateAzdoClient(AzureDevOpsOrg, true))
+                {
+                    client.Timeout = TimeSpan.FromSeconds(TimeoutInSeconds);
+                    await Task.WhenAll(symbolsToPublish.Select(async symbol =>
+                    {
+                        try
+                        {
+                            await clientThrottle.WaitAsync();
+                            string temporarySymbolsDirectory = CreateTemporaryDirectory();
+                            string localSymbolPath = Path.Combine(temporarySymbolsDirectory, symbol);
+                            Log.LogMessage(MessageImportance.High, $"Downloading symbol : {symbol} to {localSymbolPath}");
+
+                            Stopwatch gatherDownloadTime = Stopwatch.StartNew();
+                            await DownloadFileAsync(
+                                client,
+                                ArtifactName.BlobArtifacts,
+                                containerId,
+                                symbol,
+                                localSymbolPath);
+
+                            gatherDownloadTime.Stop();
+                            Log.LogMessage(MessageImportance.High, $"Time taken to download file to '{localSymbolPath}' is {gatherDownloadTime.ElapsedMilliseconds / 1000.0} (seconds)");
+                            Log.LogMessage(MessageImportance.High, $"Successfully downloaded symbol : {symbol} to {localSymbolPath}");
+
+                            List<string> symbolFiles = new List<string>();
+                            symbolFiles.Add(localSymbolPath);
+
+                            foreach (var server in serversToPublish)
+                            {
+                                var serverPath = server.Key;
+                                var token = server.Value;
+                                Log.LogMessage(MessageImportance.High, $"Publishing symbol file {symbol} to {serverPath}:");
+                                Stopwatch gatherSymbolPublishingTime = Stopwatch.StartNew();
+
+                                try
+                                {
+                                    // ConvertPortablePdbsToWindowsPdbs is always set to false, 
+                                    // because this is an expensive task so this is done in the staging pipeline post signing.
+                                    await PublishSymbolsHelper.PublishAsync(
+                                        log: Log,
+                                        symbolServerPath: serverPath,
+                                        personalAccessToken: token,
+                                        inputPackages: symbolFiles,
+                                        inputFiles: null,
+                                        packageExcludeFiles: excludeFiles,
+                                        expirationInDays: ExpirationInDays,
+                                        convertPortablePdbsToWindowsPdbs: false,
+                                        publishSpecialClrFiles: publishSpecialClrFiles,
+                                        pdbConversionTreatAsWarning: null,
+                                        treatPdbConversionIssuesAsInfo: false,
+                                        dryRun: false,
+                                        timer: false,
+                                        verboseLogging: true);
+                                }
+                                catch (Exception ex)
+                                {
+                                    Log.LogError(ex.Message);
+                                }
+
+                                gatherSymbolPublishingTime.Stop();
+                                Log.LogMessage(MessageImportance.High,
+                                    $"Symbol publishing for {symbol} took {gatherSymbolPublishingTime.ElapsedMilliseconds / 1000.0} (seconds)");
+                            }
+
+                            DeleteTemporaryDirectory(temporarySymbolsDirectory);
+                        }
+                        finally
+                        {
+                            clientThrottle.Release();
+                        }
+                    }));
+
+                    Log.LogMessage(MessageImportance.High, "Successfully published to symbol servers.");
+                }
+            }
+            else
+            {
+                Log.LogMessage(MessageImportance.High, $"No symbol files to upload.");
+            }
+
+            // publishing pdb artifacts 
+            IEnumerable<string> filesToSymbolServer = null;
+            if (Directory.Exists(pdbArtifactsBasePath))
+            {
+                var pdbEntries = System.IO.Directory.EnumerateFiles(
+                    pdbArtifactsBasePath,
+                    "*.pdb",
+                    System.IO.SearchOption.AllDirectories);
+                var dllEntries = System.IO.Directory.EnumerateFiles(
+                    pdbArtifactsBasePath,
+                    "*.dll",
+                    System.IO.SearchOption.AllDirectories);
+                filesToSymbolServer = pdbEntries.Concat(dllEntries);
+            }
+
+            if (filesToSymbolServer != null && filesToSymbolServer.Any())
+            {
+                foreach (var server in serversToPublish)
+                {
+                    var serverPath = server.Key;
+                    var token = server.Value;
+                    Log.LogMessage(MessageImportance.High, $"Publishing pdbFiles to {serverPath}:");
+
+                    try
+                    {
+                        // ConvertPortablePdbsToWindowsPdbs is always set to false,
+                        // because this is an expensive task so this is done in the staging pipeline post signing.
+                        await PublishSymbolsHelper.PublishAsync(
+                            log: Log,
+                            symbolServerPath: serverPath,
+                            personalAccessToken: token,
+                            inputPackages: null,
+                            inputFiles: filesToSymbolServer,
+                            packageExcludeFiles: excludeFiles,
+                            expirationInDays: ExpirationInDays,
+                            convertPortablePdbsToWindowsPdbs: false,
+                            publishSpecialClrFiles: publishSpecialClrFiles,
+                            pdbConversionTreatAsWarning: null,
+                            treatPdbConversionIssuesAsInfo: false,
+                            dryRun: false,
+                            timer: false,
+                            verboseLogging: true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.LogError(ex.Message);
+                    }
+                }
+
+                Log.LogMessage(MessageImportance.High, $"Successfully published pdb files");
+            }
+
+            else
+            {
+                Log.LogMessage(MessageImportance.Low, $"No pdb files to upload to symbol server.");
+            }
+        }
+
+        /// <summary>
+        /// Decides how to publish the symbol, dll and pdb files
         /// </summary>
         /// <param name="pdbArtifactsBasePath">Path to dll and pdb files</param>
         /// <param name="msdlToken">Token to authenticate msdl</param>
         /// <param name="symWebToken">Token to authenticate symweb</param>
         /// <param name="symbolPublishingExclusionsFile">Right now we do not add any files to this, so this is going to be null</param>
         /// <param name="temporarySymbolsLocation">Path to Symbol.nupkgs</param>
+        /// <param name="clientThrottle">To avoid starting too many processes</param>
         /// <param name="publishSpecialClrFiles">If true, the special coreclr module indexed files like DBI, DAC and SOS are published</param>
-        /// <returns></returns>
-        public async Task HandleSymbolPublishingAsync (
+        public async Task HandleSymbolPublishingAsync(
             string pdbArtifactsBasePath,
-            string msdlToken, 
+            string msdlToken,
             string symWebToken,
             string symbolPublishingExclusionsFile,
-            string temporarySymbolsLocation,
-            bool publishSpecialClrFiles)
+            bool publishSpecialClrFiles,
+            Dictionary<string, HashSet<Asset>> buildAssets,
+            SemaphoreSlim clientThrottle = null,
+            string temporarySymbolsLocation = null)
         {
-            StringBuilder symbolLog = new StringBuilder();
-            symbolLog.AppendLine("Publishing Symbols to Symbol server: ");
+            if (UseStreamingPublishing)
+            {
+                await PublishSymbolsUsingStreamingAsync(
+                    pdbArtifactsBasePath,
+                    msdlToken,
+                    symWebToken,
+                    symbolPublishingExclusionsFile,
+                    publishSpecialClrFiles,
+                    buildAssets,
+                    clientThrottle);
+            }
+            else
+            {
+                await PublishSymbolsfromBlobArtifactsAsync(
+                    pdbArtifactsBasePath,
+                    msdlToken,
+                    symWebToken,
+                    symbolPublishingExclusionsFile,
+                    publishSpecialClrFiles,
+                    temporarySymbolsLocation);
+            }
+        }
 
+        /// <summary>
+        /// Publishes symbol, dll and pdb files to symbol server.
+        /// </summary>
+        /// <param name="pdbArtifactsBasePath">Path to dll and pdb files</param>
+        /// <param name="msdlToken">Token to authenticate msdl</param>
+        /// <param name="symWebToken">Token to authenticate symweb</param>
+        /// <param name="symbolPublishingExclusionsFile">Right now we do not add any files to this, so this is going to be null</param>
+        /// <param name="temporarySymbolsLocation">Path to Symbol.nupkgs</param>
+        /// <param name="publishSpecialClrFiles">If true, the special coreclr module indexed files like DBI, DAC and SOS are published</param>
+        public async Task PublishSymbolsfromBlobArtifactsAsync(
+            string pdbArtifactsBasePath,
+            string msdlToken,
+            string symWebToken,
+            string symbolPublishingExclusionsFile,
+            bool publishSpecialClrFiles,
+            string temporarySymbolsLocation = null)
+        {
             if (Directory.Exists(temporarySymbolsLocation))
             {
+                Log.LogMessage(MessageImportance.High, "Publishing Symbols to Symbol server: ");
                 string[] fileEntries = Directory.GetFiles(temporarySymbolsLocation);
 
                 var category = TargetFeedContentType.Symbols;
@@ -349,43 +673,58 @@ public async Task HandleSymbolPublishingAsync (
                     GetTargetSymbolServers(feedConfigsForSymbols, msdlToken, symWebToken);
 
                 IEnumerable<string> filesToSymbolServer = null;
+
                 if (Directory.Exists(pdbArtifactsBasePath))
                 {
-                    var pdbEntries = System.IO.Directory.EnumerateFiles(pdbArtifactsBasePath, "*.pdb", System.IO.SearchOption.AllDirectories);
-                    var dllEntries = System.IO.Directory.EnumerateFiles(pdbArtifactsBasePath, "*.dll", System.IO.SearchOption.AllDirectories);
+                    var pdbEntries = System.IO.Directory.EnumerateFiles(
+                        pdbArtifactsBasePath,
+                        "*.pdb",
+                        System.IO.SearchOption.AllDirectories);
+                    var dllEntries = System.IO.Directory.EnumerateFiles(
+                        pdbArtifactsBasePath,
+                        "*.dll",
+                        System.IO.SearchOption.AllDirectories);
                     filesToSymbolServer = pdbEntries.Concat(dllEntries);
                 }
 
                 foreach (var server in serversToPublish)
                 {
                     var serverPath = server.Key;
-                    var token = server.Value;
-                    symbolLog.AppendLine($"Publishing symbol packages to {serverPath}:");
-                    symbolLog.AppendLine(
+                    var token = server.Value; ;
+                    Log.LogMessage(MessageImportance.High,
                         $"Performing symbol publishing...\nSymbolServerPath : ${serverPath} \nExpirationInDays : {ExpirationInDays} \nConvertPortablePdbsToWindowsPdb : false \ndryRun: false \nTotal number of symbol files : {fileEntries.Length} ");
-                    await PublishSymbolsHelper.PublishAsync(
-                        Log,
-                        serverPath,
-                        token,
-                        fileEntries,
-                        filesToSymbolServer,
-                        null,
-                        ExpirationInDays,
-                        false,
-                        publishSpecialClrFiles,
-                        null,
-                        false,
-                        false,
-                        true);
-                    symbolLog.AppendLine("Successfully published to Symbol Server.");
-                    symbolLog.AppendLine();
-                    Log.LogMessage(MessageImportance.High, symbolLog.ToString());
-                    symbolLog.Clear();
+
+                    try
+                    {
+                        // ConvertPortablePdbsToWindowsPdbs is always set to false,
+                        // because this is an expensive task so this is done in the staging pipeline post signing.
+                        await PublishSymbolsHelper.PublishAsync(
+                            log: Log,
+                            symbolServerPath: serverPath,
+                            personalAccessToken: token,
+                            inputPackages: fileEntries,
+                            inputFiles: filesToSymbolServer,
+                            packageExcludeFiles: null,
+                            expirationInDays: ExpirationInDays,
+                            convertPortablePdbsToWindowsPdbs: false,
+                            publishSpecialClrFiles: publishSpecialClrFiles,
+                            pdbConversionTreatAsWarning: null,
+                            treatPdbConversionIssuesAsInfo: false,
+                            dryRun: false,
+                            timer: false,
+                            verboseLogging: true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.LogError(ex.Message);
+                    }
+
+                    Log.LogMessage(MessageImportance.High, $"Successfully published to ${serverPath}.");
                 }
             }
             else
             {
-                Log.LogError($"Temporary symbols directory {temporarySymbolsLocation} does not exists.");
+                Log.LogError("Temporary symbols directory does not exists.");
             }
         }
 
@@ -395,8 +734,8 @@ await PublishSymbolsHelper.PublishAsync(
         /// <param name="feedConfigsForSymbols"></param>
         /// <param name="msdlToken"></param>
         /// <param name="symWebToken"></param>
-        /// <returns></returns>
-        public Dictionary<string ,string> GetTargetSymbolServers(HashSet<TargetFeedConfig> feedConfigsForSymbols, string msdlToken, string symWebToken)
+        /// <returns>A map of symbol server path => token to the symbol server</returns>
+        public Dictionary<string, string> GetTargetSymbolServers(HashSet<TargetFeedConfig> feedConfigsForSymbols, string msdlToken, string symWebToken)
         {
             Dictionary<string, string> serversToPublish = new Dictionary<string, string>();
             if (feedConfigsForSymbols.Any(x => (x.SymbolTargetType & SymbolTargetType.Msdl) != SymbolTargetType.None))
@@ -415,8 +754,9 @@ public Dictionary<string ,string> GetTargetSymbolServers(HashSet<TargetFeedConfi
         /// </summary>
         /// <param name="client">Maestro API client</param>
         /// <param name="buildAssets">Assets information about build being published.</param>
+        /// <param name="clientThrottle">To avoid starting too many processes</param>
         /// <returns>Task</returns>
-        protected async Task HandlePackagePublishingAsync(Dictionary<string, HashSet<Asset>> buildAssets)
+        protected async Task HandlePackagePublishingAsync(Dictionary<string, HashSet<Asset>> buildAssets, SemaphoreSlim clientThrottle = null)
         {
             List<Task> publishTasks = new List<Task>();
 
@@ -439,19 +779,26 @@ protected async Task HandlePackagePublishingAsync(Dictionary<string, HashSet<Ass
                             string isolatedString = feedConfig.Isolated ? "Isolated" : "Non-Isolated";
                             string internalString = feedConfig.Internal ? $", Internal" : ", Public";
                             string shippingString = package.NonShipping ? "NonShipping" : "Shipping";
-                            Log.LogMessage(MessageImportance.High, $"Package {package.Id}@{package.Version} ({shippingString}) should go to {feedConfig.TargetURL} ({isolatedString}{internalString})");
+                            Log.LogMessage(MessageImportance.High,
+                                $"Package {package.Id}@{package.Version} ({shippingString}) should go to {feedConfig.TargetURL} ({isolatedString}{internalString})");
                         }
 
                         switch (feedConfig.Type)
                         {
                             case FeedType.AzDoNugetFeed:
-                                publishTasks.Add(PublishPackagesToAzDoNugetFeedAsync(filteredPackages, buildAssets, feedConfig));
+                                publishTasks.Add(
+                                    PublishPackagesToAzDoNugetFeedAsync(
+                                        filteredPackages,
+                                        buildAssets,
+                                        feedConfig,
+                                        clientThrottle));
                                 break;
                             case FeedType.AzureStorageFeed:
-                                publishTasks.Add(PublishPackagesToAzureStorageNugetFeedAsync(filteredPackages, buildAssets, feedConfig));
+                                Log.LogWarning($"Publishing of packages to Azure storage feed is deprecated.");
                                 break;
                             default:
-                                Log.LogError($"Unknown target feed type for category '{category}': '{feedConfig.Type}'.");
+                                Log.LogError(
+                                    $"Unknown target feed type for category '{category}': '{feedConfig.Type}'.");
                                 break;
                         }
                     }
@@ -479,7 +826,172 @@ private HashSet<PackageArtifactModel> FilterPackages(HashSet<PackageArtifactMode
             };
         }
 
-        protected async Task HandleBlobPublishingAsync(Dictionary<string, HashSet<Asset>> buildAssets)
+        /// <summary>
+        /// Creates Azdo client
+        /// </summary>
+        /// <param name="accountName">Name of the org</param>
+        /// <param name="setAutomaticDecompression">If client is used for downloading the artifact then AutomaticDecompression has to be set, else it is not required</param>
+        /// <param name="projectName">Azure devOps project name</param>
+        /// <param name="versionOverride">Default version is 6.0</param>
+        /// <returns>HttpClient</returns>
+        public HttpClient CreateAzdoClient(
+            string accountName,
+            bool setAutomaticDecompression,
+            string projectName = null,
+            string versionOverride = null)
+        {
+            HttpClientHandler handler = new HttpClientHandler { CheckCertificateRevocationList = true };
+            if (setAutomaticDecompression)
+            {
+                handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+            }
+
+            string address = $"https://dev.azure.com/{accountName}/";
+
+            if (!string.IsNullOrEmpty(projectName))
+            {
+                address += $"{projectName}/";
+            }
+
+            var client = new HttpClient(handler)
+            {
+                BaseAddress = new Uri(address)
+            };
+            client.Timeout = TimeSpan.FromSeconds(TimeoutInSeconds);
+            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
+                "Basic",
+                Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Format("{0}:{1}", "",
+                    AzdoApiToken))));
+            client.DefaultRequestHeaders.Add(
+                "Accept",
+                $"application/xml;api-version={versionOverride ?? AzureDevOpsFeedsApiVersion}");
+            return client;
+        }
+
+        /// <summary>
+        /// Gets the container Id, that is going to be used in another API call to download the assets
+        /// ContainerId is the same for PackageArtifacts and BlobArtifacts
+        /// </summary>
+        /// <param name="artifactName">If it is PackageArtifacts or BlobArtifacts</param>
+        /// <returns>ContainerId</returns>
+        public async Task<string> GetContainerIdAsync(HttpClient client, ArtifactName artifactName)
+        {
+            string uri =
+                 $"{AzureDevOpsBaseUrl}/{AzureDevOpsOrg}/{AzureProject}/_apis/build/builds/{BuildId}/artifacts?api-version={AzureDevOpsFeedsApiVersion}";
+            Exception mostRecentlyCaughtException = null;
+            string containerId = "";
+            bool success = await RetryHandler.RunAsync(async attempt =>
+            {
+                try
+                {
+                    CancellationTokenSource timeoutTokenSource =
+                        new CancellationTokenSource(TimeSpan.FromMinutes(TimeoutInMinutes));
+
+                    using HttpRequestMessage getMessage = new HttpRequestMessage(HttpMethod.Get, uri);
+                    using HttpResponseMessage response = await client.GetAsync(uri, timeoutTokenSource.Token);
+
+                    response.EnsureSuccessStatusCode();
+                    string responseBody = await response.Content.ReadAsStringAsync();
+                    BuildArtifacts buildArtifacts = JsonConvert.DeserializeObject<BuildArtifacts>(responseBody);
+
+                    foreach (var artifact in buildArtifacts.value)
+                    {
+                        ArtifactName name;
+                        if (Enum.TryParse<ArtifactName>(artifact.name, out name) && name == artifactName)
+                        {
+                            string[] segment = artifact.resource.data.Split('/');
+                            containerId = segment[1];
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+                catch (Exception toStore) when (toStore is HttpRequestException || toStore is TaskCanceledException)
+                {
+                    mostRecentlyCaughtException = toStore;
+                    return false;
+                }
+            }).ConfigureAwait(false);
+
+            if (string.IsNullOrEmpty(containerId))
+            {
+                Log.LogError("Container Id does not exists");
+            }
+
+            if (!success)
+            {
+                throw new Exception(
+                    $"Failed to get container id after {RetryHandler.MaxAttempts} attempts.  See inner exception for details, {mostRecentlyCaughtException}");
+            }
+
+            return containerId;
+        }
+
+        /// <summary>
+        /// Download artifact file using Azure API
+        /// </summary>
+        /// <param name="client">Azdo client</param>
+        /// <param name="artifactName">If it is PackageArtifacts or BlobArtifacts</param>
+        /// <param name="containerId">ContainerId where the packageArtifact and BlobArtifacts are stored</param>
+        /// <param name="fileName">Name the file we are trying to download</param>
+        /// <param name="path">Path where the file is being downloaded</param>
+        public async Task DownloadFileAsync(
+            HttpClient client,
+            ArtifactName artifactName,
+            string containerId,
+            string fileName,
+            string path)
+        {
+            string uri =
+                $"{AzureDevOpsBaseUrl}/{AzureDevOpsOrg}/_apis/resources/Containers/{containerId}?itemPath=/{artifactName}/{fileName}&isShallow=true&api-version={AzureApiVersionForFileDownload}";
+            Log.LogMessage(MessageImportance.Low, $"Download file uri = {uri}");
+            Exception mostRecentlyCaughtException = null;
+            bool success = await RetryHandler.RunAsync(async attempt =>
+            {
+                try
+                {
+                    CancellationTokenSource timeoutTokenSource =
+                        new CancellationTokenSource(TimeSpan.FromMinutes(TimeoutInMinutes));
+
+                    using HttpRequestMessage getMessage = new HttpRequestMessage(HttpMethod.Get, uri);
+                    using HttpResponseMessage response = await client.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead, timeoutTokenSource.Token);
+
+                    response.EnsureSuccessStatusCode();
+
+                    using var fs = new FileStream(
+                        path,
+                        FileMode.Create,
+                        FileAccess.ReadWrite,
+                        FileShare.ReadWrite);
+                    using var stream = await response.Content.ReadAsStreamAsync();
+
+                    try
+                    {
+                        await stream.CopyToAsync(fs);
+                    }
+                    finally
+                    {
+                        stream.Close();
+                        fs.Close();
+                    }
+
+                    return true;
+                }
+                catch (Exception toStore)
+                {
+                    mostRecentlyCaughtException = toStore;
+                    return false;
+                }
+            }).ConfigureAwait(false);
+
+            if (!success)
+            {
+                throw new Exception(
+                    $"Failed to download local file '{path}' after {RetryHandler.MaxAttempts} attempts.  See inner exception for details.", mostRecentlyCaughtException);
+            }
+        }
+
+        protected async Task HandleBlobPublishingAsync(Dictionary<string, HashSet<Asset>> buildAssets, SemaphoreSlim clientThrottle = null)
         {
             List<Task> publishTasks = new List<Task>();
 
@@ -500,23 +1012,21 @@ protected async Task HandleBlobPublishingAsync(Dictionary<string, HashSet<Asset>
                         foreach (var blob in filteredBlobs)
                         {
                             string isolatedString = feedConfig.Isolated ? "Isolated" : "Non-Isolated";
-                            string internalString = feedConfig.Internal ? $", Internal" : ", Public";
+                            string internalString = feedConfig.Internal ? ", Internal" : ", Public";
                             string shippingString = blob.NonShipping ? "NonShipping" : "Shipping";
-                            Log.LogMessage(MessageImportance.High, $"Blob {blob.Id} ({shippingString}) should go to {feedConfig.TargetURL} ({isolatedString}{internalString})");
+                            Log.LogMessage(MessageImportance.High,
+                                $"Blob {blob.Id} ({shippingString}) should go to {feedConfig.SafeTargetURL} ({isolatedString}{internalString})");
                         }
 
-                        switch (feedConfig.Type)
-                        {
-                            case FeedType.AzDoNugetFeed:
-                                publishTasks.Add(PublishBlobsToAzDoNugetFeedAsync(filteredBlobs, buildAssets, feedConfig));
-                                break;
-                            case FeedType.AzureStorageFeed:
-                                publishTasks.Add(PublishBlobsToAzureStorageNugetFeedAsync(filteredBlobs, buildAssets, feedConfig));
-                                break;
-                            default:
-                                Log.LogError($"Unknown target feed type for category '{category}': '{feedConfig.Type}'.");
-                                break;
-                        }
+                        var assetsToPublish = new HashSet<string>(filteredBlobs.Select(b => b.Id));
+                        var publisher = AssetPublisherFactory.CreateAssetPublisher(feedConfig, this);
+                        publishTasks.Add(
+                            PublishAssetsAsync(
+                                publisher,
+                                assetsToPublish,
+                                buildAssets,
+                                feedConfig,
+                                clientThrottle));
                     }
                 }
                 else
@@ -573,6 +1083,7 @@ public void SplitArtifactsInCategories(BuildModel buildModel)
                     if (!Enum.TryParse(category, ignoreCase: true, out TargetFeedContentType categoryKey))
                     {
                         Log.LogError($"Invalid target feed config category '{category}'.");
+                        continue;
                     }
 
                     if (PackagesByCategory.ContainsKey(categoryKey))
@@ -590,7 +1101,7 @@ public void SplitArtifactsInCategories(BuildModel buildModel)
             {
                 string categories = string.Empty;
 
-                if (!blobAsset.Attributes.TryGetValue("Category", out categories))
+                if (!blobAsset.Attributes.TryGetValue("Category", out categories) || string.Equals(categories, "NONE", StringComparison.OrdinalIgnoreCase))
                 {
                     categories = GeneralUtils.InferCategory(blobAsset.Id, Log);
                 }
@@ -600,6 +1111,7 @@ public void SplitArtifactsInCategories(BuildModel buildModel)
                     if (!Enum.TryParse(category, ignoreCase: true, out TargetFeedContentType categoryKey))
                     {
                         Log.LogError($"Invalid target feed config category '{category}'.");
+                        continue;
                     }
 
                     if (BlobsByCategory.ContainsKey(categoryKey))
@@ -614,7 +1126,7 @@ public void SplitArtifactsInCategories(BuildModel buildModel)
             }
         }
 
-        private async Task PublishPackagesToAzDoNugetFeedAsync(
+        private async Task PublishPackagesFromPackageArtifactsToAzDoNugetFeedAsync(
             HashSet<PackageArtifactModel> packagesToPublish,
             Dictionary<string, HashSet<Asset>> buildAssets,
             TargetFeedConfig feedConfig)
@@ -622,25 +1134,139 @@ private async Task PublishPackagesToAzDoNugetFeedAsync(
             await PushNugetPackagesAsync(packagesToPublish, feedConfig, maxClients: MaxClients,
                 async (feed, httpClient, package, feedAccount, feedVisibility, feedName) =>
                 {
-                    string localPackagePath = Path.Combine(PackageAssetsBasePath, $"{package.Id}.{package.Version}.nupkg");
+                    string localPackagePath =
+                        Path.Combine(PackageAssetsBasePath, $"{package.Id}.{package.Version}.nupkg");
                     if (!File.Exists(localPackagePath))
                     {
                         Log.LogError($"Could not locate '{package.Id}.{package.Version}' at '{localPackagePath}'");
                         return;
                     }
 
-                    TryAddAssetLocation(package.Id, package.Version, buildAssets, feedConfig, AddAssetLocationToAssetAssetLocationType.NugetFeed);
-
-                    await PushNugetPackageAsync(feed, httpClient, localPackagePath, package.Id, package.Version, feedAccount, feedVisibility, feedName);
+                    TryAddAssetLocation(
+                        package.Id,
+                        package.Version,
+                        buildAssets,
+                        feedConfig,
+                        LocationType.NugetFeed);
+
+                    await PushNugetPackageAsync(
+                        feed,
+                        httpClient,
+                        localPackagePath,
+                        package.Id,
+                        package.Version,
+                        feedAccount,
+                        feedVisibility,
+                        feedName);
                 });
         }
 
+        private async Task PublishPackagesUsingStreamingToAzdoNugetAsync(
+            HashSet<PackageArtifactModel> packagesToPublish,
+            Dictionary<string, HashSet<Asset>> buildAssets,
+            TargetFeedConfig feedConfig,
+            SemaphoreSlim clientThrottle)
+        {
+            using HttpClient httpClient = CreateAzdoClient(AzureDevOpsOrg, false, AzureProject);
+            string containerId = await GetContainerIdAsync(httpClient, ArtifactName.PackageArtifacts);
+
+            if (Log.HasLoggedErrors)
+            {
+                return;
+            }
+
+            using HttpClient client = CreateAzdoClient(AzureDevOpsOrg, true);
+
+            await Task.WhenAll(packagesToPublish.Select(async package =>
+            {
+                try
+                {
+                    await clientThrottle.WaitAsync();
+                    var packageFilename = $"{package.Id}.{package.Version}.nupkg";
+                    string temporaryPackageDirectory =
+                        Path.GetFullPath(Path.Combine(ArtifactsBasePath, Guid.NewGuid().ToString()));
+                    EnsureTemporaryDirectoryExists(temporaryPackageDirectory);
+                    string localPackagePath = Path.Combine(temporaryPackageDirectory, packageFilename);
+                    Log.LogMessage(MessageImportance.Low,
+                        $"Downloading package : {packageFilename} to {localPackagePath}");
+
+                    Stopwatch gatherPackageDownloadTime = Stopwatch.StartNew();
+                    await DownloadFileAsync(
+                        client,
+                        ArtifactName.PackageArtifacts,
+                        containerId,
+                        packageFilename,
+                        localPackagePath);
+
+                    if (!File.Exists(localPackagePath))
+                    {
+                        Log.LogError(
+                            $"Could not locate '{package.Id}.{package.Version}' at '{localPackagePath}'");
+                        return;
+                    }
+
+                    gatherPackageDownloadTime.Stop();
+                    Log.LogMessage(MessageImportance.Low, $"Time taken to download file to '{localPackagePath}' is {gatherPackageDownloadTime.ElapsedMilliseconds / 1000.0} (seconds)");
+                    Log.LogMessage(MessageImportance.Low,
+                        $"Successfully downloaded package : {packageFilename} to {localPackagePath}");
+
+                    TryAddAssetLocation(
+                        package.Id,
+                        package.Version,
+                        buildAssets,
+                        feedConfig,
+                        LocationType.NugetFeed);
+
+                    using HttpClient httpClient = new HttpClient(new HttpClientHandler
+                    {
+                        CheckCertificateRevocationList = true
+                    });
+
+                    httpClient.Timeout = TimeSpan.FromSeconds(TimeoutInSeconds);
+                    httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
+                        "Basic",
+                        Convert.ToBase64String(
+                            Encoding.ASCII.GetBytes(string.Format("{0}:{1}", "", feedConfig.Token))));
+
+                    Stopwatch gatherPackagePublishingTime = Stopwatch.StartNew();
+                    await PushPackageToNugetFeed(httpClient, feedConfig, localPackagePath, package.Id, package.Version);
+                    gatherPackagePublishingTime.Stop();
+                    Log.LogMessage(MessageImportance.Low, $"Publishing package {localPackagePath} took {gatherPackagePublishingTime.ElapsedMilliseconds / 1000.0} (seconds)");
+
+                    DeleteTemporaryDirectory(localPackagePath);
+                }
+                finally
+                {
+                    clientThrottle.Release();
+                }
+            }));
+        }
+
+        private async Task PublishPackagesToAzDoNugetFeedAsync(
+            HashSet<PackageArtifactModel> packagesToPublish,
+            Dictionary<string, HashSet<Asset>> buildAssets,
+            TargetFeedConfig feedConfig,
+            SemaphoreSlim clientThrottle)
+        {
+            if (UseStreamingPublishing)
+            {
+                await PublishPackagesUsingStreamingToAzdoNugetAsync(packagesToPublish, buildAssets, feedConfig, clientThrottle);
+            }
+            else
+            {
+                await PublishPackagesFromPackageArtifactsToAzDoNugetFeedAsync(packagesToPublish, buildAssets, feedConfig);
+            }
+        }
+
         /// <summary>
         ///     Push nuget packages to the azure devops feed.
         /// </summary>
         /// <param name="packagesToPublish">List of packages to publish</param>
         /// <param name="feedConfig">Information about feed to publish to</param>
-        public async Task PushNugetPackagesAsync<T>(HashSet<T> packagesToPublish, TargetFeedConfig feedConfig, int maxClients,
+        public async Task PushNugetPackagesAsync<T>(
+            HashSet<T> packagesToPublish,
+            TargetFeedConfig feedConfig,
+            int maxClients,
             Func<TargetFeedConfig, HttpClient, T, string, string, string, Task> packagePublishAction)
         {
             if (!packagesToPublish.Any())
@@ -651,36 +1277,44 @@ public async Task PushNugetPackagesAsync<T>(HashSet<T> packagesToPublish, Target
             var parsedUri = Regex.Match(feedConfig.TargetURL, PublishingConstants.AzDoNuGetFeedPattern);
             if (!parsedUri.Success)
             {
-                Log.LogError($"Azure DevOps NuGetFeed was not in the expected format '{PublishingConstants.AzDoNuGetFeedPattern}'");
+                Log.LogError(
+                    $"Azure DevOps NuGetFeed was not in the expected format '{PublishingConstants.AzDoNuGetFeedPattern}'");
                 return;
             }
+
             string feedAccount = parsedUri.Groups["account"].Value;
             string feedVisibility = parsedUri.Groups["visibility"].Value;
             string feedName = parsedUri.Groups["feed"].Value;
 
-            using (var clientThrottle = new SemaphoreSlim(maxClients, maxClients))
+            using var clientThrottle = new SemaphoreSlim(maxClients, maxClients);
+
+            using (HttpClient httpClient = new HttpClient(new HttpClientHandler
+            { CheckCertificateRevocationList = true }))
             {
-                using (HttpClient httpClient = new HttpClient(new HttpClientHandler { CheckCertificateRevocationList = true }))
-                {
-                    httpClient.Timeout = TimeSpan.FromSeconds(180);
-                    httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
-                        "Basic",
-                        Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Format("{0}:{1}", "", feedConfig.Token))));
+                httpClient.Timeout = TimeSpan.FromSeconds(TimeoutInSeconds);
+                httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
+                    "Basic",
+                    Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Format("{0}:{1}", "", feedConfig.Token))));
 
-                    await Task.WhenAll(packagesToPublish.Select(async packageToPublish =>
+                await Task.WhenAll(packagesToPublish.Select(async packageToPublish =>
+                {
+                    try
                     {
-                        try
-                        {
-                            // Wait to avoid starting too many processes.
-                            await clientThrottle.WaitAsync();
-                            await packagePublishAction(feedConfig, httpClient, packageToPublish, feedAccount, feedVisibility, feedName);
-                        }
-                        finally
-                        {
-                            clientThrottle.Release();
-                        }
-                    }));
-                }
+                        // Wait to avoid starting too many processes.
+                        await clientThrottle.WaitAsync();
+                        await packagePublishAction(
+                            feedConfig,
+                            httpClient,
+                            packageToPublish,
+                            feedAccount,
+                            feedVisibility,
+                            feedName);
+                    }
+                    finally
+                    {
+                        clientThrottle.Release();
+                    }
+                }));
             }
         }
 
@@ -735,7 +1369,7 @@ public async Task PushNugetPackageAsync(
 
             try
             {
-                Log.LogMessage(MessageImportance.Normal, $"Pushing local package {localPackageLocation} to target feed {feedConfig.TargetURL}"); 
+                Log.LogMessage(MessageImportance.Normal, $"Pushing local package {localPackageLocation} to target feed {feedConfig.TargetURL}");
                 int attemptIndex = 0;
 
                 do
@@ -759,22 +1393,22 @@ public async Task PushNugetPackageAsync(
                     switch (packageStatus)
                     {
                         case GeneralUtils.PackageFeedStatus.ExistsAndIdenticalToLocal:
-                        {
-                            Log.LogMessage(MessageImportance.Normal, $"Package '{localPackageLocation}' already exists on '{feedConfig.TargetURL}' but has the same content; skipping push");
-                            break;
-                        }
+                            {
+                                Log.LogMessage(MessageImportance.Normal, $"Package '{localPackageLocation}' already exists on '{feedConfig.TargetURL}' but has the same content; skipping push");
+                                break;
+                            }
                         case GeneralUtils.PackageFeedStatus.ExistsAndDifferent:
-                        {
-                            Log.LogError($"Package '{localPackageLocation}' already exists on '{feedConfig.TargetURL}' with different content.");
-                            break;
-                        }
+                            {
+                                Log.LogError($"Package '{localPackageLocation}' already exists on '{feedConfig.TargetURL}' with different content.");
+                                break;
+                            }
                         default:
-                        {
-                            // For either case (unknown exception or 404, we will retry the push and check again.  Linearly increase back-off time on each retry.
-                            Log.LogMessage(MessageImportance.Low, $"Hit error checking package status after failed push: '{packageStatus}'. Will retry after {RetryDelayMilliseconds * attemptIndex} ms.");
-                            await Task.Delay(RetryDelayMilliseconds * attemptIndex).ConfigureAwait(false);
-                            break;
-                        }
+                            {
+                                // For either case (unknown exception or 404, we will retry the push and check again.  Linearly increase back-off time on each retry.
+                                Log.LogMessage(MessageImportance.Low, $"Hit error checking package status after failed push: '{packageStatus}'. Will retry after {RetryDelayMilliseconds * attemptIndex} ms.");
+                                await Task.Delay(RetryDelayMilliseconds * attemptIndex).ConfigureAwait(false);
+                                break;
+                            }
                     }
                 }
                 while (packageStatus != GeneralUtils.PackageFeedStatus.ExistsAndIdenticalToLocal && // Success
@@ -787,7 +1421,7 @@ public async Task PushNugetPackageAsync(
                 }
                 else
                 {
-                    Log.LogMessage(MessageImportance.High, $"Succeeded publishing package '{localPackageLocation}' to feed {feedConfig.TargetURL}");
+                    Log.LogMessage($"Succeeded publishing package '{localPackageLocation}' to feed {feedConfig.TargetURL}");
                 }
             }
             catch (Exception e)
@@ -804,7 +1438,8 @@ public async Task PushNugetPackageAsync(
         private async Task PublishBlobsToAzDoNugetFeedAsync(
             HashSet<BlobArtifactModel> blobsToPublish,
             Dictionary<string, HashSet<Asset>> buildAssets,
-            TargetFeedConfig feedConfig)
+            TargetFeedConfig feedConfig,
+            SemaphoreSlim clientThrottle)
         {
             HashSet<BlobArtifactModel> packagesToPublish = new HashSet<BlobArtifactModel>();
 
@@ -817,14 +1452,38 @@ private async Task PublishBlobsToAzDoNugetFeedAsync(
                 }
                 else
                 {
-                    Log.LogWarning($"AzDO feed publishing not available for blobs. Blob '{blob.Id}' was not published.");
+                    Log.LogWarning(
+                        $"AzDO feed publishing not available for blobs. Blob '{blob.Id}' was not published.");
                 }
             }
 
-            await PushNugetPackagesAsync<BlobArtifactModel>(packagesToPublish, feedConfig, maxClients: MaxClients,
+            if (UseStreamingPublishing)
+            {
+                await PublishBlobsUsingStreamingToAzDoNugetAsync(packagesToPublish, buildAssets, feedConfig, clientThrottle);
+            }
+            else
+            {
+                await PublishBlobsFromBlobArtifactsToAzDoNugetAsync(packagesToPublish, buildAssets, feedConfig);
+            }
+        }
+
+        private async Task PublishBlobsFromBlobArtifactsToAzDoNugetAsync(
+            HashSet<BlobArtifactModel> blobsToPublish,
+            Dictionary<string, HashSet<Asset>> buildAssets,
+            TargetFeedConfig feedConfig)
+        {
+            await PushNugetPackagesAsync<BlobArtifactModel>(
+                blobsToPublish,
+                feedConfig,
+                maxClients: MaxClients,
                 async (feed, httpClient, blob, feedAccount, feedVisibility, feedName) =>
                 {
-                    if (TryAddAssetLocation(blob.Id, assetVersion: null, buildAssets, feedConfig, AddAssetLocationToAssetAssetLocationType.Container))
+                    if (TryAddAssetLocation(
+                        blob.Id,
+                        assetVersion: null,
+                        buildAssets,
+                        feedConfig,
+                        LocationType.Container))
                     {
                         // Determine the local path to the blob
                         string fileName = Path.GetFileName(blob.Id);
@@ -838,72 +1497,282 @@ await PushNugetPackagesAsync<BlobArtifactModel>(packagesToPublish, feedConfig, m
                         string id;
                         string version;
                         // Determine package ID and version by asking the nuget libraries
-                        using (var packageReader = new NuGet.Packaging.PackageArchiveReader(localBlobPath))
+                        using (var packageReader = new PackageArchiveReader(localBlobPath))
                         {
                             PackageIdentity packageIdentity = packageReader.GetIdentity();
                             id = packageIdentity.Id;
                             version = packageIdentity.Version.ToString();
                         }
 
-                        await PushNugetPackageAsync(feed, httpClient, localBlobPath, id, version, feedAccount, feedVisibility, feedName);
+                        await PushNugetPackageAsync(
+                            feed,
+                            httpClient,
+                            localBlobPath,
+                            id,
+                            version,
+                            feedAccount,
+                            feedVisibility,
+                            feedName);
                     }
                 });
         }
 
-        private async Task PublishPackagesToAzureStorageNugetFeedAsync(
-            HashSet<PackageArtifactModel> packagesToPublish,
+        private async Task PublishBlobsUsingStreamingToAzDoNugetAsync(
+            HashSet<BlobArtifactModel> blobsToPublish,
             Dictionary<string, HashSet<Asset>> buildAssets,
-            TargetFeedConfig feedConfig)
+            TargetFeedConfig feedConfig,
+            SemaphoreSlim clientThrottle)
         {
-            var packages = packagesToPublish.Select(p =>
+            using HttpClient httpClient = CreateAzdoClient(AzureDevOpsOrg, false, AzureProject);
+            string containerId = await GetContainerIdAsync(httpClient, ArtifactName.BlobArtifacts);
+
+            if (Log.HasLoggedErrors)
+            {
+                return;
+            }
+            using HttpClient client = CreateAzdoClient(AzureDevOpsOrg, true, AzureProject);
+
+            await Task.WhenAll(blobsToPublish.Select(async blob =>
             {
-                var localPackagePath = Path.Combine(PackageAssetsBasePath, $"{p.Id}.{p.Version}.nupkg");
-                if (!File.Exists(localPackagePath))
+                try
+                {
+                    await clientThrottle.WaitAsync();
+                    if (TryAddAssetLocation(
+                        blob.Id,
+                        assetVersion: null,
+                        buildAssets,
+                        feedConfig,
+                        LocationType.Container))
+                    {
+                        string temporaryBlobDirectory = CreateTemporaryDirectory();
+                        string fileName = Path.GetFileName(blob.Id);
+                        string localBlobPath = Path.Combine(temporaryBlobDirectory, fileName);
+                        Log.LogMessage(MessageImportance.Low, $"Downloading blob : {fileName} to {localBlobPath}");
+
+                        Stopwatch gatherBlobDownloadTime = Stopwatch.StartNew();
+                        await DownloadFileAsync(
+                            client,
+                            ArtifactName.BlobArtifacts,
+                            containerId,
+                            fileName,
+                            localBlobPath);
+
+                        if (!File.Exists(localBlobPath))
+                        {
+                            Log.LogError($"Could not locate '{blob.Id} at '{localBlobPath}'");
+                        }
+                        gatherBlobDownloadTime.Stop();
+                        Log.LogMessage(MessageImportance.Low, $"Time taken to download file to '{localBlobPath}' is {gatherBlobDownloadTime.ElapsedMilliseconds / 1000.0} (seconds)");
+
+                        Log.LogMessage(MessageImportance.Low,
+                            $"Successfully downloaded blob : {fileName} to {localBlobPath}");
+
+                        string id;
+                        string version;
+                        using (var packageReader = new PackageArchiveReader(localBlobPath))
+                        {
+                            PackageIdentity packageIdentity = packageReader.GetIdentity();
+                            id = packageIdentity.Id;
+                            version = packageIdentity.Version.ToString();
+                        }
+
+                        Stopwatch gatherBlobPublishingTime = Stopwatch.StartNew();
+                        await PushBlobToNugetFeed(
+                            feedConfig,
+                            localBlobPath,
+                            id,
+                            version);
+                        gatherBlobPublishingTime.Stop();
+                        Log.LogMessage(MessageImportance.Low, $"Time taken to publish blob {localBlobPath} is {gatherBlobPublishingTime.ElapsedMilliseconds / 1000.0} (seconds)");
+
+                        DeleteTemporaryDirectory(temporaryBlobDirectory);
+                    }
+                }
+                finally
                 {
-                    Log.LogError($"Could not locate '{p.Id}.{p.Version}' at '{localPackagePath}'");
+                    clientThrottle.Release();
                 }
-                return localPackagePath;
-            });
+            }));
+        }
 
-            if (Log.HasLoggedErrors)
+        private async Task PushBlobToNugetFeed(TargetFeedConfig feedConfig, string localBlobPath, string id,
+            string version)
+        {
+            var parsedUri = Regex.Match(feedConfig.TargetURL, PublishingConstants.AzDoNuGetFeedPattern);
+            if (!parsedUri.Success)
             {
+                Log.LogError(
+                    $"Azure DevOps NuGetFeed was not in the expected format '{PublishingConstants.AzDoNuGetFeedPattern}'");
                 return;
             }
+            string feedAccount = parsedUri.Groups["account"].Value;
+            string feedVisibility = parsedUri.Groups["visibility"].Value;
+            string feedName = parsedUri.Groups["feed"].Value;
 
-            var blobFeedAction = CreateBlobFeedAction(feedConfig);
+            using HttpClient httpClient = new HttpClient(new HttpClientHandler
+            { CheckCertificateRevocationList = true });
+            httpClient.Timeout = TimeSpan.FromSeconds(TimeoutInSeconds);
+            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
+                "Basic",
+                Convert.ToBase64String(
+                    Encoding.ASCII.GetBytes(string.Format("{0}:{1}", "",
+                        feedConfig.Token))));
+            try
+            {
+                await PushNugetPackageAsync(
+                    feedConfig,
+                    httpClient,
+                    localBlobPath,
+                    id,
+                    version,
+                    feedAccount,
+                    feedVisibility,
+                    feedName);
+            }
+            catch (Exception e)
+            {
+                Log.LogErrorFromException(e);
+            }
+        }
+
+        /// <summary>
+        /// Creates a temporary directory
+        /// </summary>
+        /// <returns>Path to the directory created</returns>
+        public string CreateTemporaryDirectory()
+        {
+            string temporaryDirectory =
+                Path.GetFullPath(Path.Combine(ArtifactsBasePath, Guid.NewGuid().ToString()));
+            EnsureTemporaryDirectoryExists(temporaryDirectory);
+            return temporaryDirectory;
+        }
 
+        private async Task PublishAssetsAsync(IAssetPublisher assetPublisher, HashSet<string> assetsToPublish,
+            Dictionary<string, HashSet<Asset>> buildAssets,
+            TargetFeedConfig feedConfig,
+            SemaphoreSlim clientThrottle)
+        {
+            if (UseStreamingPublishing)
+            {
+                await PublishAssetsUsingStreamingPublishingAsync(assetPublisher, assetsToPublish, buildAssets, feedConfig, clientThrottle);
+            }
+            else
+            {
+                await PublishAssetsWithoutStreamingPublishingAsync(assetPublisher, assetsToPublish, buildAssets, feedConfig);
+            }
+
+            if (feedConfig.Type == FeedType.AzureStorageContainer ||
+                feedConfig.Type == FeedType.AzureStorageFeed)
+            {
+
+                if (LinkManager == null)
+                {
+                    LinkManager = new LatestLinksManager(
+                        AkaMSClientId,
+                        AkaMSClientSecret,
+                        AkaMSTenant,
+                        AkaMSGroupOwner,
+                        AkaMSCreatedBy,
+                        AkaMsOwners,
+                        Log);
+                }
+
+                // The latest links should be updated only after the publishing is complete, to avoid
+                // dead links in the interim.
+                await LinkManager.CreateOrUpdateLatestLinksAsync(
+                    assetsToPublish,
+                    feedConfig,
+                    feedConfig.Type == FeedType.AzureStorageContainer
+                        ? 0
+                        : PublishingConstants.ExpectedFeedUrlSuffix.Length);
+            }
+        }
+
+        private async Task PublishAssetsUsingStreamingPublishingAsync(
+            IAssetPublisher assetPublisher,
+            HashSet<string> assetsToPublish,
+            Dictionary<string, HashSet<Asset>> buildAssets,
+            TargetFeedConfig feedConfig,
+            SemaphoreSlim clientThrottle)
+        {
+            using HttpClient httpClient = CreateAzdoClient(AzureDevOpsOrg, false, AzureProject);
+            string containerId = await GetContainerIdAsync(httpClient, ArtifactName.BlobArtifacts);
+
+            if (Log.HasLoggedErrors)
+            {
+                return;
+            }
             var pushOptions = new PushOptions
             {
                 AllowOverwrite = feedConfig.AllowOverwrite,
-                PassIfExistingItemIdentical = true
+                PassIfExistingItemIdentical = true,
             };
+            using HttpClient client = CreateAzdoClient(AzureDevOpsOrg, true, AzureProject);
+
+            await Task.WhenAll(assetsToPublish.Select(async asset =>
+            {
+                using (await SemaphoreLock.LockAsync(clientThrottle))
+                {
+                    string temporaryBlobDirectory = CreateTemporaryDirectory();
+                    var fileName = Path.GetFileName(asset);
+                    var localBlobPath = Path.Combine(temporaryBlobDirectory, fileName);
+                    Log.LogMessage(MessageImportance.Low, $"Downloading blob : {fileName} to {localBlobPath}");
+
+                    Stopwatch gatherBlobDownloadTime = Stopwatch.StartNew();
+                    await DownloadFileAsync(
+                        client,
+                        ArtifactName.BlobArtifacts,
+                        containerId,
+                        fileName,
+                        localBlobPath);
+                    gatherBlobDownloadTime.Stop();
+                    Log.LogMessage(MessageImportance.Low, $"Time taken to download file to '{localBlobPath}' is {gatherBlobDownloadTime.ElapsedMilliseconds / 1000.0} (seconds)");
+
+                    if (!File.Exists(localBlobPath))
+                    {
+                        Log.LogError($"Could not locate '{asset} at '{localBlobPath}'");
+                    }
+                    else
+                    {
+                        Log.LogMessage(MessageImportance.Low,
+                            $"Successfully downloaded blob : {fileName} to {localBlobPath}");
+
+                        TryAddAssetLocation(
+                            asset,
+                            assetVersion: null,
+                            buildAssets,
+                            feedConfig,
+                            assetPublisher.LocationType);
+
+                        Stopwatch gatherBlobPublishingTime = Stopwatch.StartNew();
+                        await assetPublisher.PublishAssetAsync(localBlobPath, asset, pushOptions, null);
+                        gatherBlobPublishingTime.Stop();
+                        Log.LogMessage(MessageImportance.Low, $"Publishing {localBlobPath} completed in {gatherBlobPublishingTime.ElapsedMilliseconds / 1000.0} (seconds)");
+                    }
 
-            packagesToPublish
-                .ToList()
-                .ForEach(package => TryAddAssetLocation(package.Id, package.Version, buildAssets, feedConfig, AddAssetLocationToAssetAssetLocationType.NugetFeed));
 
-            await blobFeedAction.PushToFeedAsync(packages, pushOptions);
+                    DeleteTemporaryDirectory(temporaryBlobDirectory);
+                }
+            }));
         }
 
-        private async Task PublishBlobsToAzureStorageNugetFeedAsync(
-            HashSet<BlobArtifactModel> blobsToPublish,
+        private async Task PublishAssetsWithoutStreamingPublishingAsync(
+            IAssetPublisher assetPublisher,
+            HashSet<string> assetsToPublish,
             Dictionary<string, HashSet<Asset>> buildAssets,
             TargetFeedConfig feedConfig)
         {
-            var blobs = blobsToPublish
-                .Select(blob =>
+            var assets = assetsToPublish
+                .Select(asset =>
                 {
-                    var fileName = Path.GetFileName(blob.Id);
+                    var fileName = Path.GetFileName(asset);
                     var localBlobPath = Path.Combine(BlobAssetsBasePath, fileName);
                     if (!File.Exists(localBlobPath))
                     {
-                        Log.LogError($"Could not locate '{blob.Id} at '{localBlobPath}'");
+                        Log.LogError($"Could not locate '{asset} at '{localBlobPath}'");
                     }
 
-                    return new Microsoft.Build.Utilities.TaskItem(localBlobPath, new Dictionary<string, string>
-                    {
-                        {"RelativeBlobPath", blob.Id}
-                    });
+                    return (localBlobPath, id: asset);
                 })
                 .ToArray();
 
@@ -912,27 +1781,25 @@ private async Task PublishBlobsToAzureStorageNugetFeedAsync(
                 return;
             }
 
-            var blobFeedAction = CreateBlobFeedAction(feedConfig);
             var pushOptions = new PushOptions
             {
                 AllowOverwrite = feedConfig.AllowOverwrite,
                 PassIfExistingItemIdentical = true
             };
 
-            blobsToPublish
-                .ToList()
-                .ForEach(blob => TryAddAssetLocation(blob.Id, assetVersion: null, buildAssets, feedConfig, AddAssetLocationToAssetAssetLocationType.Container));
-
-            await blobFeedAction.PublishToFlatContainerAsync(blobs, maxClients: MaxClients, pushOptions);
-
-            if (LinkManager == null)
+            foreach (var asset in assetsToPublish)
             {
-                LinkManager = new LatestLinksManager(AkaMSClientId, AkaMSClientSecret, AkaMSTenant, AkaMSGroupOwner, AkaMSCreatedBy, AkaMsOwners, Log);
+                TryAddAssetLocation(
+                    asset,
+                    assetVersion: null,
+                    buildAssets,
+                    feedConfig,
+                    LocationType.Container);
             }
 
-            // The latest links should be updated only after the publishing is complete, to avoid
-            // dead links in the interim.
-            await LinkManager.CreateOrUpdateLatestLinksAsync(blobsToPublish, feedConfig, PublishingConstants.ExpectedFeedUrlSuffix.Length);
+            using var clientThrottle = new SemaphoreSlim(MaxClients, MaxClients);
+            await Task.WhenAll(assets.Select(asset =>
+                assetPublisher.PublishAssetAsync(asset.localBlobPath, asset.id, pushOptions, clientThrottle)));
         }
 
         private BlobFeedAction CreateBlobFeedAction(TargetFeedConfig feedConfig)
@@ -974,6 +1841,102 @@ private BlobFeedAction CreateBlobFeedAction(TargetFeedConfig feedConfig)
             }
         }
 
+        private async Task PushPackageToNugetFeed(
+            HttpClient httpClient,
+            TargetFeedConfig feedConfig,
+            string localPackagePath,
+            string id,
+            string version)
+        {
+            var parsedUri = Regex.Match(feedConfig.TargetURL, PublishingConstants.AzDoNuGetFeedPattern);
+
+            if (!parsedUri.Success)
+            {
+                Log.LogError(
+                    $"Azure DevOps NuGetFeed was not in the expected format '{PublishingConstants.AzDoNuGetFeedPattern}'");
+                return;
+            }
+
+            string feedAccount = parsedUri.Groups["account"].Value;
+            string feedVisibility = parsedUri.Groups["visibility"].Value;
+            string feedName = parsedUri.Groups["feed"].Value;
+
+            await PushNugetPackageAsync(
+                feedConfig,
+                httpClient,
+                localPackagePath,
+                id,
+                version,
+                feedAccount,
+                feedVisibility,
+                feedName);
+        }
+
+        /// <summary>
+        /// Create Temporary directory if it does not exists.
+        /// </summary>
+        /// <param name="temporaryLocation"></param>
+        public void EnsureTemporaryDirectoryExists(string temporaryLocation)
+        {
+            if (!Directory.Exists(temporaryLocation))
+            {
+                Directory.CreateDirectory(temporaryLocation);
+            }
+        }
+
+        /// <summary>
+        /// Delete the files after publishing, this is part of cleanup
+        /// </summary>
+        /// <param name="temporaryLocation"></param>
+        public void DeleteTemporaryFiles(string temporaryLocation)
+        {
+            try
+            {
+                if (Directory.Exists(temporaryLocation))
+                {
+                    string[] fileEntries = Directory.GetFiles(temporaryLocation);
+                    foreach (var file in fileEntries)
+                    {
+                        File.Delete(file);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.LogWarning(ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// Deletes the temporary folder, this is part of clean up
+        /// </summary>
+        /// <param name="temporaryLocation"></param>
+        public void DeleteTemporaryDirectory(string temporaryLocation)
+        {
+            var attempts = 0;
+            if (Directory.Exists(temporaryLocation))
+            {
+                do
+                {
+                    try
+                    {
+                        attempts++;
+                        Log.LogMessage(MessageImportance.Low, $"Deleting directory : {temporaryLocation}");
+                        Directory.Delete(temporaryLocation, true);
+                        break;
+                    }
+                    catch (Exception ex)
+                    {
+                        if (attempts == MaxRetryCount)
+                            Log.LogMessage(MessageImportance.Low, $"Unable to delete the directory because of {ex.Message} after {attempts} attempts.");
+                    }
+                    Log.LogMessage(MessageImportance.Low, $"Retrying to delete {temporaryLocation}, attempt number {attempts}");
+                    Task.Delay(RetryDelayMilliseconds).Wait();
+                }
+                while (true);
+            }
+        }
+
         protected bool AnyMissingRequiredProperty()
         {
             foreach (PropertyInfo prop in this.GetType().GetProperties())
@@ -1024,7 +1987,46 @@ protected bool AnyMissingRequiredBaseProperties()
                 Log.LogError($"The property {nameof(BuildAssetRegistryToken)} is required but doesn't have a value set.");
             }
 
+            if (UseStreamingPublishing && string.IsNullOrEmpty(AzdoApiToken))
+            {
+                Log.LogError($"The property {nameof(AzdoApiToken)} is required when using streaming publishing, but doesn't have a value set.");
+            }
+
+            if (UseStreamingPublishing && string.IsNullOrEmpty(ArtifactsBasePath))
+            {
+                Log.LogError($"The property {nameof(ArtifactsBasePath)} is required when using streaming publishing, but doesn't have a value set.");
+            }
             return Log.HasLoggedErrors;
         }
     }
 }
+#else
+    public abstract class PublishArtifactsInManifestBase : Microsoft.Build.Utilities.Task
+    {
+        public override bool Execute() => throw new NotSupportedException("PublishArtifactsInManifestBase depends on Maestro.Client, which has discontinued support for desktop frameworks.");
+
+        public abstract Task<bool> ExecuteAsync();
+
+        public Task PushNugetPackagesAsync<T>(
+            HashSet<T> packagesToPublish,
+            TargetFeedConfig feedConfig,
+            int maxClients,
+            Func<TargetFeedConfig, HttpClient, T, string, string, string, Task> packagePublishAction)  
+            => throw new NotSupportedException("PublishArtifactsInManifestBase depends on Maestro.Client, which has discontinued support for desktop frameworks.");
+
+        public Task PushNugetPackageAsync(
+            TargetFeedConfig feedConfig,
+            HttpClient client,
+            string localPackageLocation,
+            string id,
+            string version,
+            string feedAccount,
+            string feedVisibility,
+            string feedName,
+            Func<string, string, HttpClient, MsBuildUtils.TaskLoggingHelper, Task<PackageFeedStatus>> CompareLocalPackageToFeedPackageCallBack = null,
+            Func<string, string, Task<ProcessExecutionResult>> RunProcessAndGetOutputsCallBack = null
+            ) => throw new NotSupportedException("PublishArtifactsInManifestBase depends on Maestro.Client, which has discontinued support for desktop frameworks.");
+    }
+}
+#endif
+
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV2.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV2.cs
index 8cf077b000b..2da73d115b5 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV2.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV2.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.Build.Framework;
 using Microsoft.DotNet.Build.Tasks.Feed.Model;
+#if !NET472_OR_GREATER
 using Microsoft.DotNet.Maestro.Client;
 using Microsoft.DotNet.Maestro.Client.Models;
 using System;
@@ -93,7 +94,7 @@ public async Task ParseTargetFeedConfigAsync()
                     string feedKey = fc.GetMetadata(nameof(Model.TargetFeedConfig.Token));
                     string type = fc.GetMetadata(nameof(Model.TargetFeedConfig.Type));
                     AssetSelection assetSelection = AssetSelection.All;
-                    bool isInternalFeed = false;
+                    bool isInternalFeed;
                     bool isIsolatedFeed = false;
                     bool isOverridableFeed = false;
 
@@ -171,7 +172,7 @@ public async Task ParseTargetFeedConfigAsync()
                         }
                     }
 
-                    string latestLinkShortUrlPrefix = fc.GetMetadata(nameof(Model.TargetFeedConfig.LatestLinkShortUrlPrefix));
+                    string latestLinkShortUrlPrefix = fc.GetMetadata(nameof(Model.TargetFeedConfig.LatestLinkShortUrlPrefixes));
                     if (!string.IsNullOrEmpty(latestLinkShortUrlPrefix))
                     {
                         // Verify other inputs are provided
@@ -204,15 +205,15 @@ public async Task ParseTargetFeedConfigAsync()
                     }
 
                     TargetFeedConfig feedConfig = new TargetFeedConfig(
-                            categoryKey,
-                            targetFeedUrl,
-                            feedType,
-                            feedKey,
-                            latestLinkShortUrlPrefix,
-                            assetSelection,
-                            isIsolatedFeed,
-                            isInternalFeed,
-                            isOverridableFeed);
+                            contentType: categoryKey,
+                            targetURL: targetFeedUrl,
+                            type: feedType,
+                            token: feedKey,
+                            latestLinkShortUrlPrefixes: new List<string>() { latestLinkShortUrlPrefix },
+                            assetSelection: assetSelection,
+                            isolated: isIsolatedFeed,
+                            @internal: isInternalFeed,
+                            allowOverwrite: isOverridableFeed);
 
                     CheckForInternalBuildsOnPublicFeeds(feedConfig);
 
@@ -220,5 +221,15 @@ public async Task ParseTargetFeedConfigAsync()
                 }
             }
         }
+
+        public PublishArtifactsInManifestV2(AssetPublisherFactory assetPublisherFactory = null) : base(assetPublisherFactory)
+        {
+        }
     }
 }
+#else
+public class PublishArtifactsInManifestV2 : Microsoft.Build.Utilities.Task
+{
+    public override bool Execute() => throw new System.NotSupportedException("PublishArtifactsInManifestV2 depends on Maestro.Client, which has discontinued support for desktop frameworks.");
+}
+#endif
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV3.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV3.cs
index 1aa5bb834ed..bad445d8d51 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV3.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV3.cs
@@ -1,16 +1,18 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.Build.Framework;
-using Microsoft.DotNet.Build.Tasks.Feed.Model;
-using Microsoft.DotNet.Maestro.Client;
-using Microsoft.DotNet.Maestro.Client.Models;
-using Microsoft.DotNet.VersionTools.BuildManifest.Model;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Build.Framework;
+using Microsoft.DotNet.Build.Tasks.Feed.Model;
+#if !NET472_OR_GREATER
+using Microsoft.DotNet.Maestro.Client;
+using Microsoft.DotNet.Maestro.Client.Models;
+using Microsoft.DotNet.VersionTools.BuildManifest.Model;
 
 namespace Microsoft.DotNet.Build.Tasks.Feed
 {
@@ -23,22 +25,6 @@ public class PublishArtifactsInManifestV3 : PublishArtifactsInManifestBase
         [Required]
         public string TargetChannels { get; set; }
 
-        [Required] 
-        public string AzureDevOpsFeedsKey { get; set; }
-
-        [Required] 
-        public string AzureStorageTargetFeedKey { get; set; }
-
-        [Required] 
-        public string InstallersFeedKey { get; set; }
-
-        [Required] 
-        public string CheckSumsFeedKey { get; set; }
-
-        public string InternalInstallersFeedKey { get; set; }
-
-        public string InternalCheckSumsFeedKey { get; set; }
-
         public bool PublishInstallersAndChecksums { get; set; }
 
         public string PdbArtifactsBasePath { get; set; }
@@ -53,15 +39,10 @@ public class PublishArtifactsInManifestV3 : PublishArtifactsInManifestBase
 
         public bool AllowFeedOverrides { get; set; }
 
-        public string InstallersFeedOverride { get; set; }
-
-        public string ChecksumsFeedOverride { get; set; }
+        public ITaskItem[] FeedKeys { get; set; }
+        public ITaskItem[] FeedSasUris { get; set; }
 
-        public string ShippingFeedOverride { get; set; }
-
-        public string TransportFeedOverride { get; set; }
-
-        public string SymbolsFeedOverride { get; set; }
+        public ITaskItem[] FeedOverrides { get; set; }
 
         public override bool Execute()
         {
@@ -85,7 +66,8 @@ public override async Task<bool> ExecuteAsync()
                 {
                     if (!int.TryParse(channelIdStr, out var channelId))
                     {
-                        Log.LogError($"Value '{channelIdStr}' isn't recognized as a valid Maestro++ channel ID. To add a channel refer to https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Publishing.md#how-to-add-a-new-channel-to-use-v3-publishing.");
+                        Log.LogError(
+                            $"Value '{channelIdStr}' isn't recognized as a valid Maestro++ channel ID. To add a channel refer to https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Publishing.md#how-to-add-a-new-channel-to-use-v3-publishing.");
                         continue;
                     }
 
@@ -94,21 +76,12 @@ public override async Task<bool> ExecuteAsync()
 
                 if (Log.HasLoggedErrors)
                 {
-                    Log.LogError($"Could not parse the target channels list '{TargetChannels}'. It should be a comma separated list of integers.");
+                    Log.LogError(
+                        $"Could not parse the target channels list '{TargetChannels}'. It should be a comma separated list of integers.");
                     return false;
                 }
 
-                string temporarySymbolsLocation =
-                    Path.GetFullPath(Path.Combine(BlobAssetsBasePath, @"..\", "tempSymbols"));
-
-                EnsureTemporarySymbolDirectoryExists(temporarySymbolsLocation);
-
                 SplitArtifactsInCategories(BuildModel);
-                DeleteSymbolTemporaryFiles(temporarySymbolsLocation);
-
-                //Copying symbol files to temporary location is required because the symUploader API needs read/write access to the files,
-                //since we publish blobs and symbols in parallel this will cause IO exceptions.
-                CopySymbolFilesToTemporaryLocation(BuildModel, temporarySymbolsLocation);
 
                 if (Log.HasLoggedErrors)
                 {
@@ -145,34 +118,40 @@ public override async Task<bool> ExecuteAsync()
 
                     Log.LogMessage(MessageImportance.High, $"Publishing to this target channel: {targetChannelConfig}");
 
-                    string shortLinkUrl = string.IsNullOrEmpty(targetChannelConfig.AkaMSChannelName) ?
-                        $"dotnet/" : $"dotnet/{targetChannelConfig.AkaMSChannelName}/{BuildQuality}";
+                    List<string> shortLinkUrls = new List<string>();
+
+                    foreach (string akaMSChannelName in targetChannelConfig.AkaMSChannelNames)
+                    {
+                        shortLinkUrls.Add($"dotnet/{akaMSChannelName}/{BuildQuality}");
+                    }
+
+                    // If there are no channel names, default to dotnet/
+                    if (!targetChannelConfig.AkaMSChannelNames.Any())
+                    {
+                        shortLinkUrls.Add("dotnet/");
+                    }
 
                     var targetFeedsSetup = new SetupTargetFeedConfigV3(
-                        targetChannelConfig.IsInternal,
-                        BuildModel.Identity.IsStable,
-                        BuildModel.Identity.Name,
-                        BuildModel.Identity.Commit,
-                        AzureStorageTargetFeedKey,
-                        PublishInstallersAndChecksums,
-                        GetFeed(targetChannelConfig.InstallersFeed, InstallersFeedOverride),
-                        targetChannelConfig.IsInternal? InternalInstallersFeedKey : InstallersFeedKey,
-                        GetFeed(targetChannelConfig.ChecksumsFeed, ChecksumsFeedOverride),
-                        targetChannelConfig.IsInternal? InternalCheckSumsFeedKey : CheckSumsFeedKey,
-                        GetFeed(targetChannelConfig.ShippingFeed, ShippingFeedOverride),
-                        GetFeed(targetChannelConfig.TransportFeed, TransportFeedOverride),
-                        GetFeed(targetChannelConfig.SymbolsFeed, SymbolsFeedOverride),
-                        shortLinkUrl,
-                        AzureDevOpsFeedsKey,
-                        BuildEngine = this.BuildEngine,
+                        targetChannelConfig: targetChannelConfig,
+                        isInternalBuild: targetChannelConfig.IsInternal,
+                        isStableBuild: BuildModel.Identity.IsStable,
+                        repositoryName: BuildModel.Identity.Name,
+                        commitSha: BuildModel.Identity.Commit,
+                        publishInstallersAndChecksums: PublishInstallersAndChecksums,
+                        feedKeys: FeedKeys,
+                        feedSasUris: FeedSasUris,
+                        feedOverrides: AllowFeedOverrides ? FeedOverrides : Array.Empty<ITaskItem>(),
+                        latestLinkShortUrlPrefixes: shortLinkUrls,
+                        buildEngine: BuildEngine,
                         targetChannelConfig.SymbolTargetType,
                         filesToExclude: targetChannelConfig.FilenamesToExclude,
-                        flatten: targetChannelConfig.Flatten);
+                        flatten: targetChannelConfig.Flatten,
+                        log: Log);
 
                     var targetFeedConfigs = targetFeedsSetup.Setup();
 
                     // No target feeds to publish to, very likely this is an error
-                    if (targetFeedConfigs.Count() == 0)
+                    if (!targetFeedConfigs.Any())
                     {
                         Log.LogError($"No target feeds were found to publish the assets to.");
                         return false;
@@ -199,16 +178,40 @@ public override async Task<bool> ExecuteAsync()
                     return false;
                 }
 
-                await Task.WhenAll(new Task[] {
-                    HandlePackagePublishingAsync(buildAssets),
-                    HandleBlobPublishingAsync(buildAssets),
-                    HandleSymbolPublishingAsync(PdbArtifactsBasePath, MsdlToken,
-                        SymWebToken, SymbolPublishingExclusionsFile, temporarySymbolsLocation, PublishSpecialClrFiles)
+                string temporarySymbolsLocation = "";
+                if (!UseStreamingPublishing)
+                {
+                    temporarySymbolsLocation =
+                        Path.GetFullPath(Path.Combine(BlobAssetsBasePath, @"..\", "tempSymbols"));
+
+                    EnsureTemporaryDirectoryExists(temporarySymbolsLocation);
+                    DeleteTemporaryFiles(temporarySymbolsLocation);
+
+                    // Copying symbol files to temporary location is required because the symUploader API needs read/write access to the files,
+                    // since we publish blobs and symbols in parallel this will cause IO exceptions.
+                    CopySymbolFilesToTemporaryLocation(BuildModel, temporarySymbolsLocation);
+                }
+
+                using var clientThrottle = new SemaphoreSlim(MaxClients, MaxClients);
+
+                await Task.WhenAll(new Task[]
+                {
+                    HandlePackagePublishingAsync(buildAssets, clientThrottle),
+                    HandleBlobPublishingAsync(buildAssets, clientThrottle),
+                    HandleSymbolPublishingAsync(
+                        PdbArtifactsBasePath,
+                        MsdlToken,
+                        SymWebToken,
+                        SymbolPublishingExclusionsFile,
+                        PublishSpecialClrFiles,
+                        buildAssets,
+                        clientThrottle,
+                        temporarySymbolsLocation)
                 });
 
-                DeleteSymbolTemporaryFiles(temporarySymbolsLocation);
-                DeleteSymbolTemporaryDirectory(temporarySymbolsLocation);
-                Log.LogMessage(MessageImportance.High, "Successfully deleted the temporary symbols directory.");
+                DeleteTemporaryFiles(temporarySymbolsLocation);
+                DeleteTemporaryDirectory(temporarySymbolsLocation);
+
                 await PersistPendingAssetLocationAsync(client);
             }
             catch (Exception e)
@@ -234,7 +237,7 @@ private void CopySymbolFilesToTemporaryLocation(BuildModel buildModel, string sy
         {
             foreach (var blobAsset in buildModel.Artifacts.Blobs)
             {
-                if (blobAsset.Id.EndsWith(".symbols.nupkg", StringComparison.OrdinalIgnoreCase))
+                if (GeneralUtils.IsSymbolPackage(blobAsset.Id))
                 {
                     var sourceFile = Path.Combine(BlobAssetsBasePath, Path.GetFileName(blobAsset.Id));
                     var destinationFile = Path.Combine(symbolTemporaryLocation, Path.GetFileName(blobAsset.Id));
@@ -245,55 +248,19 @@ private void CopySymbolFilesToTemporaryLocation(BuildModel buildModel, string sy
             }
         }
 
-        /// <summary>
-        /// Create Temporary Symbols directory if it does not exists.
-        /// </summary>
-        /// <param name="temporarySymbolsLocation"></param>
-        public void EnsureTemporarySymbolDirectoryExists(string temporarySymbolsLocation)
-        {
-            if (!Directory.Exists(temporarySymbolsLocation))
-            {
-                Directory.CreateDirectory(temporarySymbolsLocation);
-            }
-        }
-        /// <summary>
-        /// Delete the symbols files after publishing to Symbol server(s), this is part of cleanup
-        /// </summary>
-        /// <param name="temporarySymbolsLocation"></param>
-        public void DeleteSymbolTemporaryFiles(string temporarySymbolsLocation)
-        {
-            try
-            {
-                if (Directory.Exists(temporarySymbolsLocation))
-                {
-                    string[] fileEntries = Directory.GetFiles(temporarySymbolsLocation);
-                    foreach (var file in fileEntries)
-                    {
-                        File.Delete(file);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.LogWarning(ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// Deletes the temporary symbol folder, this is part of clean up
-        /// </summary>
-        /// <param name="temporarySymbolLocation"></param>
-        public void DeleteSymbolTemporaryDirectory(string temporarySymbolLocation)
+        public string GetFeed(string feed, string feedOverride)
         {
-            if (Directory.Exists(temporarySymbolLocation))
-            {
-                Directory.Delete(temporarySymbolLocation);
-            }
+            return (AllowFeedOverrides && !string.IsNullOrEmpty(feedOverride)) ? feedOverride : feed;
         }
 
-        public string GetFeed(string feed, string feedOverride)
+        public PublishArtifactsInManifestV3(AssetPublisherFactory assetPublisherFactory = null) : base(assetPublisherFactory)
         {
-            return (AllowFeedOverrides && !string.IsNullOrEmpty(feedOverride)) ? feedOverride : feed;
         }
     }
 }
+#else
+public class PublishArtifactsInManifestV3 : Microsoft.Build.Utilities.Task
+{
+    public override bool Execute() => throw new NotSupportedException("PublishArtifactsInManifestV3 depends on Maestro.Client, which has discontinued support for desktop frameworks.");
+}
+#endif
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSignedAssets.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSignedAssets.cs
index 388af99c38b..6b1e364bf2a 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSignedAssets.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSignedAssets.cs
@@ -97,5 +97,9 @@ await PushNugetPackagesAsync<PackageIdentity>(packagesToPublish, targetFeedConfi
                     await PushNugetPackageAsync(feed, httpClient, localPackagePath, package.Id, package.Version.ToString(), feedAccount, feedVisibility, feedName);
                 });
         }
+
+        public PublishSignedAssets() : base()
+        {
+        }
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSymbolsHelper.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSymbolsHelper.cs
index f781d8f0b21..413d5c0deed 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSymbolsHelper.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSymbolsHelper.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using System;
 using System.Collections.Generic;
@@ -25,6 +24,7 @@ public static async System.Threading.Tasks.Task PublishAsync(
                 bool convertPortablePdbsToWindowsPdbs,
                 bool publishSpecialClrFiles,
                 HashSet<int> pdbConversionTreatAsWarning,
+                bool treatPdbConversionIssuesAsInfo,
                 bool dryRun,
                 bool timer,
                 bool verboseLogging)
@@ -38,6 +38,7 @@ public static async System.Threading.Tasks.Task PublishAsync(
                     PdbConversionTreatAsWarning = pdbConversionTreatAsWarning,
                     PublishSpecialClrFiles = publishSpecialClrFiles,
                     Timer = timer,
+                    TreatPdbConversionIssuesAsInfo = treatPdbConversionIssuesAsInfo
                 };
 
                 using (publishOperation)
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushOptions.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushOptions.cs
index ecae2eeba1e..54d04ce1947 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushOptions.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushOptions.cs
@@ -1,6 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
+
 namespace Microsoft.DotNet.Build.Tasks.Feed
 {
     public class PushOptions
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushToBlobFeed.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushToBlobFeed.cs
index 5e26d9fa001..0e9d96c94aa 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushToBlobFeed.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushToBlobFeed.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Arcade.Common;
 using Microsoft.Build.Framework;
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/SemaphoreLock.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/SemaphoreLock.cs
new file mode 100644
index 00000000000..d825f88feae
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/SemaphoreLock.cs
@@ -0,0 +1,45 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+    public readonly struct SemaphoreLock : IDisposable
+    {
+        private readonly SemaphoreSlim _sem;
+
+        private SemaphoreLock(SemaphoreSlim sem)
+        {
+            _sem = sem;
+        }
+
+        public void Dispose()
+        {
+            _sem?.Release();
+        }
+
+        public static ValueTask<SemaphoreLock> LockAsync(SemaphoreSlim sem)
+        {
+            if (sem == null)
+            {
+                return new ValueTask<SemaphoreLock>(new SemaphoreLock(null));
+            }
+            Task waitTask = sem.WaitAsync();
+            if (waitTask.IsCompleted && !waitTask.IsFaulted && !waitTask.IsCanceled)
+            {
+                return new ValueTask<SemaphoreLock>(new SemaphoreLock(sem));
+            }
+
+            static async Task<SemaphoreLock> WaitForLock(Task waitTask, SemaphoreSlim sem)
+            {
+                await waitTask.ConfigureAwait(false);
+                return new SemaphoreLock(sem);
+            }
+
+            return new ValueTask<SemaphoreLock>(WaitForLock(waitTask, sem));
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AssetComparer.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AssetComparer.cs
index bbbec0e98b0..75ddedd97a1 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AssetComparer.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AssetComparer.cs
@@ -1,3 +1,4 @@
+#if !NET472_OR_GREATER
 using Microsoft.DotNet.Maestro.Client.Models;
 using System.Collections.Generic;
 
@@ -35,3 +36,4 @@ public int GetHashCode(Asset asset)
         }
     }
 }
+#endif
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureConnectionStringBuildTask.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureConnectionStringBuildTask.cs
index 82faa5ab514..f49268710b5 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureConnectionStringBuildTask.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureConnectionStringBuildTask.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.DotNet.Build.CloudTestTasks
 {
-    public abstract class AzureConnectionStringBuildTask : Task
+    public abstract class AzureConnectionStringBuildTask : Microsoft.Build.Utilities.Task
     {
         /// <summary>
         /// Azure Storage account connection string.  Supersedes Account Key / Name.  
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureStorageUtils.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureStorageUtils.cs
index 40f5b28cc45..4bae23fba6e 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureStorageUtils.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/AzureStorageUtils.cs
@@ -14,18 +14,21 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
+using Azure.Core.Pipeline;
+using System.Net.Http;
+using Microsoft.DotNet.Build.Tasks.Feed;
 
 namespace Microsoft.DotNet.Build.CloudTestTasks
 {
     public class AzureStorageUtils
     {
-        private readonly Dictionary<string, string> MimeMappings = new Dictionary<string, string>()
+        private static readonly Dictionary<string, string> MimeMappings = new Dictionary<string, string>()
         {
             {".svg", "image/svg+xml"},
             {".version", "text/plain"}
         };
 
-        private readonly Dictionary<string, string> CacheMappings = new Dictionary<string, string>()
+        private static readonly Dictionary<string, string> CacheMappings = new Dictionary<string, string>()
         {
             {".svg", "no-cache"}
         };
@@ -35,11 +38,17 @@ public class AzureStorageUtils
 
         public BlobContainerClient Container { get; set; }
 
+        private static readonly HttpClient s_httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(300) };
+        private static readonly BlobClientOptions s_clientOptions = new BlobClientOptions()
+        {
+            Transport = new HttpClientTransport(s_httpClient)
+        };
+
         public AzureStorageUtils(string AccountName, string AccountKey, string ContainerName)
         {
             _credential = new StorageSharedKeyCredential(AccountName, AccountKey);
             Uri endpoint = new Uri($"https://{AccountName}.blob.core.windows.net");
-            BlobServiceClient service = new BlobServiceClient(endpoint, _credential);
+            BlobServiceClient service = new BlobServiceClient(endpoint, _credential, s_clientOptions);
             Container = service.GetBlobContainerClient(ContainerName);
         }
 
@@ -103,75 +112,7 @@ await blob.UploadAsync(
         }
 
         public async Task<bool> IsFileIdenticalToBlobAsync(string localFileFullPath, string blobPath) =>
-            await IsFileIdenticalToBlobAsync(localFileFullPath, GetBlob(blobPath)).ConfigureAwait(false);
-
-        /// <summary>
-        /// Return a bool indicating whether a local file's content is the same as 
-        /// the content of a given blob. 
-        /// 
-        /// If the blob has the ContentHash property set, the comparison is performed using 
-        /// that (MD5 hash).  All recently-uploaded blobs or those uploaded by these libraries
-        /// should; some blob clients older than ~2012 may upload without the property set.
-        /// 
-        /// When the ContentHash property is unset, a byte-by-byte comparison is performed.
-        /// </summary>
-        public async Task<bool> IsFileIdenticalToBlobAsync(string localFileFullPath, BlobClient blob)
-        {
-            BlobProperties properties = await blob.GetPropertiesAsync();
-            if (properties.ContentHash != null)
-            {
-                var localMD5 = CalculateMD5(localFileFullPath);
-                var blobMD5 = Convert.ToBase64String(properties.ContentHash);
-                return blobMD5.Equals(localMD5, StringComparison.OrdinalIgnoreCase);
-            }
-            else
-            {
-                int bytesPerMegabyte = 1 * 1024 * 1024;
-                if (properties.ContentLength < bytesPerMegabyte)
-                {
-                    byte[] existingBytes = new byte[properties.ContentLength];
-                    byte[] localBytes = File.ReadAllBytes(localFileFullPath);
-
-                    using (MemoryStream stream = new MemoryStream(existingBytes, true))
-                    {
-                        await blob.DownloadToAsync(stream).ConfigureAwait(false);
-                    }
-                    return localBytes.SequenceEqual(existingBytes);
-                }
-                else
-                {
-                    using (Stream localFileStream = File.OpenRead(localFileFullPath))
-                    {
-                        byte[] localBuffer = new byte[bytesPerMegabyte];
-                        byte[] remoteBuffer = new byte[bytesPerMegabyte];
-                        int bytesLocalFile = 0;
-
-                        do
-                        {
-                            long start = localFileStream.Position;
-                            int localBytesRead = await localFileStream.ReadAsync(localBuffer, 0, bytesPerMegabyte);
-
-                            HttpRange range = new HttpRange(start, localBytesRead);
-                            BlobDownloadInfo download = await blob.DownloadAsync(range).ConfigureAwait(false);
-                            if (download.ContentLength != localBytesRead)
-                            {
-                                return false;
-                            }
-                            using (MemoryStream stream = new MemoryStream(remoteBuffer, true))
-                            {
-                                await download.Content.CopyToAsync(stream).ConfigureAwait(false);
-                            }
-                            if (!remoteBuffer.SequenceEqual(localBuffer))
-                            {
-                                return false;
-                            }
-                        }
-                        while (bytesLocalFile > 0);
-                    }
-                    return true;
-                }
-            }
-        }
+            await GetBlob(blobPath).IsFileIdenticalToBlobAsync(localFileFullPath);
 
         public async Task<string> CreateContainerAsync(PublicAccessType publicAccess)
         {
@@ -197,7 +138,7 @@ public async Task<bool> CheckIfBlobExistsAsync(string blobPath) =>
             await GetBlob(blobPath).ExistsAsync().ConfigureAwait(false);
 
 
-        private BlobHttpHeaders GetBlobHeadersByExtension(string filePath)
+        public static BlobHttpHeaders GetBlobHeadersByExtension(string filePath)
         {
             if (string.IsNullOrWhiteSpace(filePath))
             {
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/GeneralUtils.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/GeneralUtils.cs
index 90b58e851a3..ab8b35f75bc 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/GeneralUtils.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/GeneralUtils.cs
@@ -19,8 +19,10 @@ namespace Microsoft.DotNet.Build.Tasks.Feed
     public static class GeneralUtils
     {
         public const string SymbolPackageSuffix = ".symbols.nupkg";
+        public const string SnupkgPackageSuffix = ".snupkg";
         public const string PackageSuffix = ".nupkg";
         public const string PackagesCategory = "PACKAGE";
+        public static TimeSpan NugetFeedPublisherHttpClientTimeout => TimeSpan.FromSeconds(300);
 
         public static ExponentialRetry CreateDefaultRetryHandler()
             => new ExponentialRetry
@@ -134,13 +136,13 @@ public static async Task<bool> CompareStreamsAsync(Stream localFileStream, Strea
         ///       the streams make no guarantee that they will return a full block each time when read operations are performed, so we
         ///       must be sure to only compare the minimum number of bytes returned.
         /// </remarks>
-        public static Task<PackageFeedStatus> CompareLocalPackageToFeedPackage(
+        public static async Task<PackageFeedStatus> CompareLocalPackageToFeedPackage(
             string localPackageFullPath,
             string packageContentUrl,
             HttpClient client,
             TaskLoggingHelper log)
         {
-            return CompareLocalPackageToFeedPackage(
+            return await CompareLocalPackageToFeedPackage(
                 localPackageFullPath,
                 packageContentUrl,
                 client,
@@ -220,7 +222,7 @@ public static async Task<PackageFeedStatus> CompareLocalPackageToFeedPackage(
                 }
                 // String based comparison because the status code isn't exposed in HttpRequestException
                 // see here: https://github.com/dotnet/runtime/issues/23648
-                catch (HttpRequestException e)
+                catch (Exception e) when (e is HttpRequestException || e is TaskCanceledException)
                 {
                     if (e.Message.Contains("404 (Not Found)"))
                     {
@@ -367,6 +369,16 @@ public static string InferCategory(string assetId, TaskLoggingHelper log)
             } 
         }
 
+        /// <summary>
+        ///     Determine whether a file name or path is a symbol package.
+        /// </summary>
+        /// <param name="name">File anme or path</param>
+        /// <returns>True if the item is a symbol package, false otherwise</returns>
+        public static bool IsSymbolPackage(string name)
+        {
+            return name.EndsWith(SymbolPackageSuffix, StringComparison.OrdinalIgnoreCase) ||
+                name.EndsWith(SnupkgPackageSuffix, StringComparison.OrdinalIgnoreCase);
+        }
 
         private static System.Threading.Tasks.Task WaitForProcessExitAsync(Process process)
         {
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/LatestLinksManager.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/LatestLinksManager.cs
index e1dbe6a3b99..01be6d8c65d 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/LatestLinksManager.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/LatestLinksManager.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using Microsoft.DotNet.Build.Tasks.Feed.Model;
@@ -24,6 +25,11 @@ public class LatestLinksManager
         private string AkaMSCreatedBy { get; }
         private string AkaMSGroupOwner { get; }
 
+        private static HashSet<string> AccountsWithCdns { get; } = new()
+        {
+            "dotnetcli.blob.core.windows.net", "dotnetbuilds.blob.core.windows.net",
+        };
+
         public LatestLinksManager(
             string akaMSClientId,
             string akaMSClientSecret,
@@ -44,63 +50,98 @@ public LatestLinksManager(
         }
 
         public async System.Threading.Tasks.Task CreateOrUpdateLatestLinksAsync(
-            HashSet<BlobArtifactModel> blobsToPublish,
+            HashSet<string> assetsToPublish,
             TargetFeedConfig feedConfig,
             int expectedSuffixLength)
         {
-            if (string.IsNullOrEmpty(feedConfig.LatestLinkShortUrlPrefix))
+            if (!feedConfig.LatestLinkShortUrlPrefixes.Any())
             {
                 return;
             }
 
+            string feedBaseUrl = feedConfig.SafeTargetURL;
+            if (expectedSuffixLength != 0)
+            {
+                // Strip away the feed expected suffix (index.json)
+                feedBaseUrl = feedBaseUrl.Substring(0, feedBaseUrl.Length - expectedSuffixLength);
+            }
+            if (!feedBaseUrl.EndsWith("/", StringComparison.OrdinalIgnoreCase))
+            {
+                feedBaseUrl += "/";
+            }
+            if (AccountsWithCdns.Any(account => feedBaseUrl.Contains(account)))
+            {
+                // The storage accounts are in a single datacenter in the US and thus download 
+                // times can be painful elsewhere. The CDN helps with this therefore we point the target 
+                // of the aka.ms links to the CDN.
+                feedBaseUrl = feedBaseUrl.Replace(".blob.core.windows.net", ".azureedge.net");
+            }
+
             Logger.LogMessage(MessageImportance.High, "\nThe following aka.ms links for blobs will be created:");
-            IEnumerable<AkaMSLink> linksToCreate = blobsToPublish
-                .Where(blob => !feedConfig.FilenamesToExclude.Contains(Path.GetFileName(blob.Id)))
-                .Select(blob =>
+            IEnumerable<AkaMSLink> linksToCreate = assetsToPublish
+                .Where(asset => !feedConfig.FilenamesToExclude.Contains(Path.GetFileName(asset)))
+                .Select(asset =>
             {
 
-                // Strip away the feed expected suffix (index.json) and append on the
                 // blob path.
-                string actualTargetUrl = feedConfig.TargetURL.Substring(0,
-                    feedConfig.TargetURL.Length - expectedSuffixLength) + blob.Id;
+                string actualTargetUrl = feedBaseUrl + asset;
 
-                // The dotnetcli storage account is in a single datacenter in the US and thus download 
-                // times can be painful elsewhere. The CDN helps with this thefore we point the target 
-                // of the aka.ms links to the CDN.
-                actualTargetUrl = actualTargetUrl.Replace("//dotnetcli.blob.core.windows.net/", "//dotnetcli.azureedge.net/");
-
-                AkaMSLink newLink = new AkaMSLink
+                List<AkaMSLink> newLinks = new List<AkaMSLink>();
+                foreach (string shortUrlPrefix in feedConfig.LatestLinkShortUrlPrefixes)
                 {
-                    ShortUrl = GetLatestShortUrlForBlob(feedConfig, blob, feedConfig.Flatten),
-                    TargetUrl = actualTargetUrl
-                };
-                Logger.LogMessage(MessageImportance.High, $"  {Path.GetFileName(blob.Id)}");
-
-                Logger.LogMessage(MessageImportance.High, $"  aka.ms/{newLink.ShortUrl} -> {newLink.TargetUrl}");
+                    newLinks.Add(GetAkaMSLinkForAsset(shortUrlPrefix, feedBaseUrl, asset, feedConfig.Flatten));
+                }
 
-                return newLink;
-            }).ToList();
+                return newLinks;
+            })
+                .SelectMany(links => links)
+                .ToList();
 
             await LinkManager.CreateOrUpdateLinksAsync(linksToCreate, AkaMsOwners, AkaMSCreatedBy, AkaMSGroupOwner, true);
         }
 
+        /// <sunnary>
+        ///     Create the aka.ms link info
+        /// </summary>
+        /// <param name="shortUrlPrefix">aka.ms short url prefix</param>
+        /// <param name="feedBaseUrl">Base feed url for the asset</param>
+        /// <param name="asset">Asset</param>
+        /// <param name="flatten">If we should only use the filename when creating the aka.ms link</param>
+        /// <returns>The AkaMSLink object for the asset</returns>
+        public AkaMSLink GetAkaMSLinkForAsset(string shortUrlPrefix, string feedBaseUrl, string asset, bool flatten)
+        {
+            // blob path.
+            string actualTargetUrl = feedBaseUrl + asset;
+
+            AkaMSLink newLink = new AkaMSLink
+            {
+                ShortUrl = GetLatestShortUrlForBlob(shortUrlPrefix, asset, flatten),
+                TargetUrl = actualTargetUrl
+            };
+            Logger.LogMessage(MessageImportance.High, $"  {Path.GetFileName(asset)}");
+
+            Logger.LogMessage(MessageImportance.High, $"  aka.ms/{newLink.ShortUrl} -> {newLink.TargetUrl}");
+
+            return newLink;
+        }
+
         /// <summary>
         ///     Get the short url for a blob.
         /// </summary>
-        /// <param name="feedConfig">Feed configuration</param>
-        /// <param name="blob">Blob</param>
+        /// <param name="latestLinkShortUrlPrefix">aka.ms short url prefix</param>
+        /// <param name="asset">Asset</param>
+        /// <param name="flatten">If we should only use the filename when creating the aka.ms link</param>
         /// <returns>Short url prefix for the blob.</returns>
-        /// <remarks>
-        public string GetLatestShortUrlForBlob(TargetFeedConfig feedConfig, BlobArtifactModel blob, bool flatten)
+        public string GetLatestShortUrlForBlob(string latestLinkShortUrlPrefix, string asset, bool flatten)
         {
-            string blobIdWithoutVersions = VersionIdentifier.RemoveVersions(blob.Id);
+            string blobIdWithoutVersions = VersionIdentifier.RemoveVersions(asset);
 
             if (flatten)
             {
                 blobIdWithoutVersions = Path.GetFileName(blobIdWithoutVersions);
             }
 
-            return Path.Combine(feedConfig.LatestLinkShortUrlPrefix, blobIdWithoutVersions).Replace("\\", "/");
+            return Path.Combine(latestLinkShortUrlPrefix, blobIdWithoutVersions).Replace("\\", "/");
         }
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/UploadToAzure.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/UploadToAzure.cs
index 347df7eb6df..1bb88928d89 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/UploadToAzure.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/common/UploadToAzure.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using Azure.Storage.Blobs.Specialized;
 using Azure.Storage.Blobs;
+using Microsoft.DotNet.Build.Tasks.Feed;
 
 namespace Microsoft.DotNet.Build.CloudTestTasks
 {
@@ -104,7 +105,7 @@ public async Task<bool> ExecuteAsync(CancellationToken ct)
                         {
                             if (PassIfExistingItemIdentical)
                             {
-                                if (await blobUtils.IsFileIdenticalToBlobAsync(item.ItemSpec, blobReference))
+                                if (await blobReference.IsFileIdenticalToBlobAsync(item.ItemSpec))
                                 {
                                     return;
                                 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/BuildArtifacts.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/BuildArtifacts.cs
new file mode 100644
index 00000000000..16df412ab49
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/BuildArtifacts.cs
@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Build.Tasks.Feed
+{
+    public class Properties
+    {
+        public string artifactsize { get; set; }
+        public string RootId { get; set; }
+        public string localpath { get; set; }
+    }
+
+    public class Resource
+    {
+        public string type { get; set; }
+        public string data { get; set; }
+        public Properties properties { get; set; }
+        public string url { get; set; }
+        public string downloadUrl { get; set; }
+    }
+
+    public class Value
+    {
+        public int id { get; set; }
+        public string name { get; set; }
+        public string source { get; set; }
+        public Resource resource { get; set; }
+    }
+
+    public class BuildArtifacts
+    {
+        public int count { get; set; }
+        public IList<Value> value { get; set; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/PublishingConstants.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/PublishingConstants.cs
index 8b4c277988e..439e159c78a 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/PublishingConstants.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/PublishingConstants.cs
@@ -31,7 +31,35 @@ public class PublishingConstants
         // https://pkgs.dev.azure.com/dnceng/public/_packaging/public-feed-name/nuget/v3/index.json
         // or https://pkgs.dev.azure.com/dnceng/_packaging/internal-feed-name/nuget/v3/index.json
         public static readonly string AzDoNuGetFeedPattern =
-            @"https://pkgs.dev.azure.com/(?<account>[a-zA-Z0-9]+)/(?<visibility>[a-zA-Z0-9-]+/)?_packaging/(?<feed>.+)/nuget/v3/index.json";
+            @"https://pkgs.dev.azure.com/(?<account>[a-zA-Z0-9-]+)/(?<visibility>[a-zA-Z0-9-]+/)?_packaging/(?<feed>.+)/nuget/v3/index.json";
+
+        public static readonly TargetFeedContentType[] InstallersAndSymbols = {
+            TargetFeedContentType.OSX,
+            TargetFeedContentType.Deb,
+            TargetFeedContentType.Rpm,
+            TargetFeedContentType.Node,
+            TargetFeedContentType.BinaryLayout,
+            TargetFeedContentType.Installer,
+            TargetFeedContentType.Maven,
+            TargetFeedContentType.VSIX,
+            TargetFeedContentType.Badge,
+            TargetFeedContentType.Symbols,
+            TargetFeedContentType.Other
+        };
+
+        public static readonly TargetFeedContentType[] InstallersAndChecksums = {
+            TargetFeedContentType.OSX,
+            TargetFeedContentType.Deb,
+            TargetFeedContentType.Rpm,
+            TargetFeedContentType.Node,
+            TargetFeedContentType.BinaryLayout,
+            TargetFeedContentType.Installer,
+            TargetFeedContentType.Maven,
+            TargetFeedContentType.VSIX,
+            TargetFeedContentType.Badge,
+            TargetFeedContentType.Checksum,
+            TargetFeedContentType.Other
+        };
 
         public enum BuildQuality
         {
@@ -51,61 +79,56 @@ public enum BuildQuality
             GA
         }
 
-        #region Target Channel Configs
-        private const string FeedForChecksums = "https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json";
-        private const string FeedForInstallers = "https://dotnetcli.blob.core.windows.net/dotnet/index.json";
+        #region Target Channel Config Feeds
+        public const string FeedForChecksums = "https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json";
+        public const string FeedForInstallers = "https://dotnetcli.blob.core.windows.net/dotnet/index.json";
 
         private const string FeedInternalForChecksums = "https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json";
-        private const string FeedInternalForInstallers = "https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json";
+        public const string FeedInternalForInstallers = "https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json";
+
+        public const string FeedStagingForInstallers = "https://dotnetbuilds.blob.core.windows.net/public";
+        public const string FeedStagingForChecksums = "https://dotnetbuilds.blob.core.windows.net/public-checksums";
+
+        public const string FeedStagingInternalForInstallers = "https://dotnetbuilds.blob.core.windows.net/internal";
+        public const string FeedStagingInternalForChecksums = "https://dotnetbuilds.blob.core.windows.net/internal-checksums";
 
         private const string FeedGeneralTesting = "https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json";
-        private const string FeedGeneralTestingSymbols = "https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json";
 
         private const string FeedDotNetExperimental = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json";
-        private const string FeedDotNetExperimentalSymbols = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json";
 
-        private const string FeedDotNetEngShipping = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json";
-        private const string FeedDotNetEngTransport = FeedDotNetEngShipping;
-        private const string FeedDotNetEngSymbols = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json";
+        private const string FeedDotNetEng = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json";
 
-        private const string FeedDotNetToolsShipping = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json";
-        private const string FeedDotNetToolsTransport = FeedDotNetToolsShipping;
-        private const string FeedDotNetToolsSymbols = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json";
+        private const string FeedDotNetTools = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json";
 
-        private const string FeedDotNetToolsInternalShipping = "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json";
-        private const string FeedDotNetToolsInternalTransport = FeedDotNetToolsInternalShipping;
-        private const string FeedDotNetToolsInternalSymbols = "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json";
+        private const string FeedDotNetToolsInternal = "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json";
 
         private const string FeedDotNet31Shipping = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json";
         private const string FeedDotNet31Transport = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json";
-        private const string FeedDotNet31Symbols = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json";
 
         private const string FeedDotNet31InternalShipping = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-internal/nuget/v3/index.json";
         private const string FeedDotNet31InternalTransport = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json";
-        private const string FeedDotNet31InternalSymbols = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json";
 
-        private const string FeedDotNet31BlazorShipping = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json";
-        private const string FeedDotNet31BlazorTransport = FeedDotNet31BlazorShipping;
-        private const string FeedDotNet31BlazorSymbols = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json";
+        private const string FeedDotNet31Blazor = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json";
 
-        private const string FeedDotNet5Shipping = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json";
-        private const string FeedDotNet5Transport = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json";
-        private const string FeedDotNet5Symbols = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json";
+        public const string FeedDotNet5Shipping = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json";
+        public const string FeedDotNet5Transport = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json";
 
         private const string FeedDotNet6Shipping = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json";
         private const string FeedDotNet6Transport = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json";
-        private const string FeedDotNet6Symbols = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json";
+
+        private const string FeedDotNet7Shipping = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json";
+        private const string FeedDotNet7Transport = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json";
+
+        private const string FeedDotNet6InternalShipping = "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v3/index.json";
+        private const string FeedDotNet6InternalTransport = "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v3/index.json";
 
         private const string FeedDotNet5InternalShipping = "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json";
         private const string FeedDotNet5InternalTransport = "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json";
-        private const string FeedDotNet5InternalSymbols = "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json";
 
         private const string FeedDotNetLibrariesShipping = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json";
         private const string FeedDotNetLibrariesTransport = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json";
-        private const string FeedDotNetLibrariesSymbols = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-symbols/nuget/v3/index.json";
 
         private const string FeedGeneralTestingInternal = "https://pkgs.dev.azure.com/dnceng/internal/_packaging/general-testing-internal/nuget/v3/index.json";
-        private const string FeedGeneralTestingInternalSymbols = "https://pkgs.dev.azure.com/dnceng/internal/_packaging/general-testing-internal/nuget/v3/index.json";
 
         private const SymbolTargetType InternalSymbolTargets = SymbolTargetType.SymWeb;
         private const SymbolTargetType PublicAndInternalSymbolTargets = SymbolTargetType.Msdl | SymbolTargetType.SymWeb;
@@ -114,186 +137,308 @@ public enum BuildQuality
             "MergedManifest.xml"
         };
 
+        private static TargetFeedSpecification[] DotNet31Feeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNet31Shipping, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNet31Transport, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedForInstallers),
+            (TargetFeedContentType.Checksum, FeedForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNet31InternalFeeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNet31InternalShipping, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNet31InternalTransport, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedInternalForInstallers),
+            (TargetFeedContentType.Checksum, FeedInternalForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNet31BlazorFeeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNet31Blazor, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNet31Blazor, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedInternalForInstallers),
+            (TargetFeedContentType.Checksum, FeedInternalForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNet5Feeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNet5Shipping, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNet5Transport, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedForInstallers),
+            (TargetFeedContentType.Checksum, FeedForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNet5InternalFeeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNet5InternalShipping, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNet5InternalTransport, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedInternalForInstallers),
+            (TargetFeedContentType.Checksum, FeedInternalForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNet6Feeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNet6Shipping, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNet6Transport, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedStagingForInstallers),
+            (TargetFeedContentType.Checksum, FeedStagingForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNet6InternalFeeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNet6InternalShipping, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNet6InternalTransport, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedStagingInternalForInstallers),
+            (TargetFeedContentType.Checksum, FeedStagingInternalForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNet7Feeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNet7Shipping, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNet7Transport, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedStagingForInstallers),
+            (TargetFeedContentType.Checksum, FeedStagingForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNetEngFeeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNetEng, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNetEng, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedStagingForInstallers),
+            (TargetFeedContentType.Checksum, FeedStagingForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNetToolsFeeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNetTools, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNetTools, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedStagingForInstallers),
+            (TargetFeedContentType.Checksum, FeedStagingForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNetToolsInternalFeeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNetToolsInternal, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNetToolsInternal, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedStagingInternalForInstallers),
+            (TargetFeedContentType.Checksum, FeedStagingInternalForChecksums),
+        };
+
+        private static TargetFeedSpecification[] DotNetExperimentalFeeds =
+        {
+            (TargetFeedContentType.Package, FeedDotNetExperimental, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedDotNetExperimental, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedStagingForInstallers),
+            (TargetFeedContentType.Checksum, FeedStagingForChecksums),
+        };
+
+        private static TargetFeedSpecification[] GeneralTestingFeeds =
+        {
+            (TargetFeedContentType.Package, FeedGeneralTesting, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedGeneralTesting, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedStagingForInstallers),
+            (TargetFeedContentType.Checksum, FeedStagingForChecksums),
+        };
+
+        private static TargetFeedSpecification[] GeneralTestingInternalFeeds =
+        {
+            (TargetFeedContentType.Package, FeedGeneralTestingInternal, AssetSelection.ShippingOnly),
+            (TargetFeedContentType.Package, FeedGeneralTestingInternal, AssetSelection.NonShippingOnly),
+            (InstallersAndSymbols, FeedStagingInternalForInstallers),
+            (TargetFeedContentType.Checksum, FeedStagingInternalForChecksums),
+        };
+        #endregion
+
+        #region Target Channel Configs
         public static readonly List<TargetChannelConfig> ChannelInfos = new List<TargetChannelConfig>() {
             // ".NET 5 Dev",
             new TargetChannelConfig(
                 131,
                 false,
                 PublishingInfraVersion.All,
-                "5.0",
-                FeedDotNet5Shipping,
-                FeedDotNet5Transport,
-                FeedDotNet5Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "5.0" },
+                DotNet5Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6",
+            // ".NET 7",
             new TargetChannelConfig(
-                1296,
+                2236,
                 false,
                 PublishingInfraVersion.All,
-                "6.0",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "7.0" },
+                DotNet7Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6 SDK 6.0.1xx",
+            // ".NET 7 SDK 7.0.1xx",
             new TargetChannelConfig(
-                1792,
+                2237,
+                false,
+                PublishingInfraVersion.All,
+                new List<string>() { "7.0.1xx", "7.0" },
+                DotNet7Feeds,
+                PublicAndInternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude),
+
+            // ".NET 7 preview 1",
+            new TargetChannelConfig(
+                2543,
+                false,
+                PublishingInfraVersion.All,
+                new List<string>() { "7.0-preview1" },
+                DotNet7Feeds,
+                PublicAndInternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude),
+
+            // ".NET 7 SDK 7.0.1xx Preview 1",
+            new TargetChannelConfig(
+                2546,
                 false,
                 PublishingInfraVersion.All,
-                "6.0.1xx",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "7.0.1xx-preview1", "7.0-preview1" },
+                DotNet7Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6 Preview 1",
+            // ".NET 7 preview 2",
             new TargetChannelConfig(
-                1670,
+                2544,
                 false,
                 PublishingInfraVersion.All,
-                "6.0-preview1",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "7.0-preview2" },
+                DotNet7Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6 Preview 2" ,
+            // ".NET 7 SDK 7.0.1xx Preview 2",
             new TargetChannelConfig(
-                1752,
+                2547,
                 false,
                 PublishingInfraVersion.All,
-                "6.0-preview2",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "7.0.1xx-preview2", "7.0-preview2" },
+                DotNet7Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6.0.1xx SDK Preview 2",
+            // ".NET 7 preview 3",
             new TargetChannelConfig(
-                1753,
+                2545,
                 false,
                 PublishingInfraVersion.All,
-                "6.0.1xx-preview2",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "7.0-preview3" },
+                DotNet7Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6 Preview 3" ,
+            // ".NET 7 SDK 7.0.1xx Preview 3",
             new TargetChannelConfig(
-                1850,
+                2548,
                 false,
                 PublishingInfraVersion.All,
-                "6.0-preview3",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "7.0.1xx-preview3", "7.0-preview3" },
+                DotNet7Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6.0.1xx SDK Preview 3",
+            // ".NET 6",
             new TargetChannelConfig(
-                1847,
+                1296,
                 false,
                 PublishingInfraVersion.All,
-                "6.0.1xx-preview3",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "6.0" },
+                DotNet6Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6 Preview 4" ,
+            // ".NET 6 Internal",
             new TargetChannelConfig(
-                1851,
+                2097,
+                true,
+                PublishingInfraVersion.All,
+                new List<string>() { "internal/6.0" },
+                DotNet6InternalFeeds,
+                InternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude),
+                
+            // ".NET 6 MAUI",
+            new TargetChannelConfig(
+                2453,
                 false,
                 PublishingInfraVersion.All,
-                "6.0-preview4",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "maui/6.0" },
+                DotNet6Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6.0.1xx SDK Preview 4",
+            // ".NET 6 SDK 6.0.1xx",
             new TargetChannelConfig(
-                1848,
+                1792,
                 false,
                 PublishingInfraVersion.All,
-                "6.0.1xx-preview4",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "6.0.1xx" },
+                DotNet6Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6 Preview 5" ,
+            // ".NET 6 SDK 6.0.1xx Internal",
             new TargetChannelConfig(
-                1852,
+                2098,
+                true,
+                PublishingInfraVersion.All,
+                new List<string>() { "internal/6.0.1xx" },
+                DotNet6InternalFeeds,
+                InternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude),
+            
+            // ".NET 6 SDK 6.0.2xx",
+            new TargetChannelConfig(
+                2434,
                 false,
                 PublishingInfraVersion.All,
-                "6.0-preview5",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "6.0.2xx" },
+                DotNet6Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
-            // ".NET 6.0.1xx SDK Preview 5",
+            // ".NET 6 SDK 6.0.2xx Internal",
+            new TargetChannelConfig(
+                2435,
+                true,
+                PublishingInfraVersion.All,
+                new List<string>() { "internal/6.0.2xx" },
+                DotNet6InternalFeeds,
+                InternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude),
+
+            // ".NET 6 SDK 6.0.3xx",
             new TargetChannelConfig(
-                1849,
+                2551,
                 false,
                 PublishingInfraVersion.All,
-                "6.0.1xx-preview5",
-                FeedDotNet6Shipping,
-                FeedDotNet6Transport,
-                FeedDotNet6Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "6.0.3xx", "6.0" },
+                DotNet6Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
+            // ".NET 6 SDK 6.0.3xx Internal",
+            new TargetChannelConfig(
+                2552,
+                true,
+                PublishingInfraVersion.All,
+                new List<string>() { "internal/6.0.3xx", "internal/6.0" },
+                DotNet6InternalFeeds,
+                InternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude),
+
             // ".NET 5" (public),
             new TargetChannelConfig(
                 1299,
                 false,
                 PublishingInfraVersion.Next,
-                akaMSChannelName: "5.0",
-                FeedDotNet5Shipping,
-                FeedDotNet5Transport,
-                FeedDotNet5Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "5.0" },
+                DotNet5Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -302,12 +447,8 @@ public enum BuildQuality
                 1300,
                 true,
                 PublishingInfraVersion.Next,
-                akaMSChannelName: "internal/5.0",
-                FeedDotNet5InternalShipping,
-                FeedDotNet5InternalTransport,
-                FeedDotNet5InternalSymbols,
-                FeedInternalForChecksums,
-                FeedInternalForInstallers,
+                akaMSChannelNames: new List<string>() { "internal/5.0" },
+                DotNet5InternalFeeds,
                 InternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -316,12 +457,8 @@ public enum BuildQuality
                 1297,
                 false,
                 PublishingInfraVersion.Next,
-                akaMSChannelName: "5.0.1xx",
-                FeedDotNet5Shipping,
-                FeedDotNet5Transport,
-                FeedDotNet5Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "5.0.1xx" },
+                DotNet5Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -330,13 +467,9 @@ public enum BuildQuality
                 1298,
                 true,
                 PublishingInfraVersion.Next,
-                akaMSChannelName: "internal/5.0.1xx",
-                FeedDotNet5InternalShipping,
-                FeedDotNet5InternalTransport,
-                FeedDotNet5InternalSymbols,
-                FeedInternalForChecksums,
-                FeedInternalForInstallers,
-                PublicAndInternalSymbolTargets,
+                akaMSChannelNames: new List<string>() { "internal/5.0.1xx" },
+                DotNet5InternalFeeds,
+                InternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
             // ".NET 5 SDK 5.0.2xx" (public),
@@ -344,12 +477,8 @@ public enum BuildQuality
                 1518,
                 false,
                 PublishingInfraVersion.Next,
-                akaMSChannelName: "5.0.2xx",
-                FeedDotNet5Shipping,
-                FeedDotNet5Transport,
-                FeedDotNet5Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "5.0.2xx" },
+                DotNet5Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -358,12 +487,8 @@ public enum BuildQuality
                 1519,
                 true,
                 PublishingInfraVersion.Next,
-                akaMSChannelName: "internal/5.0.2xx",
-                FeedDotNet5InternalShipping,
-                FeedDotNet5InternalTransport,
-                FeedDotNet5InternalSymbols,
-                FeedInternalForChecksums,
-                FeedInternalForInstallers,
+                akaMSChannelNames: new List<string>() { "internal/5.0.2xx" },
+                DotNet5InternalFeeds,
                 InternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -372,12 +497,8 @@ public enum BuildQuality
                 1754,
                 false,
                 PublishingInfraVersion.Next,
-                akaMSChannelName: "5.0.3xx",
-                FeedDotNet5Shipping,
-                FeedDotNet5Transport,
-                FeedDotNet5Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "5.0.3xx" },
+                DotNet5Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -386,12 +507,28 @@ public enum BuildQuality
                 1755,
                 true,
                 PublishingInfraVersion.Next,
-                akaMSChannelName: "internal/5.0.3xx",
-                FeedDotNet5InternalShipping,
-                FeedDotNet5InternalTransport,
-                FeedDotNet5InternalSymbols,
-                FeedInternalForChecksums,
-                FeedInternalForInstallers,
+                akaMSChannelNames: new List<string>() { "internal/5.0.3xx" },
+                DotNet5InternalFeeds,
+                InternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude),
+
+            // ".NET 5 SDK 5.0.4xx" (public),
+            new TargetChannelConfig(
+                1985,
+                false,
+                PublishingInfraVersion.Next,
+                akaMSChannelNames: new List<string>() { "5.0.4xx", "5.0" },
+                DotNet5Feeds,
+                PublicAndInternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude),
+
+            // ".NET 5 SDK 5.0.4xx Internal" (internal),
+            new TargetChannelConfig(
+                1986,
+                true,
+                PublishingInfraVersion.Next,
+                akaMSChannelNames: new List<string>() { "internal/5.0.4xx" },
+                DotNet5InternalFeeds,
                 InternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -400,12 +537,8 @@ public enum BuildQuality
                 2,
                 false,
                 PublishingInfraVersion.All,
-                "eng",
-                FeedDotNetEngShipping,
-                FeedDotNetEngTransport,
-                FeedDotNetEngSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "eng" },
+                DotNetEngFeeds,
                 PublicAndInternalSymbolTargets,
                 flatten: false),
 
@@ -414,26 +547,28 @@ public enum BuildQuality
                 1495,
                 false,
                 PublishingInfraVersion.Next,
-                "eng/net5",
-                FeedDotNetEngShipping,
-                FeedDotNetEngTransport,
-                FeedDotNetEngSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "eng/net5" },
+                DotNetEngFeeds,
                 PublicAndInternalSymbolTargets,
                 flatten: false),
 
+            // ".NET 6 Eng",
+            new TargetChannelConfig(
+                2293,
+                false,
+                PublishingInfraVersion.Next,
+                new List<string>() { "eng/net6" },
+                DotNetEngFeeds,
+                PublicAndInternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude),
+
             // ".NET Eng - Validation",
             new TargetChannelConfig(
                 9,
                 false,
                 PublishingInfraVersion.All,
-                "eng/validation",
-                FeedDotNetEngShipping,
-                FeedDotNetEngTransport,
-                FeedDotNetEngSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "eng/validation" },
+                DotNetEngFeeds,
                 PublicAndInternalSymbolTargets,
                 flatten: false),
 
@@ -442,12 +577,18 @@ public enum BuildQuality
                 1496,
                 false,
                 PublishingInfraVersion.Next,
-                "eng/net5validation",
-                FeedDotNetEngShipping,
-                FeedDotNetEngTransport,
-                FeedDotNetEngSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "eng/net5validation" },
+                DotNetEngFeeds,
+                PublicAndInternalSymbolTargets,
+                flatten: false),
+
+            // ".NET 6 Eng - Validation",
+            new TargetChannelConfig(
+                2294,
+                false,
+                PublishingInfraVersion.Next,
+                new List<string>() { "eng/net6validation" },
+                DotNetEngFeeds,
                 PublicAndInternalSymbolTargets,
                 flatten: false),
 
@@ -456,12 +597,8 @@ public enum BuildQuality
                 529,
                 false,
                 PublishingInfraVersion.All,
-                "generaltesting",
-                FeedGeneralTesting,
-                FeedGeneralTesting,
-                FeedGeneralTestingSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>() { "generaltesting" },
+                GeneralTestingFeeds,
                 PublicAndInternalSymbolTargets),
 
             // "General Testing Internal",
@@ -469,12 +606,8 @@ public enum BuildQuality
                 1647,
                 true,
                 PublishingInfraVersion.All,
-                "generaltestinginternal",
-                FeedGeneralTestingInternal,
-                FeedGeneralTestingInternal,
-                FeedGeneralTestingInternalSymbols,
-                FeedInternalForChecksums,
-                FeedInternalForInstallers,
+                new List<string>() { "generaltestinginternal" },
+                GeneralTestingInternalFeeds,
                 InternalSymbolTargets),
 
             // ".NET Core Tooling Dev",
@@ -482,12 +615,8 @@ public enum BuildQuality
                 548,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -497,12 +626,8 @@ public enum BuildQuality
                 549,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -512,13 +637,9 @@ public enum BuildQuality
                 551,
                 true,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetToolsInternalShipping,
-                FeedDotNetToolsInternalTransport,
-                FeedDotNetToolsInternalSymbols,
-                FeedInternalForChecksums,
-                FeedInternalForInstallers,
-                PublicAndInternalSymbolTargets,
+                akaMSChannelNames: new List<string>(),
+                DotNetToolsInternalFeeds,
+                InternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
 
@@ -527,12 +648,8 @@ public enum BuildQuality
                 562,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetExperimental,
-                FeedDotNetExperimental,
-                FeedDotNetExperimentalSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                DotNetExperimentalFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -542,12 +659,8 @@ public enum BuildQuality
                 678,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetEngShipping,
-                FeedDotNetEngTransport,
-                FeedDotNetEngSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                DotNetEngFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -557,12 +670,8 @@ public enum BuildQuality
                 679,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetEngShipping,
-                FeedDotNetEngTransport,
-                FeedDotNetEngSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                DotNetEngFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -572,12 +681,8 @@ public enum BuildQuality
                 344,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetEngShipping,
-                FeedDotNetEngTransport,
-                FeedDotNetEngSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                DotNetEngFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -587,12 +692,8 @@ public enum BuildQuality
                 390,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetEngShipping,
-                FeedDotNetEngTransport,
-                FeedDotNetEngSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                DotNetEngFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -602,12 +703,8 @@ public enum BuildQuality
                 548,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -617,12 +714,8 @@ public enum BuildQuality
                 549,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -632,12 +725,8 @@ public enum BuildQuality
                 128,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "3.1",
-                FeedDotNet31Shipping,
-                FeedDotNet31Transport,
-                FeedDotNet31Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "3.1" },
+                DotNet31Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -646,12 +735,8 @@ public enum BuildQuality
                 129,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "3.1",
-                FeedDotNet31Shipping,
-                FeedDotNet31Transport,
-                FeedDotNet31Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "3.1" },
+                DotNet31Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -660,12 +745,8 @@ public enum BuildQuality
                 558,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "3.1.2xx",
-                FeedDotNet31Shipping,
-                FeedDotNet31Transport,
-                FeedDotNet31Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "3.1.2xx" },
+                DotNet31Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -674,12 +755,8 @@ public enum BuildQuality
                 560,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "3.1.1xx",
-                FeedDotNet31Shipping,
-                FeedDotNet31Transport,
-                FeedDotNet31Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "3.1.1xx" },
+                DotNet31Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -688,12 +765,8 @@ public enum BuildQuality
                 759,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "3.1.3xx",
-                FeedDotNet31Shipping,
-                FeedDotNet31Transport,
-                FeedDotNet31Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "3.1.3xx" },
+                DotNet31Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -702,12 +775,8 @@ public enum BuildQuality
                 921,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "3.1.4xx",
-                FeedDotNet31Shipping,
-                FeedDotNet31Transport,
-                FeedDotNet31Symbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "3.1.4xx" },
+                DotNet31Feeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -716,12 +785,8 @@ public enum BuildQuality
                 760,
                 true,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "internal/3.1.3xx",
-                FeedDotNet31InternalShipping,
-                FeedDotNet31InternalTransport,
-                FeedDotNet31InternalSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "internal/3.1.3xx" },
+                DotNet31InternalFeeds,
                 InternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -730,12 +795,8 @@ public enum BuildQuality
                 550,
                 true,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "internal/3.1",
-                FeedDotNet31InternalShipping,
-                FeedDotNet31InternalTransport,
-                FeedDotNet31InternalSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "internal/3.1" },
+                DotNet31InternalFeeds,
                 InternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -744,12 +805,8 @@ public enum BuildQuality
                 557,
                 true,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "internal/3.1.2xx",
-                FeedDotNet31InternalShipping,
-                FeedDotNet31InternalTransport,
-                FeedDotNet31InternalSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "internal/3.1.2xx" },
+                DotNet31InternalFeeds,
                 InternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -758,12 +815,8 @@ public enum BuildQuality
                 559,
                 true,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "internal/3.1.1xx",
-                FeedDotNet31InternalShipping,
-                FeedDotNet31InternalTransport,
-                FeedDotNet31InternalSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "internal/3.1.1xx" },
+                DotNet31InternalFeeds,
                 InternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -772,12 +825,8 @@ public enum BuildQuality
                 922,
                 true,
                 PublishingInfraVersion.All,
-                akaMSChannelName: "internal/3.1.4xx",
-                FeedDotNet31InternalShipping,
-                FeedDotNet31InternalTransport,
-                FeedDotNet31InternalSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>() { "internal/3.1.4xx" },
+                DotNet31InternalFeeds,
                 InternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -786,12 +835,8 @@ public enum BuildQuality
                 531,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNet31BlazorShipping,
-                FeedDotNet31BlazorTransport,
-                FeedDotNet31BlazorSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                DotNet31BlazorFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude),
 
@@ -800,12 +845,8 @@ public enum BuildQuality
                 1010,
                 false,
                 PublishingInfraVersion.All,
-                string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -815,12 +856,8 @@ public enum BuildQuality
                 1011,
                 false,
                 PublishingInfraVersion.All,
-                string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -830,12 +867,8 @@ public enum BuildQuality
                 1154,
                 false,
                 PublishingInfraVersion.All,
-                string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -845,12 +878,8 @@ public enum BuildQuality
                 1473,
                 false,
                 PublishingInfraVersion.All,
-                string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -860,12 +889,19 @@ public enum BuildQuality
                 1692,
                 false,
                 PublishingInfraVersion.All,
-                string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>(),
+                DotNetToolsFeeds,
+                PublicAndInternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude,
+                flatten: false),
+
+            // "VS 16.11",
+            new TargetChannelConfig(
+                1926,
+                false,
+                PublishingInfraVersion.All,
+                new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -875,27 +911,30 @@ public enum BuildQuality
                 1853,
                 false,
                 PublishingInfraVersion.All,
-                string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>(),
+                DotNetToolsFeeds,
+                PublicAndInternalSymbolTargets,
+                filenamesToExclude: FilenamesToExclude,
+                flatten: false),
+
+            // "VS 17.1",
+            new TargetChannelConfig(
+                2346,
+                false,
+                PublishingInfraVersion.All,
+                new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
 
-            // "VS Master",
+            // "VS 17.2",
             new TargetChannelConfig(
-                1012,
+                2542,
                 false,
                 PublishingInfraVersion.All,
-                string.Empty,
-                FeedDotNetToolsShipping,
-                FeedDotNetToolsTransport,
-                FeedDotNetToolsSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                new List<string>(),
+                DotNetToolsFeeds,
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
@@ -905,12 +944,14 @@ public enum BuildQuality
                 1648,
                 false,
                 PublishingInfraVersion.All,
-                akaMSChannelName: string.Empty,
-                FeedDotNetLibrariesShipping,
-                FeedDotNetLibrariesTransport,
-                FeedDotNetLibrariesSymbols,
-                FeedForChecksums,
-                FeedForInstallers,
+                akaMSChannelNames: new List<string>(),
+                new TargetFeedSpecification[]
+                {
+                    (TargetFeedContentType.Package, FeedDotNetLibrariesShipping, AssetSelection.ShippingOnly),
+                    (TargetFeedContentType.Package, FeedDotNetLibrariesTransport, AssetSelection.NonShippingOnly),
+                    (InstallersAndSymbols, FeedForInstallers),
+                    (TargetFeedContentType.Checksum, FeedForChecksums),
+                },
                 PublicAndInternalSymbolTargets,
                 filenamesToExclude: FilenamesToExclude,
                 flatten: false),
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigBase.cs
index dea97dd76e0..c94eefb6195 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigBase.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigBase.cs
@@ -21,7 +21,7 @@ public abstract class SetupTargetFeedConfigBase
         protected string AzureDevOpsStaticShippingFeed { get; set; }
         protected string AzureDevOpsStaticTransportFeed { get; set; }
         protected string AzureDevOpsStaticSymbolsFeed { get; set; }
-        protected string LatestLinkShortUrlPrefix { get; set; }
+        protected List<string> LatestLinkShortUrlPrefixes { get; set; }
         protected string AzureDevOpsFeedsKey { get; set; }
 
         protected SetupTargetFeedConfigBase(bool isInternalBuild,
@@ -37,7 +37,7 @@ protected SetupTargetFeedConfigBase(bool isInternalBuild,
             string azureDevOpsStaticShippingFeed,
             string azureDevOpsStaticTransportFeed,
             string azureDevOpsStaticSymbolsFeed,
-            string latestLinkShortUrlPrefix,
+            List<string> latestLinkShortUrlPrefixes,
             string azureDevOpsFeedsKey)
         {
             IsInternalBuild = isInternalBuild;
@@ -53,7 +53,7 @@ protected SetupTargetFeedConfigBase(bool isInternalBuild,
             AzureDevOpsStaticShippingFeed = azureDevOpsStaticShippingFeed;
             AzureDevOpsStaticTransportFeed = azureDevOpsStaticTransportFeed;
             AzureDevOpsStaticSymbolsFeed = azureDevOpsStaticSymbolsFeed;
-            LatestLinkShortUrlPrefix = latestLinkShortUrlPrefix;
+            LatestLinkShortUrlPrefixes = latestLinkShortUrlPrefixes;
             AzureDevOpsFeedsKey = azureDevOpsFeedsKey;
         }
         public abstract List<TargetFeedConfig> Setup();
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigV3.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigV3.cs
index 58eb22fb996..d644ee9f6d0 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigV3.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/SetupTargetFeedConfigV3.cs
@@ -3,25 +3,18 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
 using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
 using Microsoft.DotNet.Build.Tasks.Feed.Model;
 
 namespace Microsoft.DotNet.Build.Tasks.Feed
 {
     public class SetupTargetFeedConfigV3 : SetupTargetFeedConfigBase
     {
-        private readonly List<TargetFeedContentType> Installers = new List<TargetFeedContentType>() {
-            TargetFeedContentType.OSX,
-            TargetFeedContentType.Deb,
-            TargetFeedContentType.Rpm,
-            TargetFeedContentType.Node,
-            TargetFeedContentType.BinaryLayout,
-            TargetFeedContentType.Installer,
-            TargetFeedContentType.Maven,
-            TargetFeedContentType.VSIX,
-            TargetFeedContentType.Badge,
-            TargetFeedContentType.Other
-        };
+        private readonly TargetChannelConfig _targetChannelConfig;
 
         private IBuildEngine BuildEngine { get; }
         
@@ -29,167 +22,209 @@ public class SetupTargetFeedConfigV3 : SetupTargetFeedConfigBase
         
         private string StableSymbolsFeed { get; set; }
 
-        private SymbolTargetType SymbolTargetType { get; set; }
+        private SymbolTargetType SymbolTargetType { get; }
 
-        private List<string> FilesToExclude { get; }
+        private ImmutableList<string> FilesToExclude { get; }
 
         private bool Flatten { get; }
 
-        public SetupTargetFeedConfigV3(bool isInternalBuild,
+        public TaskLoggingHelper Log { get; }
+
+        public string AzureDevOpsOrg => "dnceng";
+
+        public SetupTargetFeedConfigV3(
+            TargetChannelConfig targetChannelConfig,
+            bool isInternalBuild,
             bool isStableBuild,
             string repositoryName,
             string commitSha,
-            string azureStorageTargetFeedPAT,
             bool publishInstallersAndChecksums,
-            string installersTargetStaticFeed,
-            string installersAzureAccountKey,
-            string checksumsTargetStaticFeed,
-            string checksumsAzureAccountKey,
-            string azureDevOpsStaticShippingFeed,
-            string azureDevOpsStaticTransportFeed,
-            string azureDevOpsStaticSymbolsFeed,
-            string latestLinkShortUrlPrefix,
-            string azureDevOpsFeedsKey,
+            ITaskItem[] feedKeys,
+            ITaskItem[] feedSasUris,
+            ITaskItem[] feedOverrides,
+            List<string> latestLinkShortUrlPrefixes,
             IBuildEngine buildEngine,
             SymbolTargetType symbolTargetType,
             string stablePackagesFeed = null,
             string stableSymbolsFeed = null,
-            List<string> filesToExclude = null,
-            bool flatten = true) 
-            : base(isInternalBuild, isStableBuild, repositoryName, commitSha, azureStorageTargetFeedPAT, publishInstallersAndChecksums, installersTargetStaticFeed, installersAzureAccountKey, checksumsTargetStaticFeed, checksumsAzureAccountKey, azureDevOpsStaticShippingFeed, azureDevOpsStaticTransportFeed, azureDevOpsStaticSymbolsFeed, latestLinkShortUrlPrefix, azureDevOpsFeedsKey)
+            ImmutableList<string> filesToExclude = null,
+            bool flatten = true,
+            TaskLoggingHelper log = null) 
+            : base(isInternalBuild, isStableBuild, repositoryName, commitSha, null, publishInstallersAndChecksums, null, null, null, null, null, null, null, latestLinkShortUrlPrefixes, null)
         {
+            _targetChannelConfig = targetChannelConfig;
             BuildEngine = buildEngine;
             StableSymbolsFeed = stableSymbolsFeed;
             StablePackagesFeed = stablePackagesFeed;
             SymbolTargetType = symbolTargetType;
-            FilesToExclude = filesToExclude ?? new List<string>();
+            FilesToExclude = filesToExclude ?? ImmutableList<string>.Empty;
             Flatten = flatten;
+            FeedKeys = feedKeys.ToImmutableDictionary(i => i.ItemSpec, i => i.GetMetadata("Key"));
+            FeedSasUris = feedSasUris.ToImmutableDictionary(i => i.ItemSpec, i => ConvertFromBase64(i.GetMetadata("Base64Uri")));
+            FeedOverrides = feedOverrides.ToImmutableDictionary(i => i.ItemSpec, i => i.GetMetadata("Replacement"));
+            AzureDevOpsFeedsKey = FeedKeys.TryGetValue("https://pkgs.dev.azure.com/dnceng", out string key) ? key : null;
+            Log = log;
         }
 
-        public override List<TargetFeedConfig> Setup()
+        private static string ConvertFromBase64(string value)
         {
-            if (string.IsNullOrEmpty(InstallersAzureAccountKey))
+            if (value == null)
             {
-                throw new ArgumentException("Parameters 'InstallersAzureAccountKey' is empty.");
+                return null;
             }
+            return Encoding.UTF8.GetString(Convert.FromBase64String(value));
+        }
 
-            if (string.IsNullOrEmpty(ChecksumsAzureAccountKey))
-            {
-                throw new ArgumentException("Parameters 'ChecksumsAzureAccountKey' is empty.");
-            }
+        public ImmutableDictionary<string, string> FeedOverrides { get; set; }
 
-            if (IsStableBuild)
-            {
-                return StableFeeds();
-            }
-            else
-            {
-                return NonStableFeeds();
-            }
-        }
+        public ImmutableDictionary<string, string> FeedSasUris { get; set; }
+
+        public ImmutableDictionary<string, string> FeedKeys { get; set; }
 
-        private List<TargetFeedConfig> NonStableFeeds()
+        public override List<TargetFeedConfig> Setup()
         {
-            List<TargetFeedConfig> targetFeedConfigs = new List<TargetFeedConfig>();
+            return Feeds().Distinct().ToList();
+        }
 
-            if (PublishInstallersAndChecksums)
+        private IEnumerable<TargetFeedConfig> Feeds()
+        {
+            // If the build is stable, we need to create two new feeds (if not provided)
+            // that can contain stable packages. These packages cannot be pushed to the normal
+            // feeds specified in the feed config because it would mean pushing the same package more than once
+            // to the same feed on successive builds, which is not allowed.
+            if (IsStableBuild)
             {
-                foreach (var contentType in Installers)
-                {
-                    targetFeedConfigs.Add(
-                        new TargetFeedConfig(
-                            contentType,
-                            InstallersTargetStaticFeed,
-                            FeedType.AzureStorageFeed,
-                            InstallersAzureAccountKey,
-                            latestLinkShortUrlPrefix: LatestLinkShortUrlPrefix,
-                            @internal: IsInternalBuild,
-                            symbolTargetType: SymbolTargetType,
-                            filenamesToExclude: FilesToExclude,
-                            flatten: Flatten));
-                }
+                CreateStablePackagesFeedIfNeeded();
+                CreateStableSymbolsFeedIfNeeded();
 
-                targetFeedConfigs.Add(
-                    new TargetFeedConfig(
-                        TargetFeedContentType.Checksum,
-                        ChecksumsTargetStaticFeed,
-                        FeedType.AzureStorageFeed,
-                        ChecksumsAzureAccountKey,
-                        latestLinkShortUrlPrefix: LatestLinkShortUrlPrefix,
-                        @internal: IsInternalBuild,
-                        symbolTargetType: SymbolTargetType,
-                        filenamesToExclude: FilesToExclude,
-                        flatten: Flatten));
-            }
-
-            targetFeedConfigs.Add(
-                new TargetFeedConfig(
+                yield return new TargetFeedConfig(
                     TargetFeedContentType.Package,
-                    AzureDevOpsStaticShippingFeed,
+                    StablePackagesFeed,
                     FeedType.AzDoNugetFeed,
                     AzureDevOpsFeedsKey,
+                    LatestLinkShortUrlPrefixes,
                     assetSelection: AssetSelection.ShippingOnly,
-                    @internal: IsInternalBuild,
                     symbolTargetType: SymbolTargetType,
+                    isolated: true,
+                    @internal: IsInternalBuild,
                     filenamesToExclude: FilesToExclude,
-                    flatten: Flatten));
+                    flatten: Flatten);
 
-            targetFeedConfigs.Add(
-                new TargetFeedConfig(
-                    TargetFeedContentType.Package,
-                    AzureDevOpsStaticTransportFeed,
+                yield return new TargetFeedConfig(
+                    TargetFeedContentType.Symbols,
+                    StableSymbolsFeed,
                     FeedType.AzDoNugetFeed,
                     AzureDevOpsFeedsKey,
-                    assetSelection: AssetSelection.NonShippingOnly,
-                    @internal: IsInternalBuild,
+                    LatestLinkShortUrlPrefixes,
                     symbolTargetType: SymbolTargetType,
+                    isolated: true,
+                    @internal: IsInternalBuild,
                     filenamesToExclude: FilesToExclude,
-                    flatten: Flatten));
-
-            // For symbols, we don't have a blob location where internal symbols can go today,
-            // so a feed is used in this case. This would be a potential performance improvement for internal builds.
-            // This is pretty uncommon though, as non-stable internal builds are quite rare.
-            string symbolsFeed;
-            FeedType symbolsFeedType;
-            string symbolsFeedSecret;
+                    flatten: Flatten);
+            }
 
-            if (IsInternalBuild)
+            foreach (var spec in _targetChannelConfig.TargetFeeds)
             {
-                symbolsFeed = AzureDevOpsStaticSymbolsFeed;
-                symbolsFeedType = FeedType.AzDoNugetFeed;
-                symbolsFeedSecret = AzureDevOpsFeedsKey;
+                foreach (var type in spec.ContentTypes)
+                {
+                    if (!PublishInstallersAndChecksums)
+                    {
+                        if (PublishingConstants.InstallersAndChecksums.Contains(type))
+                        {
+                            continue;
+                        }
+                    }
+
+                    // If dealing with a stable build, the package feed targeted for shipping packages and symbols
+                    // should be skipped, as it is added above.
+                    if (IsStableBuild && ((type is TargetFeedContentType.Package && spec.Assets == AssetSelection.ShippingOnly) || type is TargetFeedContentType.Symbols))
+                    {
+                        continue;
+                    }
+
+                    var oldFeed = spec.FeedUrl;
+                    var feed = GetFeedOverride(oldFeed);
+                    if (type is TargetFeedContentType.Package &&
+                        spec.Assets == AssetSelection.NonShippingOnly &&
+                        FeedOverrides.TryGetValue("transport-packages", out string newFeed))
+                    {
+                        feed = newFeed;
+                    }
+                    else if (type is TargetFeedContentType.Package &&
+                        spec.Assets == AssetSelection.ShippingOnly &&
+                        FeedOverrides.TryGetValue("shipping-packages", out newFeed))
+                    {
+                        feed = newFeed;
+                    }
+                    var key = GetFeedKey(feed);
+                    var sasUri = GetFeedSasUri(feed);
+                    if (feed != oldFeed && string.IsNullOrEmpty(key) && string.IsNullOrEmpty(sasUri))
+                    {
+                        Log?.LogWarning($"No keys found for {feed}, unable to publish to it.");
+                        continue;
+                    }
+                    var feedType = feed.StartsWith("https://pkgs.dev.azure.com")
+                        ? FeedType.AzDoNugetFeed
+                        : (sasUri != null ? FeedType.AzureStorageContainer : FeedType.AzureStorageFeed);
+                    yield return new TargetFeedConfig(
+                        type,
+                        sasUri ?? feed,
+                        feedType,
+                        sasUri == null ? key : null,
+                        LatestLinkShortUrlPrefixes,
+                        spec.Assets,
+                        false,
+                        IsInternalBuild,
+                        false,
+                        SymbolTargetType,
+                        filenamesToExclude: FilesToExclude,
+                        flatten: Flatten
+                    );
+                }
             }
-            else
+        }
+
+        /// <summary>
+        /// Create the stable symbol packages feed if one is not already explicitly provided
+        /// </summary>
+        /// <exception cref="Exception">Throws if the feed cannot be created</exception>
+        private void CreateStableSymbolsFeedIfNeeded()
+        {
+            if (string.IsNullOrEmpty(StableSymbolsFeed))
             {
-                symbolsFeed = PublishingConstants.LegacyDotNetBlobFeedURL;
-                symbolsFeedType = FeedType.AzureStorageFeed;
-                symbolsFeedSecret = AzureStorageTargetFeedPAT;
-            }
+                var symbolsFeedTask = new CreateAzureDevOpsFeed()
+                {
+                    BuildEngine = BuildEngine,
+                    AzureDevOpsOrg = AzureDevOpsOrg,
+                    AzureDevOpsProject = IsInternalBuild ? "internal" : "public",
+                    AzureDevOpsPersonalAccessToken = AzureDevOpsFeedsKey,
+                    RepositoryName = RepositoryName,
+                    CommitSha = CommitSha,
+                    ContentIdentifier = "sym"
+                };
 
-            targetFeedConfigs.Add(
-                new TargetFeedConfig(
-                    TargetFeedContentType.Symbols,
-                    symbolsFeed,
-                    symbolsFeedType,
-                    symbolsFeedSecret,
-                    symbolTargetType: SymbolTargetType,
-                    @internal: IsInternalBuild,
-                    filenamesToExclude: FilesToExclude,
-                    flatten: Flatten));
+                if (!symbolsFeedTask.Execute())
+                {
+                    throw new Exception($"Problems creating an AzureDevOps (symbols) feed for repository '{RepositoryName}' and commit '{CommitSha}'.");
+                }
 
-            return targetFeedConfigs;
+                StableSymbolsFeed = symbolsFeedTask.TargetFeedURL;
+            }
         }
 
-        private List<TargetFeedConfig> StableFeeds()
+        /// <summary>
+        /// Create the stable packages feed if one is not already explicitly provided
+        /// </summary>
+        /// <exception cref="Exception">Throws if the feed cannot be created</exception>
+        private void CreateStablePackagesFeedIfNeeded()
         {
-            List<TargetFeedConfig> targetFeedConfigs = new List<TargetFeedConfig>();
-
             if (string.IsNullOrEmpty(StablePackagesFeed))
             {
                 var packagesFeedTask = new CreateAzureDevOpsFeed()
                 {
                     BuildEngine = BuildEngine,
-                    IsInternal = IsInternalBuild,
+                    AzureDevOpsOrg = AzureDevOpsOrg,
+                    AzureDevOpsProject = IsInternalBuild ? "internal" : "public",
                     AzureDevOpsPersonalAccessToken = AzureDevOpsFeedsKey,
                     RepositoryName = RepositoryName,
                     CommitSha = CommitSha
@@ -202,97 +237,45 @@ private List<TargetFeedConfig> StableFeeds()
 
                 StablePackagesFeed = packagesFeedTask.TargetFeedURL;
             }
+        }
 
-            if (string.IsNullOrEmpty(StableSymbolsFeed))
+        private string GetFeedOverride(string feed)
+        {
+            foreach (var prefix in FeedOverrides.Keys.OrderByDescending(f => f.Length))
             {
-                var symbolsFeedTask = new CreateAzureDevOpsFeed()
+                if (feed.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
                 {
-                    BuildEngine = BuildEngine,
-                    IsInternal = IsInternalBuild,
-                    AzureDevOpsPersonalAccessToken = AzureDevOpsFeedsKey,
-                    RepositoryName = RepositoryName,
-                    CommitSha = CommitSha,
-                    ContentIdentifier = "sym"
-                };
-
-                if (!symbolsFeedTask.Execute())
-                {
-                    throw new Exception($"Problems creating an AzureDevOps (symbols) feed for repository '{RepositoryName}' and commit '{CommitSha}'.");
+                    return FeedOverrides[prefix];
                 }
-
-                StableSymbolsFeed = symbolsFeedTask.TargetFeedURL;
             }
 
-            targetFeedConfigs.Add(
-                new TargetFeedConfig(
-                    TargetFeedContentType.Package,
-                    StablePackagesFeed,
-                    FeedType.AzDoNugetFeed,
-                    AzureDevOpsFeedsKey,
-                    assetSelection: AssetSelection.ShippingOnly,
-                    symbolTargetType: SymbolTargetType,
-                    isolated: true,
-                    filenamesToExclude: FilesToExclude,
-                    flatten: Flatten));
+            return feed;
+        }
 
-            targetFeedConfigs.Add(
-                new TargetFeedConfig(
-                    TargetFeedContentType.Symbols,
-                    StableSymbolsFeed,
-                    FeedType.AzDoNugetFeed,
-                    AzureDevOpsFeedsKey,
-                    symbolTargetType: SymbolTargetType,
-                    isolated: true,
-                    filenamesToExclude: FilesToExclude,
-                    flatten: Flatten));
+        private string GetFeedSasUri(string feed)
+        {
+            foreach (var prefix in FeedSasUris.Keys.OrderByDescending(f => f.Length))
+            {
+                if (feed.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    return FeedSasUris[prefix];
+                }
+            }
 
-            targetFeedConfigs.Add(
-                new TargetFeedConfig(
-                    TargetFeedContentType.Package,
-                    AzureDevOpsStaticTransportFeed,
-                    FeedType.AzDoNugetFeed,
-                    AzureDevOpsFeedsKey,
-                    assetSelection: AssetSelection.NonShippingOnly,
-                    symbolTargetType: SymbolTargetType,
-                    isolated: false,
-                    filenamesToExclude: FilesToExclude,
-                    flatten: Flatten));
+            return null;
+        }
 
-            if (PublishInstallersAndChecksums)
+        private string GetFeedKey(string feed)
+        {
+            foreach (var prefix in FeedKeys.Keys.OrderByDescending(f => f.Length))
             {
-                foreach (var contentType in Installers)
+                if (feed.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
                 {
-                    targetFeedConfigs.Add(
-                        new TargetFeedConfig(
-                            contentType,
-                            InstallersTargetStaticFeed,
-                            FeedType.AzureStorageFeed,
-                            InstallersAzureAccountKey,
-                            isolated: true,
-                            symbolTargetType: SymbolTargetType,
-                            latestLinkShortUrlPrefix: LatestLinkShortUrlPrefix,
-                            @internal: false,
-                            allowOverwrite: true,
-                            filenamesToExclude: FilesToExclude,
-                            flatten: Flatten));
+                    return FeedKeys[prefix];
                 }
-
-                targetFeedConfigs.Add(
-                    new TargetFeedConfig(
-                        TargetFeedContentType.Checksum,
-                        ChecksumsTargetStaticFeed,
-                        FeedType.AzureStorageFeed,
-                        ChecksumsAzureAccountKey,
-                        isolated: true,
-                        symbolTargetType: SymbolTargetType,
-                        latestLinkShortUrlPrefix: LatestLinkShortUrlPrefix,
-                        @internal: false,
-                        allowOverwrite: true,
-                        filenamesToExclude: FilesToExclude,
-                        flatten: Flatten));
             }
 
-            return targetFeedConfigs;
+            return null;
         }
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/TargetChannelConfig.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/TargetChannelConfig.cs
index b13fc7608fa..66145befabf 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/TargetChannelConfig.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/TargetChannelConfig.cs
@@ -1,10 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.DotNet.VersionTools.BuildManifest.Model;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
+using Microsoft.DotNet.VersionTools.BuildManifest.Model;
 
 namespace Microsoft.DotNet.Build.Tasks.Feed.Model
 {
@@ -30,32 +31,9 @@ public struct TargetChannelConfig
         /// <summary>
         /// The name that should be used for creating Aka.ms links for this channel.
         /// </summary>
-        public string AkaMSChannelName { get; }
-
-        /// <summary>
-        /// The URL (including the index.json suffix) of the *shipping* feed to be used for this channel.
-        /// </summary>
-        public string ShippingFeed { get; }
-
-        /// <summary>
-        /// The URL (including the index.json suffix) of the *transport* feed to be used for this channel.
-        /// </summary>
-        public string TransportFeed { get; }
-
-        /// <summary>
-        /// The URL (including the index.json suffix) of the *symbols* feed to be used for this channel.
-        /// </summary>
-        public string SymbolsFeed { get; }
-
-        /// <summary>
-        /// The URL (including the index.json suffix) where *checksums* should be published to.
-        /// </summary>
-        public string ChecksumsFeed { get; }
+        public List<string> AkaMSChannelNames { get; }
 
-        /// <summary>
-        /// The URL (including the index.json suffix) where *installers* should be published to.
-        /// </summary>
-        public string InstallersFeed { get; }
+        public ImmutableList<TargetFeedSpecification> TargetFeeds { get; }
 
         /// <summary>
         /// Should publish to Msdl
@@ -64,7 +42,7 @@ public struct TargetChannelConfig
 
         public bool IsInternal { get; }
 
-        public List<string> FilenamesToExclude { get; }
+        public ImmutableList<string> FilenamesToExclude { get; }
 
         public bool Flatten { get; }
 
@@ -72,12 +50,8 @@ public TargetChannelConfig(
             int id,
             bool isInternal,
             PublishingInfraVersion publishingInfraVersion,
-            string akaMSChannelName,
-            string shippingFeed,
-            string transportFeed,
-            string symbolsFeed,
-            string checksumsFeed,
-            string installersFeed,
+            List<string> akaMSChannelNames,
+            IEnumerable<TargetFeedSpecification> targetFeeds,
             SymbolTargetType symbolTargetType,
             List<string> filenamesToExclude = null,
             bool flatten = true)
@@ -85,14 +59,10 @@ public TargetChannelConfig(
             Id = id;
             IsInternal = isInternal;
             PublishingInfraVersion = publishingInfraVersion;
-            AkaMSChannelName = akaMSChannelName;
-            ShippingFeed = shippingFeed;
-            TransportFeed = transportFeed;
-            SymbolsFeed = symbolsFeed;
-            ChecksumsFeed = checksumsFeed;
-            InstallersFeed = installersFeed;
+            AkaMSChannelNames = akaMSChannelNames ?? new List<string>();
+            TargetFeeds = targetFeeds.ToImmutableList();
             SymbolTargetType = symbolTargetType;
-            FilenamesToExclude = filenamesToExclude ?? new List<string>();
+            FilenamesToExclude = filenamesToExclude?.ToImmutableList() ?? ImmutableList<string>.Empty;
             Flatten = flatten;
         }
 
@@ -101,12 +71,9 @@ public override string ToString()
             return
                 $"\n Channel ID: '{Id}' " +
                 $"\n Infra-version: '{PublishingInfraVersion}' " +
-                $"\n AkaMSChannelName: '{AkaMSChannelName}' " +
-                $"\n Shipping-feed: '{ShippingFeed}' " +
-                $"\n Transport-feed: '{TransportFeed}' " +
-                $"\n Symbols-feed: '{SymbolsFeed}' " +
-                $"\n Installers-feed: '{InstallersFeed}' " +
-                $"\n Checksums-feed: '{ChecksumsFeed}' " +
+                $"\n AkaMSChannelName: \n\t{string.Join("\n\t", AkaMSChannelNames)} " +
+                "\n Target Feeds:" +
+                $"\n  {string.Join("\n  ", TargetFeeds.Select(f => $"{string.Join(", ", f.ContentTypes)} -> {f.FeedUrl}"))}" +
                 $"\n SymbolTargetType: '{SymbolTargetType}' " +
                 $"\n IsInternal: '{IsInternal}'" +
                 $"\n FilenamesToExclude: \n\t{string.Join("\n\t", FilenamesToExclude)}" +
@@ -118,12 +85,9 @@ public override bool Equals(object other)
             if (other is TargetChannelConfig config &&
                 PublishingInfraVersion == config.PublishingInfraVersion &&
                 Id == config.Id &&
-                String.Equals(AkaMSChannelName, config.AkaMSChannelName, StringComparison.OrdinalIgnoreCase) &&
-                String.Equals(ShippingFeed, config.ShippingFeed, StringComparison.OrdinalIgnoreCase) &&
-                String.Equals(TransportFeed, config.TransportFeed, StringComparison.OrdinalIgnoreCase) &&
-                String.Equals(SymbolsFeed, config.SymbolsFeed, StringComparison.OrdinalIgnoreCase) &&
-                String.Equals(ChecksumsFeed, config.ChecksumsFeed, StringComparison.OrdinalIgnoreCase) &&
-                String.Equals(InstallersFeed, config.InstallersFeed, StringComparison.OrdinalIgnoreCase) &&
+                AkaMSChannelNames.SequenceEqual(config.AkaMSChannelNames) &&
+                TargetFeeds.Count == config.TargetFeeds.Count &&
+                TargetFeeds.Zip(config.TargetFeeds, (l, r) => l.Equals(r)).All(b => b) &&
                 IsInternal == config.IsInternal &&
                 Flatten == config.Flatten)
             {
@@ -141,18 +105,89 @@ public override bool Equals(object other)
 
         public override int GetHashCode()
         {
-            return (PublishingInfraVersion, 
-                Id, 
-                IsInternal,
-                AkaMSChannelName, 
-                ShippingFeed, 
-                TransportFeed, 
-                SymbolsFeed, 
-                ChecksumsFeed, 
-                InstallersFeed,
-                SymbolTargetType,
-                Flatten,
-                string.Join(" ", FilenamesToExclude)).GetHashCode();
+            var hash = new HashCode();
+            hash.Add(PublishingInfraVersion);
+            hash.Add(Id);
+            hash.Add(IsInternal);
+            foreach(var akaMSChannelName in AkaMSChannelNames)
+            {
+                hash.Add(akaMSChannelName);
+            }
+            foreach (var feedSpec in TargetFeeds)
+            {
+                hash.Add(feedSpec);
+            }
+            hash.Add(SymbolTargetType);
+            hash.Add(Flatten);
+            foreach (string fileName in FilenamesToExclude)
+            {
+                hash.Add(fileName);
+            }
+
+            return hash.ToHashCode();
+        }
+    }
+
+    public struct TargetFeedSpecification
+    {
+        public ImmutableList<TargetFeedContentType> ContentTypes { get; }
+        public string FeedUrl { get; }
+        public AssetSelection Assets { get; }
+
+        public static implicit operator TargetFeedSpecification((TargetFeedContentType[] types, string feed) tuple)
+        {
+            return new TargetFeedSpecification(tuple.types, tuple.feed, AssetSelection.All);
+        }
+
+        public static implicit operator TargetFeedSpecification((TargetFeedContentType[] types, string feed, AssetSelection assets) tuple)
+        {
+            return new TargetFeedSpecification(tuple.types, tuple.feed, tuple.assets);
+        }
+
+        public static implicit operator TargetFeedSpecification((TargetFeedContentType type, string feed) tuple)
+        {
+            return new TargetFeedSpecification(ImmutableList.Create(tuple.type), tuple.feed, AssetSelection.All);
+        }
+
+        public static implicit operator TargetFeedSpecification((TargetFeedContentType type, string feed, AssetSelection assets) tuple)
+        {
+            return new TargetFeedSpecification(ImmutableList.Create(tuple.type), tuple.feed, tuple.assets);
+        }
+
+        public TargetFeedSpecification(IEnumerable<TargetFeedContentType> contentTypes, string feedUrl, AssetSelection assets)
+        {
+            // A feed targeted for content type 'Package' may not have asset selection 'All'.
+            // During TargetFeedConfig creation, the default feed spec for shipping packages will be ignored and replaced with
+            // a separate target feed config.
+
+            if (assets == AssetSelection.All && contentTypes.Contains(TargetFeedContentType.Package))
+            {
+                throw new ArgumentException($"Target feed specification for {feedUrl} must have a separated asset selection 'ShippingOnly' and 'NonShippingOnly packages");
+            }
+
+            ContentTypes = contentTypes.ToImmutableList();
+            FeedUrl = feedUrl;
+            Assets = assets;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is TargetFeedSpecification other && Equals(other);
+        }
+
+        public bool Equals(TargetFeedSpecification other) => ContentTypes.Count == other.ContentTypes.Count &&
+                                                             ContentTypes.Zip(other.ContentTypes, (l, r) => l.Equals(r)).All(b => b) &&
+                                                             FeedUrl == other.FeedUrl;
+
+        public override int GetHashCode()
+        {
+            var hash = new HashCode();
+            foreach (var t in ContentTypes)
+            {
+                hash.Add(t);
+            }
+            hash.Add(FeedUrl);
+            return hash.ToHashCode();
         }
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/TargetFeedConfig.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/TargetFeedConfig.cs
index 93e85a203d1..692f71fb454 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/TargetFeedConfig.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/model/TargetFeedConfig.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.Extensions.Azure;
 
@@ -13,6 +14,11 @@ namespace Microsoft.DotNet.Build.Tasks.Feed.Model
     /// </summary>
     public class TargetFeedConfig
     {
+        /// <summary>
+        ///   Returns the TargetURL stripped of SAS token so it can be used for logging purposes.
+        /// </summary>
+        public string SafeTargetURL => new UriBuilder(TargetURL) {Query = "", Fragment = ""}.Uri.AbsoluteUri;
+
         public TargetFeedContentType ContentType { get; }
 
         public string TargetURL { get; }
@@ -46,13 +52,13 @@ public class TargetFeedConfig
         /// Not applicable to packages
         /// Generates a link the blob, stripping away any version information in the file or blob path.
         /// E.g. 
-        ///      [LatestLinkShortUrlPrefix]/aspnetcore/Runtime/dotnet-hosting-win.exe -> aspnetcore/Runtime/3.1.0-preview2.19511.6/dotnet-hosting-3.1.0-preview2.19511.6-win.exe
+        ///      [LatestLinkShortUrlPrefixes]/aspnetcore/Runtime/dotnet-hosting-win.exe -> aspnetcore/Runtime/3.1.0-preview2.19511.6/dotnet-hosting-3.1.0-preview2.19511.6-win.exe
         /// </summary>
-        public string LatestLinkShortUrlPrefix { get; }
+        public List<string> LatestLinkShortUrlPrefixes { get; }
 
         public SymbolTargetType SymbolTargetType { get; }
 
-        public List<string> FilenamesToExclude { get; }
+        public ImmutableList<string> FilenamesToExclude { get; }
 
         public bool Flatten { get; }
 
@@ -60,13 +66,13 @@ public TargetFeedConfig(TargetFeedContentType contentType,
             string targetURL, 
             FeedType type, 
             string token, 
-            string latestLinkShortUrlPrefix = null, 
+            List<string> latestLinkShortUrlPrefixes = null, 
             AssetSelection assetSelection = AssetSelection.All, 
             bool isolated = false, 
             bool @internal = false, 
             bool allowOverwrite = false, 
             SymbolTargetType symbolTargetType = SymbolTargetType.None, 
-            List<string> filenamesToExclude = null,
+            IEnumerable<string> filenamesToExclude = null,
             bool flatten = true)
         {
             ContentType = contentType;
@@ -77,9 +83,9 @@ public TargetFeedConfig(TargetFeedContentType contentType,
             Isolated = isolated;
             Internal = @internal;
             AllowOverwrite = allowOverwrite;
-            LatestLinkShortUrlPrefix = latestLinkShortUrlPrefix ?? string.Empty;
+            LatestLinkShortUrlPrefixes = latestLinkShortUrlPrefixes ?? new List<string>();
             SymbolTargetType = symbolTargetType;
-            FilenamesToExclude = filenamesToExclude ?? new List<string>();
+            FilenamesToExclude = filenamesToExclude?.ToImmutableList() ?? ImmutableList<string>.Empty;
             Flatten = flatten;
         }
 
@@ -91,7 +97,7 @@ obj is TargetFeedConfig other &&
                 TargetURL.Equals(other.TargetURL, StringComparison.OrdinalIgnoreCase) &&
                 (Type == other.Type) &&
                 Token.Equals(other.Token) &&
-                LatestLinkShortUrlPrefix.Equals(other.LatestLinkShortUrlPrefix, StringComparison.OrdinalIgnoreCase) &&
+                LatestLinkShortUrlPrefixes.SequenceEqual(other.LatestLinkShortUrlPrefixes) &&
                 (AssetSelection == other.AssetSelection) &&
                 (Isolated == other.Isolated) &&
                 (Internal == other.Internal) &&
@@ -112,7 +118,7 @@ obj is TargetFeedConfig other &&
 
         public override int GetHashCode()
         {
-            return (ContentType, Type, AssetSelection, Isolated, Internal, AllowOverwrite, LatestLinkShortUrlPrefix, TargetURL, Token, Flatten, string.Join(" ", FilenamesToExclude)).GetHashCode();
+            return (ContentType, Type, AssetSelection, Isolated, Internal, AllowOverwrite, string.Join(" ", LatestLinkShortUrlPrefixes), TargetURL, Token, Flatten, string.Join(" ", FilenamesToExclude)).GetHashCode();
         }
 
         public override string ToString()
@@ -124,8 +130,8 @@ public override string ToString()
                 $"\n Isolated? '{Isolated}' " +
                 $"\n Internal? '{Internal}' " +
                 $"\n AllowOverwrite? '{AllowOverwrite}' " +
-                $"\n ShortUrlPrefix: '{LatestLinkShortUrlPrefix}' " +
-                $"\n TargetURL: '{TargetURL}'" +
+                $"\n ShortUrlPrefix: \n\t{string.Join("\n\t", LatestLinkShortUrlPrefixes)}" +
+                $"\n TargetURL: '{SafeTargetURL}'" +
                 $"\n FilenamesToExclude: \n\t{string.Join("\n\t", FilenamesToExclude)}" +
                 $"\n Flatten: '{Flatten}'";
         }
@@ -164,7 +170,8 @@ public enum SymbolTargetType
     public enum FeedType
     {
         AzDoNugetFeed,
-        AzureStorageFeed
+        AzureStorageFeed,
+        AzureStorageContainer,
     }
 
     /// <summary>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj b/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
index 17fa172fe3f..45eb895e1dc 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
@@ -25,6 +25,7 @@
     <None Include="build/**/*.*" Pack="true">
       <PackagePath>build</PackagePath>
     </None>
+    <None Include="..\Common\wix\dotnethome_x64.wxs" Link="build\wix\product\dotnethome_x64.wxs" PackagePath="%(Link)" Pack="true" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/README.md b/src/Microsoft.DotNet.Build.Tasks.Installers/README.md
index ae1147bacaf..0ba6e2fad1a 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/README.md
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/README.md
@@ -23,6 +23,8 @@ If you have files that need to have a stabilized identity in the MSI file, you c
 
 If you want to create MSIs for the target RID that target other architecture install locations, you can add `CrossArchSdkMsiInstallerArch` items for all of the target architecture install locations you want to generate installers of the current build for.
 
+To control the order in which an older product is removed during an upgrade, set the `MajorUpgradeSchedule` property to a value defined [here](https://wixtoolset.org/documentation/manual/v3/xsd/wix/majorupgrade.html).  The default is `afterInstallInitialize`.
+
 ### Linux package configuration
 
 To add package dependencies for linux packages, add a `LinuxPackageDependency` item with the version in the `Version` metadata.
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh
index 9e069b7a1e0..6987c8a0b1d 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh
@@ -2,8 +2,8 @@
 #
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
 #
+
 set -e
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py
index 6b8b21c9e12..4811634c5d3 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py
@@ -2,7 +2,6 @@
 #
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
 #
 
 # Parses debian_config.json and generates appropriate templates
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/debian_build_lib.sh b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/debian_build_lib.sh
index 18d388864fd..1520ffa62aa 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/debian_build_lib.sh
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/debian_build_lib.sh
@@ -1,7 +1,6 @@
 #
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
 #
 
 # This file is not intended to be executed directly
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py
index 74f26a6ffdd..27b98c106a1 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py
@@ -2,7 +2,6 @@
 #
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
 #
 
 # Extract Json Value
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py
index c62e6807901..dc20bb6d1c5 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py
@@ -2,7 +2,6 @@
 #
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
 #
 
 # manpage_generator
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/build_setup.sh b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/build_setup.sh
deleted file mode 100644
index 12c223aacbc..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/build_setup.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-#
-
-install_dependencies(){
-    # Add LLdb 3.6 package source
-    echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list
-    wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
-
-    #Install Deps
-    apt-get update
-    apt-get install -y debhelper build-essential devscripts git liblttng-ust-dev lldb-3.6-dev
-}
-
-setup(){
-    install_dependencies
-}
-
-setup
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/test_setup.sh b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/test_setup.sh
deleted file mode 100644
index a7cdd95c2b3..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/test_setup.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-#
-
-install_dependencies(){
-    # Add LLdb 3.6 package source
-    echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list
-    wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
-
-    #Install Deps
-    apt-get update
-    apt-get install -y debhelper build-essential devscripts git liblttng-ust-dev lldb-3.6-dev
-}
-
-install_bats(){
-    git clone https://github.com/sstephenson/bats.git
-    cd bats
-    ./install.sh /usr/local
-}
-
-setup(){
-    install_dependencies
-    install_bats
-}
-
-setup
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/control b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/control
index 114d8493042..9497e6c5d07 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/control
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/control
@@ -1,7 +1,6 @@
 #
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
 #
 
 Source: {PACKAGE_NAME}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/copyright b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/copyright
index 72febbba8af..3e916a1311d 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/copyright
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/copyright
@@ -1,4 +1,4 @@
-Comment: Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.
+Comment: Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license.
 
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/rules b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/rules
index b5cbfb27e20..6a4e98d27a5 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/rules
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/rules
@@ -2,7 +2,6 @@
 #
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
 #
 
 {overrides}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.singlerid.targets b/src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.singlerid.targets
index 5e88f7150e4..6c53ad557f9 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.singlerid.targets
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.singlerid.targets
@@ -125,6 +125,10 @@
       <InstallerPackageRelease>$([System.String]::Copy('$(InstallerPackageRelease)').Replace('-', '_'))</InstallerPackageRelease>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(GeneratePkg)' == 'true'">
+      <InstallerPackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">$(VersionPrefix)-$(VersionSuffix)</InstallerPackageVersion>
+    </PropertyGroup>
+
     <PropertyGroup>
       <_InstallerIntermediatesDir>$(IntermediateOutputPath)$(InstallerName)/$(InstallerPackageVersion)/</_InstallerIntermediatesDir>
 
@@ -141,6 +145,20 @@
       <ExeBundleInstallerFile>$(PackageOutputPath)$(InstallerFileNameWithoutExtension).exe</ExeBundleInstallerFile>
       <ExeBundleInstallerEngineFile>$(PackageOutputPath)$(InstallerFileNameWithoutExtension)-engine.exe</ExeBundleInstallerEngineFile>
     </PropertyGroup>
+
+    <PropertyGroup Condition="'$(GenerateRpm)' == 'true'">
+      <CreateRPMForCblMariner>true</CreateRPMForCblMariner>
+      <!-- PackageTargetOS is a distro-specific version suffix, used for deps packages, including the one for CBL Mariner.
+           We do not want to create additional CBL Mariner named RPMs of those packages. -->
+      <CreateRPMForCblMariner Condition="'$(PackageTargetOS)' != ''">false</CreateRPMForCblMariner>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(CreateRPMForCblMariner)' == 'true'">
+      <_CblMarinerVersionSuffix>cm.1</_CblMarinerVersionSuffix>
+      <_InstallerBuildPartCblMariner>$(Version)-$(_CblMarinerVersionSuffix)-$(InstallerTargetArchitecture)</_InstallerBuildPartCblMariner>
+      <_InstallerFileNameWithoutExtensionCblMariner>$(InstallerName)-$(_InstallerBuildPartCblMariner)$(CrossArchContentsBuildPart)</_InstallerFileNameWithoutExtensionCblMariner>
+      <_InstallerFileCblMariner>$(PackageOutputPath)$(_InstallerFileNameWithoutExtensionCblMariner)$(InstallerExtension)</_InstallerFileCblMariner>
+    </PropertyGroup>
   </Target>
   
   <!--
@@ -303,6 +321,15 @@
           UseHardlinksIfPossible="False" />
 
     <Message Text="$(MSBuildProjectName) -> $(_InstallerFile)" Importance="high" />
+
+    <Copy Condition="'$(CreateRPMForCblMariner)' == 'true'"
+          SourceFiles="@(GeneratedRpmFiles)"
+          DestinationFiles="$(_InstallerFileCblMariner)"
+          OverwriteReadOnlyFiles="True"
+          SkipUnchangedFiles="False"
+          UseHardlinksIfPossible="False" />
+
+    <Message Text="$(MSBuildProjectName) -> $(_InstallerFileCblMariner)" Importance="high" />
   </Target>
 
   <Target Name="GetRpmInstallerJsonProperties"
@@ -371,14 +398,14 @@
              Properties="OutputPath=$(_OutputPathRoot)"
              RemoveProperties="@(_GlobalPropertiesToRemoveForPublish)"  />
     <PropertyGroup>
-      <_MacOSVersionComponent Condition="'$(IncludeVersionInMacOSComponentName)' == 'true'">.$(ProductVersion)</_MacOSVersionComponent>
-      <_MacOSComponentName Condition="'$(_MacOSComponentName)' == ''">com.microsoft.dotnet.$(MacOSComponentNamePackType)$(_MacOSVersionComponent).component.osx.x64</_MacOSComponentName>
+      <_MacOSVersionComponent Condition="'$(IncludeVersionInMacOSComponentName)' == 'true'">.$(InstallerPackageVersion)</_MacOSVersionComponent>
+      <_MacOSComponentName Condition="'$(_MacOSComponentName)' == ''">com.microsoft.dotnet.$(MacOSComponentNamePackType)$(_MacOSVersionComponent).component.osx.$(InstallerTargetArchitecture)</_MacOSComponentName>
       <_MacOSSharedInstallDir>/usr/local/share/dotnet</_MacOSSharedInstallDir>
 
       <_pkgArgs></_pkgArgs>
       <_pkgArgs>$(_pkgArgs) --root $(_OutputPathRoot)</_pkgArgs>
       <_pkgArgs>$(_pkgArgs) --identifier $(_MacOSComponentName)</_pkgArgs>
-      <_pkgArgs>$(_pkgArgs) --version $(ProductVersion)</_pkgArgs>
+      <_pkgArgs>$(_pkgArgs) --version $(InstallerPackageVersion)</_pkgArgs>
       <_pkgArgs>$(_pkgArgs) --install-location $(_MacOSSharedInstallDir)</_pkgArgs>
       <_pkgArgs Condition="'$(MacOSScriptsDirectory)' != ''">$(_pkgArgs) --scripts $(MacOSScriptsDirectory)</_pkgArgs>
       <_pkgArgs>$(_pkgArgs) $(_InstallerFile)</_pkgArgs>
@@ -431,6 +458,7 @@
   <Target Name="_GetCommonJsonProperties">
     <PropertyGroup>
       <FullLicenseText>$([System.IO.File]::ReadAllText('$(LicenseFile)').Replace('%0A', '\n').Replace('"', '\"'))</FullLicenseText>
+      <LinuxInstallRoot Condition="'$(LinuxInstallRoot)' == ''">/usr/share/dotnet</LinuxInstallRoot>
     </PropertyGroup>
 
     <ItemGroup>
@@ -467,7 +495,7 @@
       <_CommonLinuxPackageProperty Include="short_description" String="$(_ShortDescription)" />
       <_CommonLinuxPackageProperty Include="maintainer_name" String=".NET Team" />
       <_CommonLinuxPackageProperty Include="maintainer_email" String="dotnetpackages@dotnetfoundation.org" />
-      <_CommonLinuxPackageProperty Include="install_root" String="/usr/share/dotnet" />
+      <_CommonLinuxPackageProperty Include="install_root" String="$(LinuxInstallRoot)" />
       <_CommonLinuxPackageProperty Include="long_description" String=".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs." />
       <_CommonLinuxPackageProperty Include="homepage" String="https://github.com/dotnet/core" />
       <_CommonLinuxPackageProperty Include="copyright" String="2017 Microsoft" />
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright b/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright
index ba561b5eceb..ec4b68bc19f 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright
@@ -1,4 +1,4 @@
-Comment: Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.
+Comment: Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license.
 
 Files: *
 Copyright: {COPYRIGHT_TEXT}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/bundle.wxs b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/bundle.wxs
index cd908f06756..7f968434f10 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/bundle.wxs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/bundle.wxs
@@ -43,9 +43,7 @@
       <PayloadGroupRef Id="DotnetCoreBAPayloads" />
     </BootstrapperApplicationRef>
 
-    <swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
-
-    <Variable Name="DOTNETHOME" Type="string" Value="[$(var.Program_Files)]dotnet" bal:Overridable="no" />
+    <swid:Tag Regid="microsoft.com" InstallPath="[$(var.Program_Files)]dotnet" />
 
     <!-- Variables used solely for localization. -->
     <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker) ($(var.TargetArchitectureDescription))" bal:Overridable="no" />
@@ -54,9 +52,7 @@
 
     <Chain DisableSystemRestore="yes" ParallelCache="yes">
       <?foreach chainedFile in $(var.ChainedDotNetPackageFiles)?>
-        <MsiPackage SourceFile="$(var.chainedFile)">
-          <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
-        </MsiPackage>
+        <MsiPackage SourceFile="$(var.chainedFile)" />
       <?endforeach?>
     </Chain>
   </Bundle>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.common.wxi b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.common.wxi
index 833f564c880..8929aaddfc1 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.common.wxi
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.common.wxi
@@ -3,7 +3,11 @@
 
   <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="$(var.InstallerVersion)" />
 
-  <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>
+  <?ifndef MajorUpgradeSchedule?>
+    <?define MajorUpgradeSchedule = afterInstallInitialize?>
+  <?endif?>
+
+  <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="$(var.MajorUpgradeSchedule)"/>
 
   <MediaTemplate CompressionLevel="high" EmbedCab="yes"/>
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.wxs b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.wxs
index 1bf18ed9e2d..28a564cd295 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.wxs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.wxs
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?include "..\variables.wxi" ?>
@@ -51,6 +52,9 @@
         <Directory Id="DOTNETHOME" Name="dotnet" />
       </Directory>
     </Directory>
-  </Fragment>
 
+    <?if $(var.Platform)~=x64?>
+    <CustomActionRef Id="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" />
+    <?endif?>
+  </Fragment>
 </Wix>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/variables.wxi b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/variables.wxi
index 8b781939b73..441e6aed78b 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/variables.wxi
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/variables.wxi
@@ -4,7 +4,9 @@
   <?define Dotnet_ProductVersion = "$(var.BuildVersion)" ?>
   <?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?>
 
+<?ifndef Manufacturer?>
   <?define Manufacturer     =   "Microsoft Corporation" ?>
+<?endif?>
   <?define ProductName      =   "$(var.ProductMoniker) ($(var.TargetArchitectureDescription))" ?>
   <?define ProductLanguage  =   "1033" ?>
   <?define ProductVersion   =   "$(var.Dotnet_ProductVersion)" ?>
@@ -23,7 +25,9 @@
     <?error Invalid Platform ($(var.Platform))?>
   <?endif?>
 
-  <?define DependencyKey   = "$(var.DependencyKeyName)_$(var.BuildVersion)_$(var.Platform)$(var.CrossArchContentsPlatformPart)"?>
+  <?ifndef DependencyKey?>
+    <?define DependencyKey = "$(var.DependencyKeyName)_$(var.BuildVersion)_$(var.Platform)$(var.CrossArchContentsPlatformPart)"?>
+  <?endif?>
   <?define DependencyKeyId = "$(var.DependencyKey)" ?>
 
 </Include>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
index 7890004666d..2a1ea36b682 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
@@ -25,7 +25,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-      <WixVersion>3.14.0.4118</WixVersion>
+      <WixVersion>1.0.0-v3.14.0.5722</WixVersion>
       <WixToolsDir>$(BaseIntermediateOutputPath)WixTools.$(WixVersion)/</WixToolsDir>
       <!-- Used in WiX targets to locate files. -->
       <WixInstallPath>$(WixToolsDir)</WixInstallPath>
@@ -36,10 +36,10 @@
       <MsiArch>$(InstallerTargetArchitecture)</MsiArch>
 
       <AcquireWixProjectFile>$(MSBuildThisFileDirectory)..\acquisition\acquire-wix\acquire-wix.proj</AcquireWixProjectFile>
-      <WixDownloadFilename>wix.$(WixVersion).zip</WixDownloadFilename>
-      <WixDownloadUrl>https://dotnetcli.azureedge.net/build/wix/$(WixDownloadFilename)</WixDownloadUrl>
+      <WixDownloadFilename>Microsoft.Signed.Wix-$(WixVersion).zip</WixDownloadFilename>
+      <WixDownloadUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/$(WixDownloadFilename)</WixDownloadUrl>
       <WixDestinationPath>$(WixToolsDir)$(WixDownloadFilename)</WixDestinationPath>
-      <WixDownloadSentinel>$(WixToolsDir)WixDownload.$(WixVersion).sentinel</WixDownloadSentinel>
+      <WixDownloadSentinel>$(WixToolsDir)$(WixDownloadFilename).sentinel</WixDownloadSentinel>
     </PropertyGroup>
   </Target>
 
@@ -96,7 +96,12 @@
   <Target Name="_GetUpgradeCode"
           DependsOnTargets="GetWixBuildConfiguration"
           Condition="'$(UpgradeCode)' == ''">
-    <GenerateGuidFromName Name="$(_OutInstallerFile)">
+
+    <PropertyGroup>
+      <MsiUpgradeCodeSeed Condition="'$(MsiUpgradeCodeSeed)' == ''">$(_OutInstallerFile)</MsiUpgradeCodeSeed>
+    </PropertyGroup>
+
+    <GenerateGuidFromName Name="$(MsiUpgradeCodeSeed)">
       <Output TaskParameter="GeneratedGuid" PropertyName="UpgradeCode" />
     </GenerateGuidFromName>
   </Target>
@@ -108,6 +113,7 @@
       <WixExtensions Include="WixUtilExtension.dll" />
 
       <WixSrcFile Include="$(MSBuildThisFileDirectory)product/product.wxs" />
+      <WixSrcFile Include="$(MSBuildThisFileDirectory)product/dotnethome_x64.wxs" />
       <WixSrcFile Include="$(MSBuildThisFileDirectory)product/provider.wxs" />
     </ItemGroup>
   </Target>
@@ -243,7 +249,8 @@
           -cg %(ComponentGroupName) ^
           -srd ^
           -dr %(DirectoryRef) ^
-          -out %(WixSourceFile)" />
+          -out %(WixSourceFile)
+          $(AdditionalHeatArgs)" />
 
       <CandleVariables Include="InstallFiles" Value="true" />
     </ItemGroup>
@@ -289,6 +296,7 @@
       <CandleVariables Include="NugetVersion" Value="$(Version)" />
       <CandleVariables Include="TargetArchitectureDescription" Value="$(InstallerTargetArchitecture)$(CrossArchContentsBuildPart)" />
       <CandleVariables Include="UpgradeCode" Value="$(UpgradeCode)" />
+      <CandleVariables Include="MajorUpgradeSchedule" Value="$(MajorUpgradeSchedule)" Condition="'$(MajorUpgradeSchedule)' != ''" />
 
       <!-- If this is a cross-arch MSI, add target arch to the dependency key for uniqueness. -->
       <CandleVariables Include="CrossArchContentsPlatformPart" Value="$(CrossArchContentsBuildPart.Replace('-', '_'))" />
@@ -304,6 +312,7 @@
       <_wixArgs>$(_wixArgs) @(CandleVariables -> '-d%(Identity)="%(Value)"', ' ')</_wixArgs>
       <_wixArgs>$(_wixArgs) @(WixSrcFile -> '"%(FullPath)"', ' ')</_wixArgs>
       <_wixArgs>$(_wixArgs) @(DirectoryToHarvest -> '"%(WixSourceFile)"', ' ')</_wixArgs>
+      <_wixArgs>$(_wixArgs) $(AdditionalCandleArgs)</_wixArgs>
     </PropertyGroup>
 
     <Exec
@@ -326,6 +335,7 @@
       <_wixArgs>$(_wixArgs) @(WixExtensions -> '-ext %(Identity)', ' ')</_wixArgs>
       <_wixArgs>$(_wixArgs) @(WixSrcFile -> '"$(WixObjDir)%(Filename).wixobj"', ' ')</_wixArgs>
       <_wixArgs>$(_wixArgs) @(DirectoryToHarvest -> '"%(WixObjFile)"', ' ')</_wixArgs>
+      <_wixArgs>$(_wixArgs) $(AdditionalLightArgs)</_wixArgs>
       <_lightCommand>light.exe $(_wixArgs)</_lightCommand>
     </PropertyGroup>
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/BuildFPMToolPreReqs.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/BuildFPMToolPreReqs.cs
index c956a24e661..39c9246b131 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/BuildFPMToolPreReqs.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/BuildFPMToolPreReqs.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 using Newtonsoft.Json;
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/ExecWithRetries.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/ExecWithRetries.cs
index 3beaa96ec29..fea8f8eb87c 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/ExecWithRetries.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/ExecWithRetries.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 // Initially copied from https://github.com/dotnet/buildtools/blob/6736870b84e06b75e7df32bb84d442db1b2afa10/src/Microsoft.DotNet.Build.Tasks/ExecWithRetries.cs
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateCurrentVersion.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateCurrentVersion.cs
index 3c00c3a5f83..8680208bdb2 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateCurrentVersion.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateCurrentVersion.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 using System;
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateGuidFromName.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateGuidFromName.cs
index 678b32a61a0..6884a0d4522 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateGuidFromName.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateGuidFromName.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 using System;
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateJsonObjectString.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateJsonObjectString.cs
index 189b1b3d0eb..517e675ed53 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateJsonObjectString.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateJsonObjectString.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 using System;
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs
index 434a522218b..15d92ce899a 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
@@ -31,6 +30,8 @@ public class GenerateMacOSDistributionFile : BuildTask
         [Required]
         public string DestinationFile { get; set; }
 
+        public string Alternativex64InstallPath { get; set; }
+
         public override bool Execute()
         {
             try
@@ -39,7 +40,26 @@ public override bool Execute()
 
                 var titleElement = new XElement("title", $"{ProductBrandName} ({TargetArchitecture})");
 
-                var choiceLineElements = BundledPackages.Select(component => new XElement("line", new XAttribute("choice", component.GetMetadata("FileNameWithExtension"))));
+                var archScriptContent = @"function IsX64Machine() {
+    var machine = system.sysctl(""hw.machine"");
+    var cputype = system.sysctl(""hw.cputype"");
+    var cpu64 = system.sysctl(""hw.cpu64bit_capable"");
+    var translated = system.sysctl(""sysctl.proc_translated"");
+    system.log(""Machine type: "" + machine);
+    system.log(""Cpu type: "" + cputype);
+    system.log(""64-bit: "" + cpu64);
+    system.log(""Translated: "" + translated);
+    
+    // From machine.h
+    // CPU_TYPE_X86_64 = CPU_TYPE_X86 | CPU_ARCH_ABI64 = 0x010000007 = 16777223
+    // CPU_TYPE_X86 = 7
+    var result = machine == ""amd64"" || machine == ""x86_64"" || cputype == ""16777223"" || (cputype == ""7"" && cpu64 == ""1"");
+    // We may be running under translation (Rosetta) that makes it seem like system is x64, if so assume machine is not actually x64
+    result = result && (translated != ""1"");
+    system.log(""IsX64Machine: "" + result);
+    return result;
+}";
+                var scriptElement = new XElement("script", new XCData(archScriptContent));
 
                 var choiceElements = BundledPackages
                     .Select(component => new XElement("choice",
@@ -49,14 +69,54 @@ public override bool Execute()
                         new XAttribute("description", component.GetMetadata("Description")),
                         new XElement("pkg-ref", new XAttribute("id", component.GetMetadata("FileNameWithExtension")))));
 
+                if (TargetArchitecture == "x64")
+                {
+                    Alternativex64InstallPath ??= "/usr/local/share/dotnet/x64";
+
+                    choiceElements =
+                        choiceElements.Select(c => new XElement(c)
+                            .WithAttribute("selected", "IsX64Machine()"))
+                        .Concat(
+                        choiceElements.Select(c => new XElement(c)
+                            .WithAttribute("id", c.Attribute("id").Value + ".alternate")
+                            .WithAttribute("selected", "!IsX64Machine()")
+                            .WithAttribute("customLocation", Alternativex64InstallPath)));
+                }
+
+                var choiceLineElements = choiceElements
+                    .Select(c => new XElement("line", new XAttribute("choice", c.Attribute("id").Value)));
+
                 var pkgRefElements = BundledPackages
                     .Select(component => new XElement("pkg-ref",
                         new XAttribute("id", component.GetMetadata("FileNameWithExtension")),
                         component.GetMetadata("FileNameWithExtension")));
+                        
+                var optionsElement = document.Root.Element("options");
+                bool templateHasOptions = optionsElement is not null;
+                if (!templateHasOptions)
+                {
+                    optionsElement = new XElement("options");
+                }
+                if (optionsElement.Attribute("hostArchitectures") is null)
+                {
+                    string hostArchitecture = TargetArchitecture;
+                    if (hostArchitecture == "x64")
+                    {
+                        hostArchitecture = "x86_64";
+                    }
+                    optionsElement.Add(new XAttribute("hostArchitectures", hostArchitecture));
+                }
+                
+                if (!templateHasOptions)
+                {
+                    document.Root.Add(optionsElement);
+                }
 
+                document.Root.Add(titleElement);
                 document.Root.Add(new XElement("choices-outline", choiceLineElements));
                 document.Root.Add(choiceElements);
                 document.Root.Add(pkgRefElements);
+                document.Root.Add(scriptElement);
                 using XmlWriter writer = XmlWriter.Create(File.OpenWrite(DestinationFile));
                 document.WriteTo(writer);
             }
@@ -68,4 +128,13 @@ public override bool Execute()
             return true;
         }
     }
+
+    static class XElementExtensions
+    {
+        public static XElement WithAttribute(this XElement element, XName attribute, object value)
+        {
+            element.SetAttributeValue(attribute, value);
+            return element;
+        }
+    }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMsiVersion.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMsiVersion.cs
index fefcb0a13a5..f0603ca7ad5 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMsiVersion.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMsiVersion.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 
@@ -86,7 +85,7 @@ private void ParseBuildNumberMajorMinor()
             var minor = int.Parse(Minor) << 22;
             var patch = int.Parse(Patch) << 18;
 
-            var buildNumberMajor = int.Parse(BuildNumberMajor) & 0x3FFF << 4;
+            var buildNumberMajor = (int.Parse(BuildNumberMajor) & 0x3FFF) << 4;
             var buildNumberMinor = int.Parse(BuildNumberMinor) & 0xF;
 
             var msiVersionNumber = major | minor | patch | buildNumberMajor | buildNumberMinor;
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/StabilizeWixFileId.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/StabilizeWixFileId.cs
index a0a2f1fa1c3..77410034c15 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/StabilizeWixFileId.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/StabilizeWixFileId.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 using System;
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Extensions.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Extensions.cs
index b8ef9dd78a1..e045027df13 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Extensions.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Extensions.cs
@@ -17,8 +17,6 @@ namespace Microsoft.DotNet.Build.Tasks.Packaging
 {
     public static class Extensions
     {
-        private static readonly NuGetFramework NullFramework = new NuGetFramework("Null,Version=v1.0");
-
         public static string GetString(this ITaskItem taskItem, string metadataName)
         {
             var metadataValue = taskItem.GetMetadata(metadataName)?.Trim();
@@ -187,22 +185,3 @@ public static void AddRangeToMember<T, TItem>(this T target, Expression<Func<T,
         }
     }
 }
-
-namespace NuGet
-{
-    internal static class NuGetFrameworkExtensions
-    { 
-        // NuGet.Frameworks doesn't have the equivalent of the old VersionUtility.GetFrameworkString
-        // which is relevant for building packages
-        public static string GetFrameworkString(this NuGetFramework self)
-        {
-            var frameworkName = new FrameworkName(self.DotNetFrameworkName);
-            string name = frameworkName.Identifier + frameworkName.Version;
-            if (string.IsNullOrEmpty(frameworkName.Profile))
-            {
-                return name;
-            }
-            return name + "-" + frameworkName.Profile;
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Framework.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Framework.cs
deleted file mode 100644
index 7ca90469eef..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Framework.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using NuGet.Frameworks;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.Versioning;
-using System.Xml.Linq;
-
-namespace Microsoft.DotNet.Build.Tasks.Packaging
-{
-    public class FrameworkSet
-    {
-        private const string LastNonSemanticVersionsFileName = "LastNonSemanticVersions.xml";
-
-        // avoid parsing the same documents multiple times on a single node.
-        private static Dictionary<string, FrameworkSet> s_frameworkSetCache = new Dictionary<string, FrameworkSet>();
-        private static object s_frameworkSetCacheLock = new object();
-
-        public FrameworkSet()
-        {
-            Frameworks = new Dictionary<string, SortedSet<Framework>>();
-            LastNonSemanticVersions = new Dictionary<string, Version>();
-        }
-
-        public static FrameworkSet Load(string frameworkListsPath)
-        {
-            FrameworkSet result;
-            if (s_frameworkSetCache.TryGetValue(frameworkListsPath, out result))
-                return result;
-
-            result = new FrameworkSet();
-
-            foreach (string fxDir in Directory.EnumerateDirectories(frameworkListsPath))
-            {
-                string targetName = Path.GetFileName(fxDir);
-                Framework framework = new Framework(targetName);
-                foreach (string frameworkListPath in Directory.EnumerateFiles(fxDir, "*.xml"))
-                {
-                    AddAssembliesFromFrameworkList(framework.Assemblies, frameworkListPath);
-                }
-
-                SortedSet<Framework> frameworkVersions = null;
-                string fxId = framework.FrameworkName.Identifier;
-
-                if (fxId == FrameworkConstants.FrameworkIdentifiers.Portable)
-                {
-                    // portable doesn't have version relationships, use the entire TFM
-                    fxId = framework.FrameworkName.ToString();
-                }
-
-                if (!result.Frameworks.TryGetValue(fxId, out frameworkVersions))
-                {
-                    frameworkVersions = new SortedSet<Framework>();
-                }
-
-                frameworkVersions.Add(framework);
-
-                result.Frameworks[fxId] = frameworkVersions;
-            }
-
-            string lastNonSemanticVersionsListPath = Path.Combine(frameworkListsPath, LastNonSemanticVersionsFileName);
-            AddAssembliesFromFrameworkList(result.LastNonSemanticVersions, lastNonSemanticVersionsListPath);
-
-            lock (s_frameworkSetCacheLock)
-            {
-                s_frameworkSetCache[frameworkListsPath] = result;
-            }
-            return result;
-        }
-
-        private static void AddAssembliesFromFrameworkList(IDictionary<string, Version> assemblies, string frameworkListPath)
-        {
-            XDocument frameworkList = XDocument.Load(frameworkListPath);
-            foreach (var file in frameworkList.Element("FileList").Elements("File"))
-            {
-                string assemblyName = file.Attribute("AssemblyName").Value;
-                var versionAttribute = file.Attribute("Version");
-                Version supportedVersion = null;
-
-                if (versionAttribute != null)
-                {
-                    supportedVersion = new Version(versionAttribute.Value);
-                }
-
-                // Use a file entry with no version to indicate any version, 
-                // this is how Xamarin wishes us to support them
-                assemblies.Add(assemblyName,
-                    supportedVersion ??
-                    new Version(int.MaxValue, int.MaxValue, int.MaxValue, int.MaxValue));
-            }
-        }
-
-        public Dictionary<string, SortedSet<Framework>> Frameworks { get; private set; }
-
-        public Dictionary<string, Version> LastNonSemanticVersions { get; private set; }
-        
-        /// <summary>
-        /// Determines the significant API version given an assembly version.
-        /// </summary>
-        /// <param name="assemblyName">Name of assembly</param>
-        /// <param name="assemblyVersion">Version of assembly</param>
-        /// <returns>Lowest version with the same API surface as assemblyVersion</returns>
-        public Version GetApiVersion(string assemblyName, Version assemblyVersion)
-        {
-            if (assemblyVersion == null)
-            {
-                return null;
-            }
-
-            if (assemblyVersion.Build == 0 && assemblyVersion.Revision == 0)
-            {
-                // fast path for X.Y.0.0
-                return assemblyVersion;
-            }
-
-            Version latestLegacyVersion = null;
-            LastNonSemanticVersions.TryGetValue(assemblyName, out latestLegacyVersion);
-
-            if (latestLegacyVersion == null)
-            {
-                return new Version(assemblyVersion.Major, assemblyVersion.Minor, 0, 0);
-            }
-            else if (assemblyVersion.Major <= latestLegacyVersion.Major && assemblyVersion.Minor <= latestLegacyVersion.Minor)
-            {
-                // legacy version round build to nearest 10
-                return new Version(assemblyVersion.Major, assemblyVersion.Minor, assemblyVersion.Build - assemblyVersion.Build % 10, 0);
-            }
-            else
-            {
-                // new version
-                return new Version(assemblyVersion.Major, assemblyVersion.Minor, 0, 0);
-            }
-        }
-    }
-
-    public class Framework : IComparable<Framework>
-    {
-        public Framework(string targetName)
-        {
-            Assemblies = new Dictionary<string, Version>();
-            FrameworkName = new FrameworkName(targetName);
-            var nugetFramework = new NuGetFramework(FrameworkName.Identifier, FrameworkName.Version, FrameworkName.Profile);
-            ShortName = nugetFramework.GetShortFolderName();
-
-            if (ShortName.EndsWith(nugetFramework.Version.Major.ToString()) && nugetFramework.Version.Minor == 0)
-            {
-                // prefer a trailing zero
-                ShortName += "0";
-            }
-
-            if (ShortName == "win" || ShortName == "netcore45")
-            {
-                // prefer the versioned short name
-                ShortName = "win8";
-            }
-
-            if (ShortName == "netcore451")
-            {
-                ShortName = "win81";
-            }
-        }
-
-        public IDictionary<string, Version> Assemblies { get; private set; }
-        public FrameworkName FrameworkName { get; private set; }
-        public string ShortName { get; private set; }
-
-
-        public int CompareTo(Framework other)
-        {
-            if (this.FrameworkName.Identifier != other.FrameworkName.Identifier)
-            {
-                throw new ArgumentException("Frameworks with different IDs are not comparable.", "other");
-            }
-
-            return this.FrameworkName.Version.CompareTo(other.FrameworkName.Version);
-        }
-    }
-    public class Frameworks
-    {
-        private static FrameworkSet s_inboxFrameworks;
-        private static FrameworkSet GetInboxFrameworks(string frameworkListsPath)
-        {
-            if (s_inboxFrameworks == null)
-                s_inboxFrameworks = FrameworkSet.Load(frameworkListsPath);
-            return s_inboxFrameworks;
-        }
-        public static string[] GetInboxFrameworksList(string frameworkListsPath, string assemblyName, string assemblyVersion, ILog log)
-        {
-            // if no version is specified just use 0.0.0.0 to evaluate for any version of the contract
-            Version version = String.IsNullOrEmpty(assemblyVersion) ? new Version(0, 0, 0, 0) : new Version(assemblyVersion);
-
-            FrameworkSet fxs = GetInboxFrameworks(frameworkListsPath);
-
-            Version latestLegacyVersion = null;
-            fxs.LastNonSemanticVersions.TryGetValue(assemblyName, out latestLegacyVersion);
-
-            List<string> inboxIds = new List<string>();
-
-            foreach (var fxVersions in fxs.Frameworks.Values)
-            {
-                // find the first version (if any) that supports this contract
-                foreach (var fxVersion in fxVersions)
-                {
-                    Version supportedVersion;
-                    if (fxVersion.Assemblies.TryGetValue(assemblyName, out supportedVersion))
-                    {
-                        if (supportedVersion >= version)
-                        {
-                            if (log != null)
-                                log.LogMessage(LogImportance.Low, "inbox on {0}", fxVersion.ShortName);
-                            inboxIds.Add(fxVersion.ShortName);
-                            break;
-                        }
-
-                        // new versions represent API surface via major.minor only, so consider
-                        // a contract as supported so long as the latest legacy version is supported
-                        // and this contract's major.minor match the latest legacy version.
-                        if (supportedVersion == latestLegacyVersion &&
-                            version.Major == latestLegacyVersion.Major && version.Minor == latestLegacyVersion.Minor)
-                        {
-                            if (log != null)
-                                log.LogMessage(LogImportance.Low, "Considering {0},Version={1} inbox on {2}, since it only differs in revsion.build from {3}", assemblyName, assemblyVersion, fxVersion.ShortName, latestLegacyVersion);
-                            inboxIds.Add(fxVersion.ShortName);
-                            break;
-                        }
-                    }
-                }
-            }
-            return inboxIds.ToArray();
-        }
-
-        public static bool IsInbox(string frameworkListsPath, string framework, string assemblyName, string assemblyVersion)
-        {
-            NuGetFramework fx = NuGetFramework.Parse(framework);
-            return IsInbox(frameworkListsPath, fx, assemblyName, assemblyVersion);
-        }
-
-        public static bool IsInbox(string frameworkListsPath, NuGetFramework framework, string assemblyName, string assemblyVersion)
-        {
-            if (framework.Framework == FrameworkConstants.FrameworkIdentifiers.UAP || 
-                (framework.Framework == FrameworkConstants.FrameworkIdentifiers.NetCore && framework.Version >= FrameworkConstants.CommonFrameworks.NetCore50.Version))
-            {
-                // UAP & netcore50 or higher are completely OOB, despite being compatible with netcore4x which has inbox assemblies
-                return false;
-            }
-
-            // if no version is specified just use 0.0.0.0 to evaluate for any version of the contract
-            Version version = FrameworkUtilities.Ensure4PartVersion(assemblyVersion);
-            FrameworkSet fxs = GetInboxFrameworks(frameworkListsPath);
-
-            Version latestLegacyVersion = null;
-            fxs.LastNonSemanticVersions.TryGetValue(assemblyName, out latestLegacyVersion);
-
-            foreach (var fxVersions in fxs.Frameworks.Values)
-            {
-                // Get the nearest compatible framework from this set of frameworks.
-                var nearest = FrameworkUtilities.GetNearest(framework, fxVersions.Select(fx => NuGetFramework.Parse(fx.ShortName)).ToArray());
-                // If there are not compatible frameworks in the current framework set, there is not going to be a match.
-                if (nearest == null)
-                {
-                    continue;
-                }
-                
-                // don't allow PCL to specify inbox for non-PCL framework.
-                if (nearest.IsPCL != framework.IsPCL)
-                {
-                    continue;
-                }
-                
-                // find the first version (if any) that supports this contract
-                foreach (var fxVersion in fxVersions)
-                {
-                    Version supportedVersion;
-                    if (fxVersion.Assemblies.TryGetValue(assemblyName, out supportedVersion))
-                    {
-                        if (supportedVersion >= version)
-                        {
-                            return true;
-                        }
-
-                        // new versions represent API surface via major.minor only, so consider
-                        // a contract as supported so long as the latest legacy version is supported
-                        // and this contract's major.minor match the latest legacy version.
-                        if (supportedVersion == latestLegacyVersion &&
-                            version.Major == latestLegacyVersion.Major && version.Minor == latestLegacyVersion.Minor)
-                        {
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-
-
-        internal static IEnumerable<NuGetFramework> GetAlllInboxFrameworks(string frameworkListsPath)
-        {
-            FrameworkSet fxs = FrameworkSet.Load(frameworkListsPath);
-            return fxs.Frameworks.SelectMany(fxList => fxList.Value).Select(fx => NuGetFramework.Parse(fx.ShortName));
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNetStandardSupportTable.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNetStandardSupportTable.cs
deleted file mode 100644
index b6fbc00962c..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNetStandardSupportTable.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.Arcade.Common;
-using Microsoft.Build.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using NuGet.Frameworks;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-namespace Microsoft.DotNet.Build.Tasks.Packaging
-{
-    public class GenerateNetStandardSupportTable : BuildTask
-    {
-        const string startMarker = "<!-- begin NetStandardSupportTable -->";
-        const string endMarker = "<!-- end NetStandardSupportTable -->";
-
-        [Required]
-        public ITaskItem[] Reports
-        {
-            get;
-            set;
-        }
-
-        [Required]
-        public string DocFilePath
-        {
-            get;
-            set;
-        }
-
-        public bool InsertIntoFile
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Generates a table in markdown that lists the API version supported by 
-        /// various packages at all levels of NETStandard.
-        /// </summary>
-        /// <returns></returns>
-        public override bool Execute()
-        {
-            if (Reports == null || Reports.Length == 0)
-            {
-                Log.LogError("Reports argument must be specified");
-                return false;
-            }
-
-            if (String.IsNullOrEmpty(DocFilePath))
-            {
-                Log.LogError("DocFilePath argument must be specified");
-                return false;
-            }
-
-            string docDir = Path.GetDirectoryName(DocFilePath);
-            if (!Directory.Exists(docDir))
-            {
-                Directory.CreateDirectory(docDir);
-            }
-
-            SortedSet<Version> knownNetStandardVersions = new SortedSet<Version>();
-            List<SupportRow> rows = new List<SupportRow>(Reports.Length);
-
-            foreach (var reportPath in Reports.Select(r => r.GetMetadata("FullPath")))
-            {
-                SupportRow row = new SupportRow();
-                row.Name = Path.GetFileNameWithoutExtension(reportPath);
-                row.SuportedVersions = new SortedSet<NETStandardApiVersion>();
-
-                var report = PackageReport.Load(reportPath);
-
-                foreach(var supportedFramework in report.SupportedFrameworks)
-                {
-                    var fx = NuGetFramework.Parse(supportedFramework.Key);
-
-                    if (fx.Framework == FrameworkConstants.FrameworkIdentifiers.NetStandard)
-                    {
-                        row.SuportedVersions.Add(new NETStandardApiVersion(fx.Version, new Version(supportedFramework.Value.ToString())));
-                        knownNetStandardVersions.Add(fx.Version);
-                    }
-                }
-                rows.Add(row);
-            }
-
-            StringBuilder table = new StringBuilder();
-            table.AppendLine($"| Contract | {String.Join(" | ", knownNetStandardVersions.Select(v => v.ToString(2)))} |");
-            table.AppendLine($"| -------- | {String.Join(" | ", Enumerable.Repeat("---", knownNetStandardVersions.Count))}");
-
-            foreach(var row in rows.OrderBy(r => r.Name))
-            {
-                if (row.SuportedVersions.Count == 0)
-                {
-                    Log.LogMessage($"Skipping {row.Name} since it has no supported NETStandard versions");
-                    continue;
-                }
-
-                table.Append($"| {row.Name} |");
-                    
-                foreach (var netStandardVersion in knownNetStandardVersions)
-                {
-                    var apiVersion = row.SuportedVersions.LastOrDefault(a => a.NETStandardVersion <= netStandardVersion);
-
-                    table.Append(" ");
-                    if (apiVersion != null)
-                    {
-                        table.Append(apiVersion.APIVersion.ToString(3));
-                    }
-                    table.Append(" |");
-                }
-                table.AppendLine();
-            }
-
-            if (!InsertIntoFile)
-            {
-                File.WriteAllText(DocFilePath, table.ToString());
-            }
-            else
-            {
-                if (!File.Exists(DocFilePath))
-                {
-                    Log.LogError($"InsertIntoFile was specified as true but {DocFilePath} did not exist.");
-                    return false;
-                }
-
-                string originalText = File.ReadAllText(DocFilePath);
-                int startIndex = originalText.IndexOf(startMarker);
-
-                if (startIndex < 0)
-                {
-                    Log.LogError($"InsertIntoFile was specified as true but could not locate insertion start text \"{startMarker}\".");
-                    return false;
-                }
-                startIndex += startMarker.Length;
-                // skip any white-space / new line
-                while(startIndex < originalText.Length && Char.IsWhiteSpace(originalText[startIndex]))
-                {
-                    startIndex++;
-                }
-
-                int endIndex = originalText.IndexOf(endMarker, startIndex);
-
-                if (endIndex < 0)
-                {
-                    Log.LogError($"InsertIntoFile was specified as true but could not locate insertion end text \"{endMarker}\".");
-                    return false;
-                }
-                var docText = new StringBuilder(originalText);
-                docText.Remove(startIndex, endIndex - startIndex);
-                docText.Insert(startIndex, table.ToString());
-
-                File.WriteAllText(DocFilePath, docText.ToString(), Encoding.UTF8);
-            }
-
-
-            return !Log.HasLoggedErrors;
-        }
-
-        private class SupportRow
-        {
-            public string Name { get; set; }
-            public SortedSet<NETStandardApiVersion> SuportedVersions { get; set; }
-        }
-
-        private class NETStandardApiVersion : IComparable<NETStandardApiVersion>
-        {
-            public NETStandardApiVersion(Version netStandardVersion, Version apiVersion)
-            {
-                NETStandardVersion = netStandardVersion;
-                APIVersion = apiVersion;
-            }
-
-            public Version NETStandardVersion { get; }
-            public Version APIVersion {get;}
-
-            public int CompareTo(NETStandardApiVersion other)
-            {
-                return NETStandardVersion.CompareTo(other.NETStandardVersion);
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNuSpec.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNuSpec.cs
index 00f126a2222..7e1604b853d 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNuSpec.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNuSpec.cs
@@ -19,7 +19,7 @@
 
 namespace Microsoft.DotNet.Build.Tasks.Packaging
 {
-    public class GenerateNuSpec : Task
+    public class GenerateNuSpec : Microsoft.Build.Utilities.Task
     {
         private static readonly XNamespace NuSpecXmlNamespace = @"http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd";
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GeneratePackageReport.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GeneratePackageReport.cs
index 37fc39111f3..1ebaaffdec3 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GeneratePackageReport.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GeneratePackageReport.cs
@@ -387,20 +387,5 @@ private void MarkUsed(IEnumerable<string> targetPaths)
                 _unusedTargetPaths.Remove(targetPath);
             }
         }
-
-        private class SupportFramework
-        {
-            private static readonly string[] s_nullRidList = new string[] { null };
-            public SupportFramework(NuGetFramework framework)
-            {
-                Framework = framework;
-                RuntimeIds = s_nullRidList;
-            }
-
-            public NuGetFramework Framework { get; }
-            public string[] RuntimeIds { get; set; }
-
-            public string ShortName { get { return Framework.GetShortFolderName(); } }            
-        }
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateRuntimeGraph.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateRuntimeGraph.cs
deleted file mode 100644
index 7948abe8db1..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateRuntimeGraph.cs
+++ /dev/null
@@ -1,678 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.Build.Framework;
-using Newtonsoft.Json;
-using NuGet.RuntimeModel;
-using NuGet.Versioning;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-
-namespace Microsoft.DotNet.Build.Tasks.Packaging
-{
-    public class GenerateRuntimeGraph : BuildTask
-    {
-
-        /// <summary>
-        /// A set of RuntimeGroups that can be used to generate a runtime graph
-        ///   Identity: the base string for the RID, without version architecture, or qualifiers.
-        ///   Parent: the base string for the parent of this RID.  This RID will be imported by the baseRID, architecture-specific, 
-        ///     and qualifier-specific RIDs (with the latter two appending appropriate architecture and qualifiers).
-        ///   Versions: A list of strings delimited by semi-colons that represent the versions for this RID.
-        ///   TreatVersionsAsCompatible: Default is true.  When true, version-specific RIDs will import the previous 
-        ///     version-specific RID in the Versions list, with the first version importing the version-less RID.  
-        ///     When false all version-specific RIDs will import the version-less RID (bypassing previous version-specific RIDs)
-        ///   OmitVersionDelimiter: Default is false.  When true no characters will separate the base RID and version (EG: win7).
-        ///     When false a '.' will separate the base RID and version (EG: osx.10.12).
-        ///   ApplyVersionsToParent: Default is false.  When true, version-specific RIDs will import version-specific Parent RIDs
-        ///     similar to is done for architecture and qualifier (see Parent above).
-        ///   Architectures: A list of strings delimited by semi-colons that represent the architectures for this RID.
-        ///   AdditionalQualifiers: A list of strings delimited by semi-colons that represent the additional qualifiers for this RID.
-        ///     Additional qualifers do not stack, each only applies to the qualifier-less RIDs (so as not to cause combinatorial 
-        ///     exponential growth of RIDs).
-        ///
-        /// The following options can be used under special circumstances but break the normal precedence rules we try to establish
-        /// by generating the RID graph from common logic. These options make it possible to create a RID fallback chain that doesn't 
-        /// match the rest of the RIDs and therefore is hard for developers/package authors to reason about. 
-        /// Only use these options for cases where you know what you are doing and have carefully reviewed the resulting RID fallbacks
-        /// using the CompatibliltyMap.
-        ///   OmitRIDs: A list of strings delimited by semi-colons that represent RIDs calculated from this RuntimeGroup that should
-        ///     be omitted from the RuntimeGraph.  These RIDs will not be referenced nor defined.
-        ///   OmitRIDDefinitions: A list of strings delimited by semi-colons that represent RIDs calculated from this RuntimeGroup 
-        ///     that should be omitted from the RuntimeGraph.  These RIDs will not be defined by this RuntimeGroup, but will be 
-        ///     referenced: useful in case some other RuntimeGroup (or runtime.json template) defines them.
-        ///   OmitRIDReferences: A list of strings delimited by semi-colons that represent RIDs calculated from this RuntimeGroup 
-        ///     that should be omitted from the RuntimeGraph.  These RIDs will be defined but not referenced by this RuntimeGroup.
-        /// </summary>
-        public ITaskItem[] RuntimeGroups
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Optional source Runtime.json to use as a starting point when merging additional RuntimeGroups
-        /// </summary>
-        public string SourceRuntimeJson
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Where to write the final runtime.json
-        /// </summary>
-        public string RuntimeJson
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Optionally, other runtime.jsons which may contain imported RIDs
-        /// </summary>
-        public string[] ExternalRuntimeJsons
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// When defined, specifies the file to write compatibility precedence for each RID in the graph.
-        /// </summary>
-        public string CompatibilityMap
-        {
-            get;
-            set;
-        }
-
-
-        /// <summary>
-        /// True to write the generated runtime.json to RuntimeJson and compatibility map to CompatibilityMap, otherwise files are read and diffed 
-        /// with generated versions and an error is emitted if they differ.
-        /// Setting UpdateRuntimeFiles will overwrite files even when the file is marked ReadOnly.
-        /// </summary>
-        public bool UpdateRuntimeFiles
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// When defined, specifies the file to write a DGML representation of the runtime graph.
-        /// </summary>
-        public string RuntimeDirectedGraph
-        {
-            get;
-            set;
-        }
-
-        public override bool Execute()
-        {
-            if (RuntimeGroups != null && RuntimeGroups.Any() && RuntimeJson == null)
-            {
-                Log.LogError($"{nameof(RuntimeJson)} argument must be specified when {nameof(RuntimeGroups)} is specified.");
-                return false;
-            }
-
-            RuntimeGraph runtimeGraph;
-            if (!String.IsNullOrEmpty(SourceRuntimeJson))
-            {
-                if (!File.Exists(SourceRuntimeJson))
-                {
-                    Log.LogError($"{nameof(SourceRuntimeJson)} did not exist at {SourceRuntimeJson}.");
-                    return false;
-                }
-
-                runtimeGraph = JsonRuntimeFormat.ReadRuntimeGraph(SourceRuntimeJson);
-            }
-            else
-            {
-                runtimeGraph = new RuntimeGraph();
-            }
-
-            foreach (var runtimeGroup in RuntimeGroups.NullAsEmpty().Select(i => new RuntimeGroup(i)))
-            {
-                runtimeGraph = SafeMerge(runtimeGraph, runtimeGroup);
-            }
-
-            Dictionary<string, string> externalRids = new Dictionary<string, string>();
-            if (ExternalRuntimeJsons != null)
-            {
-                foreach(var externalRuntimeJson in ExternalRuntimeJsons)
-                {
-                    RuntimeGraph externalRuntimeGraph = JsonRuntimeFormat.ReadRuntimeGraph(externalRuntimeJson);
-
-                    foreach (var runtime in externalRuntimeGraph.Runtimes.Keys)
-                    {
-                        // don't check for duplicates, we merely care what is external
-                        externalRids.Add(runtime, externalRuntimeJson);
-                    }
-                }
-            }
-
-            ValidateImports(runtimeGraph, externalRids);
-
-            if (!String.IsNullOrEmpty(RuntimeJson))
-            {
-                if (UpdateRuntimeFiles)
-                {
-                    EnsureWritable(RuntimeJson);
-                    NuGetUtility.WriteRuntimeGraph(RuntimeJson, runtimeGraph);
-                }
-                else
-                {
-                    // validate that existing file matches generated file
-                    if (!File.Exists(RuntimeJson))
-                    {
-                        Log.LogError($"{nameof(RuntimeJson)} did not exist at {RuntimeJson} and {nameof(UpdateRuntimeFiles)} was not specified.");
-                    }
-                    else
-                    {
-                        var existingRuntimeGraph = JsonRuntimeFormat.ReadRuntimeGraph(RuntimeJson);
-
-                        if (!existingRuntimeGraph.Equals(runtimeGraph))
-                        {
-                            Log.LogError($"The generated {nameof(RuntimeJson)} differs from {RuntimeJson} and {nameof(UpdateRuntimeFiles)} was not specified.  Please specify {nameof(UpdateRuntimeFiles)}=true to commit the changes.");
-                        }
-                    }
-                }
-            }
-
-            if (!String.IsNullOrEmpty(CompatibilityMap))
-            {
-                var compatibilityMap = GetCompatibilityMap(runtimeGraph);
-                if (UpdateRuntimeFiles)
-                {
-                    EnsureWritable(CompatibilityMap);
-                    WriteCompatibilityMap(compatibilityMap, CompatibilityMap);
-                }
-                else
-                {
-                    // validate that existing file matches generated file
-                    if (!File.Exists(CompatibilityMap))
-                    {
-                        Log.LogError($"{nameof(CompatibilityMap)} did not exist at {CompatibilityMap} and {nameof(UpdateRuntimeFiles)} was not specified.");
-                    }
-                    else
-                    {
-                        var existingCompatibilityMap = ReadCompatibilityMap(CompatibilityMap);
-
-                        if (!CompatibilityMapEquals(existingCompatibilityMap, compatibilityMap))
-                        {
-                            Log.LogError($"The generated {nameof(CompatibilityMap)} differs from {CompatibilityMap} and {nameof(UpdateRuntimeFiles)} was not specified.  Please specify {nameof(UpdateRuntimeFiles)}=true to commit the changes.");
-                        }
-                    }
-                }
-            }
-
-            if (!String.IsNullOrEmpty(RuntimeDirectedGraph))
-            {
-                WriteRuntimeGraph(runtimeGraph, RuntimeDirectedGraph);
-            }
-
-            return !Log.HasLoggedErrors;
-        }
-
-        private void EnsureWritable(string file)
-        {
-            if (File.Exists(file))
-            {
-                var existingAttributes = File.GetAttributes(file);
-
-                if ((existingAttributes & FileAttributes.ReadOnly) != 0)
-                {
-                    File.SetAttributes(file, existingAttributes &= ~FileAttributes.ReadOnly);
-                }
-            }
-        }
-
-        private RuntimeGraph SafeMerge(RuntimeGraph existingGraph, RuntimeGroup runtimeGroup)
-        {
-            var runtimeGraph = runtimeGroup.GetRuntimeGraph();
-
-            foreach (var existingRuntimeDescription in existingGraph.Runtimes.Values)
-            {
-                RuntimeDescription newRuntimeDescription;
-
-                if (runtimeGraph.Runtimes.TryGetValue(existingRuntimeDescription.RuntimeIdentifier, out newRuntimeDescription))
-                {
-                    // overlapping RID, ensure that the imports match (same ordering and content)
-                    if (!existingRuntimeDescription.InheritedRuntimes.SequenceEqual(newRuntimeDescription.InheritedRuntimes))
-                    {
-                        Log.LogError($"RuntimeGroup {runtimeGroup.BaseRID} defines RID {newRuntimeDescription.RuntimeIdentifier} with imports {String.Join(";", newRuntimeDescription.InheritedRuntimes)} which differ from existing imports {String.Join(";", existingRuntimeDescription.InheritedRuntimes)}.  You may avoid this by specifying {nameof(RuntimeGroup.OmitRIDDefinitions)} metadata with {newRuntimeDescription.RuntimeIdentifier}.");
-                    }
-                }
-            }
-
-            return RuntimeGraph.Merge(existingGraph, runtimeGraph);
-        }
-
-        private void ValidateImports(RuntimeGraph runtimeGraph, IDictionary<string, string> externalRIDs)
-        {
-            foreach (var runtimeDescription in runtimeGraph.Runtimes.Values)
-            {
-                string externalRuntimeJson;
-
-                if (externalRIDs.TryGetValue(runtimeDescription.RuntimeIdentifier, out externalRuntimeJson))
-                {
-                    Log.LogError($"Runtime {runtimeDescription.RuntimeIdentifier} is defined in both this RuntimeGraph and {externalRuntimeJson}.");
-                }
-
-                foreach (var import in runtimeDescription.InheritedRuntimes)
-                {
-                    if (!runtimeGraph.Runtimes.ContainsKey(import) && !externalRIDs.ContainsKey(import))
-                    {
-                        Log.LogError($"Runtime {runtimeDescription.RuntimeIdentifier} imports {import} which is not defined.");
-                    }
-                }
-            }
-        }
-
-        class RuntimeGroup
-        {
-            private const string rootRID = "any";
-            private const char VersionDelimiter = '.';
-            private const char ArchitectureDelimiter = '-';
-            private const char QualifierDelimiter = '-';
-
-            public RuntimeGroup(ITaskItem item)
-            {
-                BaseRID = item.ItemSpec;
-                Parent = item.GetString(nameof(Parent));
-                Versions = item.GetStrings(nameof(Versions));
-                TreatVersionsAsCompatible = item.GetBoolean(nameof(TreatVersionsAsCompatible), true);
-                OmitVersionDelimiter = item.GetBoolean(nameof(OmitVersionDelimiter));
-                ApplyVersionsToParent = item.GetBoolean(nameof(ApplyVersionsToParent));
-                Architectures = item.GetStrings(nameof(Architectures));
-                AdditionalQualifiers = item.GetStrings(nameof(AdditionalQualifiers));
-                OmitRIDs = new HashSet<string>(item.GetStrings(nameof(OmitRIDs)));
-                OmitRIDDefinitions = new HashSet<string>(item.GetStrings(nameof(OmitRIDDefinitions)));
-                OmitRIDReferences = new HashSet<string>(item.GetStrings(nameof(OmitRIDReferences)));
-            }
-
-            public string BaseRID { get; }
-            public string Parent { get; }
-            public IEnumerable<string> Versions { get; }
-            public bool TreatVersionsAsCompatible { get; }
-            public bool OmitVersionDelimiter { get; }
-            public bool ApplyVersionsToParent { get; }
-            public IEnumerable<string> Architectures { get; }
-            public IEnumerable<string> AdditionalQualifiers { get; }
-            public ICollection<string> OmitRIDs { get; }
-            public ICollection<string> OmitRIDDefinitions { get; }
-            public ICollection<string> OmitRIDReferences { get; }
-
-            private class RIDMapping
-            {
-                public RIDMapping(RID runtimeIdentifier)
-                {
-                    RuntimeIdentifier = runtimeIdentifier;
-                    Imports = Enumerable.Empty<RID>();
-                }
-
-                public RIDMapping(RID runtimeIdentifier, IEnumerable<RID> imports)
-                {
-                    RuntimeIdentifier = runtimeIdentifier;
-                    Imports = imports;
-                }
-
-                public RID RuntimeIdentifier { get; }
-
-                public IEnumerable<RID> Imports { get; }
-            }
-
-            private class RID
-            {
-                public string BaseRID { get; set; }
-                public string VersionDelimiter { get; set; }
-                public string Version { get; set; }
-                public string ArchitectureDelimiter { get; set; }
-                public string Architecture { get; set; }
-                public string QualifierDelimiter { get; set; }
-                public string Qualifier { get; set; }
-
-                public override string ToString()
-                {
-                    StringBuilder builder = new StringBuilder(BaseRID);
-
-                    if (HasVersion())
-                    {
-                        builder.Append(VersionDelimiter);
-                        builder.Append(Version);
-                    }
-
-                    if (HasArchitecture())
-                    {
-                        builder.Append(ArchitectureDelimiter);
-                        builder.Append(Architecture);
-                    }
-
-                    if (HasQualifier())
-                    {
-                        builder.Append(QualifierDelimiter);
-                        builder.Append(Qualifier);
-                    }
-
-                    return builder.ToString();
-                }
-
-                public bool HasVersion()
-                {
-                    return Version != null;
-                }
-
-                public bool HasArchitecture()
-                {
-                    return Architecture != null;
-                }
-
-                public bool HasQualifier()
-                {
-                    return Qualifier != null;
-                }
-            }
-
-            private RID CreateRuntime(string baseRid, string version = null, string architecture = null, string qualifier = null)
-            {
-                return new RID()
-                {
-                    BaseRID = baseRid,
-                    VersionDelimiter = OmitVersionDelimiter ? String.Empty : VersionDelimiter.ToString(),
-                    Version = version,
-                    ArchitectureDelimiter = ArchitectureDelimiter.ToString(),
-                    Architecture = architecture,
-                    QualifierDelimiter = QualifierDelimiter.ToString(),
-                    Qualifier = qualifier
-                };
-            }
-
-            private IEnumerable<RIDMapping> GetRIDMappings()
-            {
-                // base =>
-                //      Parent
-                yield return Parent == null ?
-                    new RIDMapping(CreateRuntime(BaseRID)) :
-                    new RIDMapping(CreateRuntime(BaseRID), new[] { CreateRuntime(Parent) });
-
-                foreach (var architecture in Architectures)
-                {
-                    // base + arch =>
-                    //      base,
-                    //      parent + arch
-                    var imports = new List<RID>()
-                    {
-                        CreateRuntime(BaseRID)
-                    };
-
-                    if (!IsNullOrRoot(Parent))
-                    {
-                        imports.Add(CreateRuntime(Parent, architecture: architecture));
-                    }
-
-                    yield return new RIDMapping(CreateRuntime(BaseRID, architecture: architecture), imports);
-                }
-
-                string lastVersion = null;
-                foreach (var version in Versions)
-                {
-                    // base + version =>
-                    //      base + lastVersion,
-                    //      parent + version (optionally)
-                    var imports = new List<RID>()
-                    {
-                        CreateRuntime(BaseRID, version: lastVersion)
-                    };
-
-                    if (ApplyVersionsToParent)
-                    {
-                        imports.Add(CreateRuntime(Parent, version: version));
-                    }
-
-                    yield return new RIDMapping(CreateRuntime(BaseRID, version: version), imports);
-
-                    foreach (var architecture in Architectures)
-                    {
-                        // base + version + architecture =>
-                        //      base + version,
-                        //      base + lastVersion + architecture,
-                        //      parent + version + architecture (optionally)
-                        var archImports = new List<RID>()
-                        {
-                            CreateRuntime(BaseRID, version: version),
-                            CreateRuntime(BaseRID, version: lastVersion, architecture: architecture)
-                        };
-
-                        if (ApplyVersionsToParent)
-                        {
-                            archImports.Add(CreateRuntime(Parent, version: version, architecture: architecture));
-                        }
-
-                        yield return new RIDMapping(CreateRuntime(BaseRID, version: version, architecture: architecture), archImports);
-                    }
-
-                    if (TreatVersionsAsCompatible)
-                    {
-                        lastVersion = version;
-                    }
-                }
-
-                foreach (var qualifier in AdditionalQualifiers)
-                {
-                    // base + qual =>
-                    //      base,
-                    //      parent + qual
-                    yield return new RIDMapping(CreateRuntime(BaseRID, qualifier: qualifier),
-                        new[]
-                        {
-                            CreateRuntime(BaseRID),
-                            IsNullOrRoot(Parent) ? CreateRuntime(qualifier) : CreateRuntime(Parent, qualifier:qualifier)
-                        });
-
-                    foreach (var architecture in Architectures)
-                    {
-                        // base + arch + qualifier =>
-                        //      base + qualifier,
-                        //      base + arch
-                        //      parent + arch + qualifier
-                        var imports = new List<RID>()
-                        {
-                            CreateRuntime(BaseRID, qualifier: qualifier),
-                            CreateRuntime(BaseRID, architecture: architecture)
-                        };
-
-                        if (!IsNullOrRoot(Parent))
-                        {
-                            imports.Add(CreateRuntime(Parent, architecture: architecture, qualifier: qualifier));
-                        }
-
-                        yield return new RIDMapping(CreateRuntime(BaseRID, architecture: architecture, qualifier: qualifier), imports);
-                    }
-
-                    lastVersion = null;
-                    foreach (var version in Versions)
-                    {
-                        // base + version + qualifier =>
-                        //      base + version,
-                        //      base + lastVersion + qualifier
-                        //      parent + version + qualifier (optionally)
-                        var imports = new List<RID>()
-                        {
-                            CreateRuntime(BaseRID, version: version),
-                            CreateRuntime(BaseRID, version: lastVersion, qualifier: qualifier)
-                        };
-
-                        if (ApplyVersionsToParent)
-                        {
-                            imports.Add(CreateRuntime(Parent, version: version, qualifier: qualifier));
-                        }
-
-                        yield return new RIDMapping(CreateRuntime(BaseRID, version: version, qualifier: qualifier), imports);
-
-                        foreach (var architecture in Architectures)
-                        {
-                            // base + version + architecture + qualifier =>
-                            //      base + version + qualifier, 
-                            //      base + version + architecture, 
-                            //      base + version,
-                            //      base + lastVersion + architecture + qualifier,
-                            //      parent + version + architecture + qualifier (optionally)
-                            var archImports = new List<RID>()
-                            {
-                                CreateRuntime(BaseRID, version: version, qualifier: qualifier),
-                                CreateRuntime(BaseRID, version: version, architecture: architecture),
-                                CreateRuntime(BaseRID, version: version),
-                                CreateRuntime(BaseRID, version: lastVersion, architecture: architecture, qualifier: qualifier)
-                            };
-
-                            if (ApplyVersionsToParent)
-                            {
-                                imports.Add(CreateRuntime(Parent, version: version, architecture: architecture, qualifier: qualifier));
-                            }
-
-                            yield return new RIDMapping(CreateRuntime(BaseRID, version: version, architecture: architecture, qualifier: qualifier), archImports);
-                        }
-
-                        if (TreatVersionsAsCompatible)
-                        {
-                            lastVersion = version;
-                        }
-                    }
-                }
-            }
-
-            private bool IsNullOrRoot(string rid)
-            {
-                return rid == null || rid == rootRID;
-            }
-
-
-            public IEnumerable<RuntimeDescription> GetRuntimeDescriptions()
-            {
-                foreach (var mapping in GetRIDMappings())
-                {
-                    var rid = mapping.RuntimeIdentifier.ToString();
-
-                    if (OmitRIDs.Contains(rid) || OmitRIDDefinitions.Contains(rid))
-                    {
-                        continue;
-                    }
-
-                    var imports = mapping.Imports
-                           .Select(i => i.ToString())
-                           .Where(i => !OmitRIDs.Contains(i) && !OmitRIDReferences.Contains(i))
-                           .ToArray();
-
-                    yield return new RuntimeDescription(rid, imports);
-                }
-            }
-
-            public RuntimeGraph GetRuntimeGraph()
-            {
-                return new RuntimeGraph(GetRuntimeDescriptions());
-            }
-        }
-
-        private static IDictionary<string, IEnumerable<string>> GetCompatibilityMap(RuntimeGraph graph)
-        {
-            Dictionary<string, IEnumerable<string>> compatibilityMap = new Dictionary<string, IEnumerable<string>>();
-
-            foreach (var rid in graph.Runtimes.Keys.OrderBy(rid => rid, StringComparer.Ordinal))
-            {
-                compatibilityMap.Add(rid, graph.ExpandRuntime(rid));
-            }
-
-            return compatibilityMap;
-        }
-
-        private static IDictionary<string, IEnumerable<string>> ReadCompatibilityMap(string mapFile)
-        {
-            var serializer = new JsonSerializer();
-            using (var file = File.OpenText(mapFile))
-            using (var jsonTextReader = new JsonTextReader(file))
-            {
-                return serializer.Deserialize<IDictionary<string, IEnumerable<string>>>(jsonTextReader);
-            }
-        }
-
-        private static void WriteCompatibilityMap(IDictionary<string, IEnumerable<string>> compatibilityMap, string mapFile)
-        {
-            var serializer = new JsonSerializer()
-            {
-                Formatting = Formatting.Indented,
-                StringEscapeHandling = StringEscapeHandling.EscapeNonAscii
-            };
-
-            string directory = Path.GetDirectoryName(mapFile);
-            if (!String.IsNullOrEmpty(directory) && !Directory.Exists(directory))
-            {
-                Directory.CreateDirectory(directory);
-            }
-
-            using (var file = File.CreateText(mapFile))
-            {
-                serializer.Serialize(file, compatibilityMap);
-            }
-        }
-
-        private static bool CompatibilityMapEquals(IDictionary<string, IEnumerable<string>> left, IDictionary<string, IEnumerable<string>> right)
-        {
-            if (left.Count != right.Count)
-            {
-                return false;
-            }
-
-            foreach (var leftPair in left)
-            {
-                IEnumerable<string> rightValue;
-
-                if (!right.TryGetValue(leftPair.Key, out rightValue))
-                {
-                    return false;
-                }
-
-                if (!rightValue.SequenceEqual(leftPair.Value))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private static XNamespace s_dgmlns = @"http://schemas.microsoft.com/vs/2009/dgml";
-        private static void WriteRuntimeGraph(RuntimeGraph graph, string dependencyGraphFilePath)
-        {
-
-            var doc = new XDocument(new XElement(s_dgmlns + "DirectedGraph"));
-            var nodesElement = new XElement(s_dgmlns + "Nodes");
-            var linksElement = new XElement(s_dgmlns + "Links");
-            doc.Root.Add(nodesElement);
-            doc.Root.Add(linksElement);
-
-            var nodeIds = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-            foreach (var runtimeDescription in graph.Runtimes.Values)
-            {
-                nodesElement.Add(new XElement(s_dgmlns + "Node",
-                    new XAttribute("Id", runtimeDescription.RuntimeIdentifier)));
-
-                foreach (var import in runtimeDescription.InheritedRuntimes)
-                {
-                    linksElement.Add(new XElement(s_dgmlns + "Link",
-                        new XAttribute("Source", runtimeDescription.RuntimeIdentifier),
-                        new XAttribute("Target", import)));
-                }
-            }
-
-            using (var file = File.Create(dependencyGraphFilePath))
-            {
-                doc.Save(file);
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Generations.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Generations.cs
deleted file mode 100644
index 36133a2e474..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Generations.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using NuGet.Frameworks;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection.Metadata;
-using System.Reflection.PortableExecutable;
-
-namespace Microsoft.DotNet.Build.Tasks.Packaging
-{
-    public class Generations
-    {
-        public static Version DetermineGenerationForFramework(NuGetFramework framework, bool useNetPlatform)
-        {
-            FrameworkExpander expander = new FrameworkExpander();
-            var generationFramework = useNetPlatform ? FrameworkConstants.FrameworkIdentifiers.NetPlatform : FrameworkConstants.FrameworkIdentifiers.NetStandard;
-            var generationFxs = expander.Expand(framework).Where(fx => fx.Framework == generationFramework).Select(fx => fx.Version);
-
-            return generationFxs.Max();
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeJsonValues.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeJsonValues.cs
index 43a35e4fec3..910dd33ce4d 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeJsonValues.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeJsonValues.cs
@@ -9,7 +9,7 @@
 namespace Microsoft.DotNet.Build.Tasks.Packaging
 {
     // Read a runtime.json file into an msbuild item group
-    public class GetRuntimeJsonValues : Task
+    public class GetRuntimeJsonValues : Microsoft.Build.Utilities.Task
     {
         // runtime.json file path
         [Required]
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeTargets.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeTargets.cs
index 4cb5bd43827..960d9f830a9 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeTargets.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GetRuntimeTargets.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.DotNet.Build.Tasks.Packaging
 {
-    public class GetRuntimeTargets : Task
+    public class GetRuntimeTargets : Microsoft.Build.Utilities.Task
     {
         // runtime.json file path
         [Required]
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
index 1148b8a5ac7..57f5cfb9da9 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
@@ -18,10 +18,8 @@
 - ApplyPreReleaseSuffix
 - CreateTrimDependencyGroups
 - FilterUnknownPackages
-- GenerateNetStandardSupportTable
 - GeneratePackageReport
 - GenerateRuntimeDependencies
-- GenerateRuntimeGraph
 - GetApplicableAssetsFromPackageReports
 - GetApplicableAssetsFromPackages
 - GetAssemblyReferences
@@ -40,9 +38,7 @@
 - SplitDependenciesBySupport
 - SplitReferences
 - UpdatePackageIndex
-- ValidationTask
-- VerifyClosure
-- VerifyTypes</PackageDescription>
+- ValidationTask</PackageDescription>
 
     <DefaultItemExcludes Condition="'$(TargetFramework)' != 'net472'">**/*.Desktop.*</DefaultItemExcludes>
     <BeforePack>$(BeforePack);AddRuntimeJson</BeforePack>
@@ -91,7 +87,7 @@
   <Target Name="FindRuntimeJson" Inputs="%(_candidatPackageFolders.Identity)" Outputs="unused">
     <PropertyGroup>
       <_candidatePackageFolder>%(_candidatPackageFolders.Identity)</_candidatePackageFolder>
-      <_runtimeJsonSubPath>Microsoft.NETCore.Platforms\2.1.0\runtime.json</_runtimeJsonSubPath>
+      <_runtimeJsonSubPath>Microsoft.NETCore.Platforms\$(MicrosoftNETCorePlatformsVersion)\runtime.json</_runtimeJsonSubPath>
       <_runtimeJsonPath Condition="'$(_runtimeJsonPath)' == '' AND Exists('$(_candidatePackageFolder)\$(_runtimeJsonSubPath)')">$(_candidatePackageFolder)\$(_runtimeJsonSubPath)</_runtimeJsonPath>
       <_runtimeJsonPath Condition="'$(_runtimeJsonPath)' == '' AND Exists('$(_candidatePackageFolder)\$(_runtimeJsonSubPath.ToLower())')">$(_candidatePackageFolder)\$(_runtimeJsonSubPath.ToLower())</_runtimeJsonPath>
     </PropertyGroup>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets
index d10bcf46e6e..c9a95a0ad95 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets
@@ -25,7 +25,6 @@
   <UsingTask TaskName="FilterUnknownPackages" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
   <UsingTask TaskName="GenerateNuSpec" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
   <UsingTask TaskName="GeneratePackageReport" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
-  <UsingTask TaskName="GenerateRuntimeGraph" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
   <UsingTask TaskName="GenerateRuntimeDependencies" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
   <UsingTask TaskName="GenerateSourceWithPublicTypesAsInternal" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll" />
   <UsingTask TaskName="GetApplicableAssetsFromPackages" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
@@ -45,7 +44,5 @@
   <UsingTask TaskName="UpdatePackageIndex" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
   <UsingTask TaskName="ValidatePackage" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
   <UsingTask TaskName="ValidateFrameworkPackage" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
-  <UsingTask TaskName="VerifyClosure" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
-  <UsingTask TaskName="VerifyTypes" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
   <UsingTask TaskName="GetSupportedPackagesFromPackageReports" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
 </Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
index a78c5cd91cb..8d8af6a664d 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
@@ -433,7 +433,7 @@
     </HarvestPackage>
 
     <ItemGroup>
-      <SupportedFramework Include="@(_HarvestedSupportedFramework)" Exclude="@(NotSupportedOnTargetFramework)" />
+      <SupportedFramework Include="@(_HarvestedSupportedFramework)" Exclude="@(NotSupportedOnTargetFramework);@(ExcludeHarvestedSupportedFramework)" />
     </ItemGroup>
   </Target>
 
@@ -929,6 +929,10 @@
     <DefaultValidateFramework Include="netcoreapp3.0">
       <RuntimeIDs>@(NETCoreApp30RIDs)</RuntimeIDs>
     </DefaultValidateFramework>
+    <NETCoreApp31RIDs Condition="'@(NETCoreApp31RIDs)' == ''" Include="@(NETCoreApp30RIDs)" />
+    <DefaultValidateFramework Include="netcoreapp3.1">
+      <RuntimeIDs>@(NETCoreApp31RIDs)</RuntimeIDs>
+    </DefaultValidateFramework>
     <NETCoreApp50RIDs Condition="'@(NETCoreApp50RIDs)' == ''" Include="@(NETCoreApp30RIDs)" />
     <DefaultValidateFramework Include="net5.0">
       <RuntimeIDs>@(NETCoreApp50RIDs)</RuntimeIDs>
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/AddTargetFrameworksToProjectTask.cs b/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/AddTargetFrameworksToProjectTask.cs
deleted file mode 100644
index c6b458407d2..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/AddTargetFrameworksToProjectTask.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk
-{
-    public class AddTargetFrameworksToProjectTask : BuildTask
-    {
-        [Required]
-        public string ProjectName { get; set; }
-        
-        [Required]
-        public ITaskItem[] BestTargetFrameworks { get; set; }
-
-        [Output]
-        public ITaskItem[] InnerBuildProjects { get; set; }
-
-        public override bool Execute()
-        {
-            InnerBuildProjects = new ITaskItem[BestTargetFrameworks.Length];
-            for (int i = 0; i < BestTargetFrameworks.Length; i++)
-            {
-                InnerBuildProjects[i] = new TaskItem(ProjectName);
-                InnerBuildProjects[i].SetMetadata("AdditionalProperties", "TargetFramework=" + BestTargetFrameworks[i]);
-            }
-
-            return !Log.HasLoggedErrors;
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.props b/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.props
deleted file mode 100644
index a85fce1f30d..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.props
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project TreatAsLocalProperty="TargetFramework">
-  <!-- Add unparsed TargetFrameworks property to GetTargetFrameworks return item metadata to read from it later. -->
-  <ItemDefinitionGroup>
-    <_ThisProjectBuildMetadata>
-      <RawTargetFrameworks>$(TargetFrameworks)</RawTargetFrameworks>
-    </_ThisProjectBuildMetadata>
-  </ItemDefinitionGroup>
-
-  <PropertyGroup>
-    <DotNetBuildTasksTargetFrameworkSdkAssembly Condition="'$(DotNetBuildTasksTargetFrameworkSdkAssembly)' == '' AND '$(MSBuildRuntimeType)' == 'core'">..\tools\netcoreapp3.1\Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.dll</DotNetBuildTasksTargetFrameworkSdkAssembly>
-    <DotNetBuildTasksTargetFrameworkSdkAssembly Condition="'$(DotNetBuildTasksTargetFrameworkSdkAssembly)' == '' AND '$(MSBuildRuntimeType)' != 'core'">..\tools\net472\Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.dll</DotNetBuildTasksTargetFrameworkSdkAssembly>
-    <_OriginalTargetFramework>$(TargetFramework)</_OriginalTargetFramework>
-    <TargetFrameworkPattern>(((netstandard|netcoreapp)[0-9\.]+)|(net[1-4][1-9\.]+))(-[^;]+)</TargetFrameworkPattern>
-    <TargetFrameworkWithoutSuffix>$(TargetFramework)</TargetFrameworkWithoutSuffix>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$(TargetFramework.Contains('-'))">
-    <TargetFrameworkSuffix>$(TargetFramework.SubString($([MSBuild]::Add($(TargetFramework.IndexOf('-')), 1))))</TargetFrameworkSuffix>
-    <TargetFrameworkWithoutSuffix>$(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-'))))</TargetFrameworkWithoutSuffix>
-    <!-- Strip away the TargetPlatform during the build because the assets file and nuget generated files does not know about the TargetPlatform for frameworks older than net5.0.-->
-    <TargetFramework>$([System.Text.RegularExpressions.Regex]::Replace('$(TargetFramework)', '$(TargetFrameworkPattern)', '${1}'))</TargetFramework>
-  </PropertyGroup>
-</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets b/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets
deleted file mode 100644
index 09e974e52cf..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets
+++ /dev/null
@@ -1,131 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-  <UsingTask TaskName="ChooseBestP2PTargetFrameworkTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkSdkAssembly)" />
-  <UsingTask TaskName="ChooseBestTargetFrameworksTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkSdkAssembly)" />
-  <UsingTask TaskName="AddTargetFrameworksToProjectTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkSdkAssembly)" />
-
-  <!-- Strip away the TargetPlatforms during the graph build restore for frameworks older than net5.0 -->
-  <PropertyGroup Condition="'$(IsGraphBuild)' == 'true' and '$(MSBuildRestoreSessionId)' != ''">
-    <TargetFrameworks Condition="'$(TargetFrameworks)' != ''">$([System.Text.RegularExpressions.Regex]::Replace('$(TargetFrameworks)', '$(TargetFrameworkPattern)', '${1}'))</TargetFrameworks>
-  </PropertyGroup>
-
-  <!-- We filter _InnerBuildProjects items during DispatchToInnerBuilds and Clean to only run for best target frameworks. -->
-  <Target Name="RunOnlyBestTargetFrameworks"
-          Condition="'$(IsCrossTargetingBuild)' == 'true' and ('$(BuildTargetFramework)' != '' or '$(MSBuildProjectExtension)' == '.pkgproj')" 
-          BeforeTargets="DispatchToInnerBuilds;Clean"
-          DependsOnTargets="GetProjectWithBestTargetFrameworks">
-    <ItemGroup>
-      <_OriginalInnerBuildProjects Include="@(_InnerBuildProjects)" />
-      <_InnerBuildProjects Remove="@(_InnerBuildProjects)" />
-      <_InnerBuildProjects Include="@(InnerBuildProjectsWithBestTargetFramework)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- As _InnerBuildProjects items are used in the GetTargetFrameworks path as well (>= .NET 5), we restore the item state. -->
-  <Target Name="RestoreInnerBuildProjects"
-          BeforeTargets="GetTargetFrameworksWithPlatformFromInnerBuilds"
-          AfterTargets="DispatchToInnerBuilds;Clean"
-          Condition="'@(_OriginalInnerBuildProjects)' != ''">
-    <ItemGroup>
-      <_InnerBuildProjects Remove="@(_InnerBuildProjects)" />
-      <_InnerBuildProjects Include="@(_OriginalInnerBuildProjects)" />
-    </ItemGroup>
-  </Target>
-  
-  <Target Name="GetProjectWithBestTargetFrameworks">
-    <ItemGroup Condition="'$(BuildTargetFramework)' != ''">
-      <_BuildTargetFrameworkWithTargetOS Include="$(BuildTargetFramework)-$(TargetOS)" />
-    </ItemGroup>
-    <ItemGroup Condition="'$(BuildTargetFramework)' == ''">
-      <_BuildTargetFrameworkWithoutOS Include="$([MSBuild]::Unescape($([System.Text.RegularExpressions.Regex]::Replace('$(TargetFrameworks)', '(-[^;]+)', ''))))" />
-      <!-- TODO: Find a better way to filter out non applicable TargetOS values for .NET Framework. -->
-      <_BuildTargetFrameworkWithTargetOS Include="@(_BuildTargetFrameworkWithoutOS->Distinct()->'%(Identity)-$(TargetOS)')"
-                                         Condition="'$(TargetOS)' == 'windows' or !$([System.String]::Copy('%(Identity)').StartsWith('net4'))" />
-    </ItemGroup>
-    
-    <ChooseBestTargetFrameworksTask BuildTargetFrameworks="@(_BuildTargetFrameworkWithTargetOS);$(AdditionalBuildTargetFrameworks)"
-                                    SupportedTargetFrameworks="$(TargetFrameworks)"
-                                    RuntimeGraph="$(RuntimeGraph)">
-      <Output TaskParameter="BestTargetFrameworks" ItemName="_BestTargetFramework" />
-    </ChooseBestTargetFrameworksTask>
-
-    <AddTargetFrameworksToProjectTask ProjectName="$(MSBuildProjectFile)"
-                                      BestTargetFrameworks="@(_BestTargetFramework)" >
-      <Output TaskParameter="InnerBuildProjects" ItemName="InnerBuildProjectsWithBestTargetFramework" />
-    </AddTargetFrameworksToProjectTask>
-  </Target>
-
-  <!--
-    Runs in a leaf project (csproj) to determine best configuration for ProjectReferences.
-    Make sure to run late enough for transitive dependencies which runs before AssignProjectConfiguration.
-  -->
-  <Target Name="ResolveP2PReferences"
-          Condition="'@(ProjectReference)' != ''"
-          BeforeTargets="AssignProjectConfiguration"
-          DependsOnTargets="ResolvePackageDependenciesForBuild">
-    <PropertyGroup>
-      <_OriginalTargetFramework Condition="'$(_OriginalTargetFramework)' == ''">$(TargetFramework)</_OriginalTargetFramework>
-    </PropertyGroup>
-
-    <MSBuild Projects="@(ProjectReference)"
-             Targets="GetTargetFrameworks"
-             BuildInParallel="$(BuildInParallel)"
-             RemoveProperties="TargetFramework;RuntimeIdentifier"
-             Condition="'%(ProjectReference.SkipGetTargetFrameworkProperties)' != 'true'"
-             SkipNonexistentTargets="true">
-      <Output TaskParameter="TargetOutputs" ItemName="_ProjectReferenceWithTargetFrameworks" />
-    </MSBuild>
-
-    <ItemGroup>
-      <_ProjectReferenceWithTargetFrameworks Include="@(ProjectReference->WithMetadataValue('SkipGetTargetFrameworkProperties', 'true'))" />
-    </ItemGroup>
-
-    <ChooseBestP2PTargetFrameworkTask TargetFramework="$(_OriginalTargetFramework)"
-                                      ProjectReferencesWithTargetFrameworks="@(_ProjectReferenceWithTargetFrameworks)"
-                                      RuntimeGraph="$(RuntimeGraph)" >
-      <Output TaskParameter="AnnotatedProjectReferencesWithSetTargetFramework" ItemName="_ProjectReferenceWithBestTargetFramework" />
-    </ChooseBestP2PTargetFrameworkTask>
-    
-    <ItemGroup>
-      <ProjectReference Remove="@(ProjectReference)" />
-      <ProjectReference Include="@(_ProjectReferenceWithBestTargetFramework)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="ExpandAllPackageTargetFrameworks"
-          BeforeTargets="ExpandProjectReferences"
-          Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">
-    <MSBuild Targets="GetPackageTargetFrameworksList"
-             Projects="@(_NonPkgProjProjectReference)">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="_NonPkgProjProjectReferenceTargetFramework" />
-    </MSBuild>
-    
-    <ItemGroup>
-      <!-- assign TargetFramework as a separate step to prevent batching during the transform which can reorder the list.
-           order or projects matters here since this applies to traversal projects which build projects serially. -->
-      <_NonPkgProjProjectReferenceTargetFrameworkWithAdditionalProperties Include="@(_NonPkgProjProjectReferenceTargetFramework->'%(OriginalItemSpec)')">
-        <AdditionalProperties>TargetFramework=%(_NonPkgProjProjectReferenceTargetFramework.Identity);%(_NonPkgProjProjectReferenceTargetFramework.AdditionalProperties)</AdditionalProperties>
-      </_NonPkgProjProjectReferenceTargetFrameworkWithAdditionalProperties>
-
-    </ItemGroup>
-
-    <ItemGroup>
-      <_NonPkgProjProjectReference Remove="@(_NonPkgProjProjectReference)" />
-      <_NonPkgProjProjectReference Include="@(_NonPkgProjProjectReferenceTargetFrameworkWithAdditionalProperties)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="GetPackageTargetFrameworksList"
-          Returns="$(PackageTargetFrameworks)">
-    <ItemGroup>
-      <PackageTargetFrameworksList Include="$(TargetFrameworks)" />
-      <PackageTargetFrameworksList Remove="@(PackageTargetFrameworksList)" Condition="$([System.String]::Copy('%(Identity)').StartsWith('_'))" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <PackageTargetFrameworks>@(PackageTargetFrameworksList)</PackageTargetFrameworks>
-    </PropertyGroup>
-  </Target>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/sdk/Sdk.targets b/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/sdk/Sdk.targets
deleted file mode 100644
index 5f26baafa0e..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/sdk/Sdk.targets
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-  <Import Project="..\build\Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets" />
-  <Import Project="..\build\BinPlace.targets" />
-</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/README.md b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/README.md
similarity index 82%
rename from src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/README.md
rename to src/Microsoft.DotNet.Build.Tasks.TargetFramework/README.md
index 87b98b118c8..77f231a699d 100644
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/README.md
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/README.md
@@ -1,4 +1,4 @@
-Part of the TargetFramework SDK is the binplacing infrastructure which is described below. The TargetFramework SDK infrastructure itself isn't yet documented.
+Part of the TargetFramework package is the binplacing infrastructure which is described below. The TargetFramework package infrastructure itself isn't yet documented.
 
 ## BinPlacing
 
@@ -12,6 +12,12 @@ Supports copying to additional paths based on which `TargetFramework` among `Tar
     - Metadata:
         - TargetPath: when specified can indicate the relative path, including filename, to place the item.
 
+- BinPlaceDir
+    - Typically specified by the repository to control the output directories of projects.  Unlike `BinPlaceTargetFramework` no conditions are applied.
+    - Identity: diretory to copy `BinPlaceItem`s to.
+    - Metadata:
+        - ItemName: An item name to use instead of `BinPlaceItem` for the source of items for this `BinPlaceDir`.
+
 - BinPlaceTargetFramework
     - Typically specified by the repository to control the output directories of projects.
     - Identity: `TargetFramework` to binplace for. A `BinPlaceTargetFramework` is *active* if it is the best `TargetFramework` for the currently building project `TargetFramework`. When active it's behavior is defined by the metaadata below.
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/ChooseBestP2PTargetFrameworkTask.cs b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/ChooseBestP2PTargetFrameworkTask.cs
similarity index 65%
rename from src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/ChooseBestP2PTargetFrameworkTask.cs
rename to src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/ChooseBestP2PTargetFrameworkTask.cs
index f2249e5a353..b1cd848a5f8 100644
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/ChooseBestP2PTargetFrameworkTask.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/ChooseBestP2PTargetFrameworkTask.cs
@@ -5,7 +5,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk
+namespace Microsoft.DotNet.Build.Tasks.TargetFramework
 {
     public class ChooseBestP2PTargetFrameworkTask : BuildTask
     {
@@ -52,7 +52,25 @@ public override bool Execute()
                         Log.LogError($"Not able to find a compatible supported target framework for {referringTargetFramework} in Project {Path.GetFileName(projectReference.ItemSpec)}. The Supported Configurations are {string.Join(", ", targetFrameworks)}");
                     }
 
-                    projectReference.SetMetadata("SetTargetFramework", "TargetFramework=" + bestTargetFramework);
+                    // Mimic msbuild's Common.targets behavior: https://github.com/dotnet/msbuild/blob/3c8fb11a080a5a15199df44fabf042a22e9ad4da/src/Tasks/Microsoft.Common.CurrentVersion.targets#L1842-L1853
+                    if (projectReference.GetMetadata("HasSingleTargetFramework") != "true")
+                    {
+                        projectReference.SetMetadata("SetTargetFramework", "TargetFramework=" + bestTargetFramework);
+                    }
+                    else
+                    {
+                        // If the project has a single TargetFramework, we need to Undefine TargetFramework to avoid another project evaluation.
+                        string undefineProperties = projectReference.GetMetadata("UndefineProperties");
+                        projectReference.SetMetadata("UndefineProperties", undefineProperties + ";TargetFramework");
+                    }
+
+                    if (projectReference.GetMetadata("IsRidAgnostic") == "true")
+                    {
+                        // If the project is RID agnostic, undefine the RuntimeIdentifier property to avoid another evaluation. -->
+                        string undefineProperties = projectReference.GetMetadata("UndefineProperties");
+                        projectReference.SetMetadata("UndefineProperties", undefineProperties + ";RuntimeIdentifier");
+                    }
+
                     projectReference.SetMetadata("SkipGetTargetFrameworkProperties", "true");
                 }
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/ChooseBestTargetFrameworksTask.cs b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/ChooseBestTargetFrameworksTask.cs
similarity index 62%
rename from src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/ChooseBestTargetFrameworksTask.cs
rename to src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/ChooseBestTargetFrameworksTask.cs
index c5583605214..47a0cba2664 100644
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/ChooseBestTargetFrameworksTask.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/ChooseBestTargetFrameworksTask.cs
@@ -6,39 +6,42 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk
+namespace Microsoft.DotNet.Build.Tasks.TargetFramework
 {
     public class ChooseBestTargetFrameworksTask : BuildTask
     {
-        [Required]
-        public ITaskItem[] SupportedTargetFrameworks { get; set; }
-        
         [Required]
         public ITaskItem[] BuildTargetFrameworks { get; set; }
 
         [Required]
         public string RuntimeGraph { get; set; }
 
+        [Required]
+        public string[] SupportedTargetFrameworks { get; set; }
+
+        // Returns distinct items only. Compares the include values. Metadata is ignored.
+        public bool Distinct { get; set; }
+
         [Output]
         public ITaskItem[] BestTargetFrameworks { get; set; }
 
         public override bool Execute()
         {
-            var bestTargetFrameworkList = new List<ITaskItem>();
+            var bestTargetFrameworkList = new List<ITaskItem>(BuildTargetFrameworks.Length);
             var targetframeworkResolver = new TargetFrameworkResolver(RuntimeGraph);
-            
+ 
             foreach (ITaskItem buildTargetFramework in BuildTargetFrameworks)
             {
-                string bestTargetFramework = targetframeworkResolver.GetBestSupportedTargetFramework(SupportedTargetFrameworks.Select(t => t.ItemSpec), buildTargetFramework.ItemSpec);
-                if (bestTargetFramework != null)
-                {                    
-                    TaskItem item = new TaskItem(SupportedTargetFrameworks.First(t => t.ItemSpec == bestTargetFramework));
+                string bestTargetFramework = targetframeworkResolver.GetBestSupportedTargetFramework(SupportedTargetFrameworks, buildTargetFramework.ItemSpec);
+                if (bestTargetFramework != null && (!Distinct || !bestTargetFrameworkList.Any(b => b.ItemSpec == bestTargetFramework)))
+                {
+                    var item = new TaskItem(bestTargetFramework);
                     buildTargetFramework.CopyMetadataTo(item);
                     bestTargetFrameworkList.Add(item);
                 }
             }
 
-            BestTargetFrameworks = bestTargetFrameworkList.ToArray();
+            BestTargetFrameworks = bestTargetFrameworkList.ToArray(); 
             return !Log.HasLoggedErrors;
         }
     }
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.csproj b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj
similarity index 87%
rename from src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.csproj
rename to src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj
index d1780b4bf09..6c1a34e1760 100644
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj
@@ -7,7 +7,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsPackable>true</IsPackable>
     <Title>Configuration system for cross-targeting projects.</Title>
-    <PackageDescription>This package provides the following MSBuild tasks: ChooseBestTargetFrameworksTask, ChooseBestP2PTargetFrameworkTask and AddTargetFrameworksToProjectTask. It is also a msbuild sdk which adds default functionality via sdk imports.</PackageDescription>
+    <PackageDescription>This package provides the following MSBuild tasks: ChooseBestTargetFrameworksTask and ChooseBestP2PTargetFrameworkTask.</PackageDescription>
     <DefaultItemExcludes Condition="'$(TargetFramework)' != 'net472'">**/*.Desktop.*</DefaultItemExcludes>
   </PropertyGroup>
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/TargetFrameworkResolver.cs b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/TargetFrameworkResolver.cs
similarity index 97%
rename from src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/TargetFrameworkResolver.cs
rename to src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/TargetFrameworkResolver.cs
index 684993473de..71265b1994a 100644
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/TargetFrameworkResolver.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/TargetFrameworkResolver.cs
@@ -8,7 +8,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk
+namespace Microsoft.DotNet.Build.Tasks.TargetFramework
 {
     /// <summary>
     /// This class uses NuGet's asset selection logic to choose the best TargetFramework given the list of supported TargetFrameworks.
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/BinPlace.targets b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/BinPlace.targets
similarity index 90%
rename from src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/BinPlace.targets
rename to src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/BinPlace.targets
index 6cfaee82e47..0ad46c8afbd 100644
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/BinPlace.targets
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/BinPlace.targets
@@ -1,21 +1,21 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
-  <UsingTask TaskName="ChooseBestTargetFrameworksTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkSdkAssembly)"/>
+  <UsingTask TaskName="ChooseBestTargetFrameworksTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkAssembly)" />
+
   <PropertyGroup>
     <BinPlaceUseHardlinksIfPossible Condition="'$(BinPlaceUseHardlinksIfPossible)' == ''">true</BinPlaceUseHardlinksIfPossible>
-    <EnableBinPlacing Condition="'$(EnableBinPlacing)' == '' and ('$(BinPlaceNative)' == 'true' or '$(BinPlaceRef)' == 'true' or '$(BinPlaceRuntime)' == 'true' or '$(BinPlaceTest)' == 'true')">true</EnableBinPlacing>
   </PropertyGroup>
 
   <Target Name="BinPlace"
           DependsOnTargets="GetBinPlaceTargetFramework;BinPlaceFiles;BinPlaceProps"
           AfterTargets="CopyFilesToOutputDirectory"
-          Condition="'$(EnableBinPlacing)' == 'true'" />
+          Condition="'$(BinPlaceNative)' == 'true' or '$(BinPlaceRef)' == 'true' or '$(BinPlaceRuntime)' == 'true' or '$(BinPlaceTest)' == 'true' or '@(BinPlaceDir)' != ''" />
 
   <Target Name="BinPlaceFiles"
           Condition="'@(BinPlaceDir)' != ''"
           DependsOnTargets="GetBinPlaceItems"
           Inputs="@(BinPlaceDir);%(BinPlaceDir.ItemName);%(BinPlaceDir.Identity)"
-          Outputs="unused" >
+          Outputs="unused">
 
     <PropertyGroup>
       <_BinPlaceItemName>%(BinPlaceDir.ItemName)</_BinPlaceItemName>
@@ -59,8 +59,8 @@
 
     <!-- This filename is chosen so that each build of every project has a uniquie filename.-->
     <PropertyGroup>
-      <_propsFilename>$(TargetName).$(_OriginalTargetFramework)</_propsFilename>
-      <_propsFilename Condition="'$(TargetName)' == ''">$(MSBuildProjectName).$(_OriginalTargetFramework)</_propsFilename>
+      <_propsFilename>$(TargetName).$(TargetFramework)</_propsFilename>
+      <_propsFilename Condition="'$(TargetName)' == ''">$(MSBuildProjectName).$(TargetFramework)</_propsFilename>
       <_projectDirLength>$(ProjectDir.Length)</_projectDirLength>
     </PropertyGroup>
 
@@ -117,20 +117,22 @@
   </Target>
 
   <Target Name="GetBinPlaceTargetFramework">
-    <!-- find which, if any, supported target framework of this project is best
-         for each binplace targetFramework -->     
+    <ItemGroup>
+      <!-- This needs to be a separate item as batching doesn't work when passing in the ValueOrDefault result directly. -->
+      <_supportedTargetFramework Include="$(TargetFrameworks)" Condition="'$(TargetFrameworks)' != ''" />
+      <_supportedTargetFramework Include="$(TargetFramework)" Condition="'@(_supportedTargetFramework)' == '' and '$(TargetFramework)' != ''" />
+    </ItemGroup>
+
+    <!-- Find which, if any, supported target framework of this project is best
+         for each binplace targetFramework. -->
     <ChooseBestTargetFrameworksTask BuildTargetFrameworks="@(BinPlaceTargetFrameworks)"
-                                   SupportedTargetFrameworks="$(TargetFrameworks)"
-                                   RuntimeGraph="$(RuntimeGraph)" >
+                                    SupportedTargetFrameworks="@(_supportedTargetFramework)"
+                                    RuntimeGraph="$(RuntimeGraph)">
       <Output TaskParameter="BestTargetFrameworks" ItemName="_bestBinPlaceTargetFrameworks" />
     </ChooseBestTargetFrameworksTask>
-
-    <PropertyGroup>
-      <_OriginalTargetFramework Condition="'$(_OriginalTargetFramework)' == ''">$(TargetFramework)</_OriginalTargetFramework>
-    </PropertyGroup>
     
     <ItemGroup>
-      <_currentBinPlaceTargetFrameworks Include="@(_bestBinPlaceTargetFrameworks)" Condition="'%(Identity)' == '$(_OriginalTargetFramework)'" />
+      <_currentBinPlaceTargetFrameworks Include="@(_bestBinPlaceTargetFrameworks)" Condition="'%(Identity)' == '$(TargetFramework)'" />
 
       <BinPlaceDir Condition="'$(BinPlaceNative)' == 'true'" Include="@(_currentBinPlaceTargetFrameworks->'%(NativePath)')" />
       <BinPlaceDir Condition="'$(BinPlaceRef)' == 'true'" Include="@(_currentBinPlaceTargetFrameworks->'%(RefPath)')" />
@@ -171,6 +173,7 @@
     <AdditionalCleanDirectories Include="@(BinPlaceTargetFrameworks->'%(PackageFileRefPath)')" />
     <AdditionalCleanDirectories Include="@(BinPlaceTargetFrameworks->'%(PackageFileRuntimePath)')" />
     <AdditionalCleanDirectories Include="@(BinPlaceTargetFrameworks->'%(TestPath)')" />
+    <AdditionalCleanDirectories Include="@(BinPlaceDir)" />
   </ItemGroup>
 
   <Target Name="_CleanGetCurrentAdditionalFileWrites" BeforeTargets="_CleanGetCurrentAndPriorFileWrites" Condition="'@(AdditionalCleanDirectories)' != ''">
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props
new file mode 100644
index 00000000000..4964ab9c0d7
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props
@@ -0,0 +1,14 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+  <!-- Add unparsed TargetFrameworks property to GetTargetFrameworks return item metadata to read from it later. -->
+  <ItemDefinitionGroup>
+    <_ThisProjectBuildMetadata>
+      <RawTargetFrameworks>$(TargetFrameworks)</RawTargetFrameworks>
+    </_ThisProjectBuildMetadata>
+  </ItemDefinitionGroup>
+
+  <PropertyGroup>
+    <DotNetBuildTasksTargetFrameworkAssembly Condition="'$(MSBuildRuntimeType)' == 'core'">..\tools\netcoreapp3.1\Microsoft.DotNet.Build.Tasks.TargetFramework.dll</DotNetBuildTasksTargetFrameworkAssembly>
+    <DotNetBuildTasksTargetFrameworkAssembly Condition="'$(MSBuildRuntimeType)' != 'core'">..\tools\net472\Microsoft.DotNet.Build.Tasks.TargetFramework.dll</DotNetBuildTasksTargetFrameworkAssembly>
+  </PropertyGroup>
+</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.targets b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.targets
new file mode 100644
index 00000000000..f3baa42542a
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.targets
@@ -0,0 +1,39 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+  <UsingTask TaskName="ChooseBestP2PTargetFrameworkTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkAssembly)" />
+  
+  <!--
+    Runs in a leaf project (csproj) to determine best configuration for ProjectReferences.
+    Make sure to run late enough for transitive dependencies which runs before AssignProjectConfiguration.
+  -->
+  <Target Name="ResolveP2PReferences"
+          Condition="'@(ProjectReference)' != ''"
+          BeforeTargets="AssignProjectConfiguration"
+          DependsOnTargets="ResolvePackageDependenciesForBuild">
+    <MSBuild Projects="@(ProjectReference)"
+             Targets="GetTargetFrameworks"
+             BuildInParallel="$(BuildInParallel)"
+             RemoveProperties="TargetFramework;RuntimeIdentifier"
+             Condition="'%(ProjectReference.SkipGetTargetFrameworkProperties)' != 'true'"
+             SkipNonexistentTargets="true">
+      <Output TaskParameter="TargetOutputs" ItemName="_ProjectReferenceWithTargetFrameworks" />
+    </MSBuild>
+
+    <ItemGroup>
+      <_ProjectReferenceWithTargetFrameworks Include="@(ProjectReference->WithMetadataValue('SkipGetTargetFrameworkProperties', 'true'))" />
+    </ItemGroup>
+
+    <ChooseBestP2PTargetFrameworkTask TargetFramework="$(TargetFramework)"
+                                      ProjectReferencesWithTargetFrameworks="@(_ProjectReferenceWithTargetFrameworks)"
+                                      RuntimeGraph="$(RuntimeGraph)">
+      <Output TaskParameter="AnnotatedProjectReferencesWithSetTargetFramework" ItemName="_ProjectReferenceWithBestTargetFramework" />
+    </ChooseBestP2PTargetFrameworkTask>
+    
+    <ItemGroup>
+      <ProjectReference Remove="@(ProjectReference)" />
+      <ProjectReference Include="@(_ProjectReferenceWithBestTargetFramework)" />
+    </ItemGroup>
+  </Target>
+
+  <Import Project="BinPlace.targets" Condition="'$(EnableBinPlacing)' != 'false'" />
+</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/sdk/Sdk.props b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/buildMultiTargeting/Microsoft.DotNet.Build.Tasks.TargetFramework.props
similarity index 64%
rename from src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/sdk/Sdk.props
rename to src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/buildMultiTargeting/Microsoft.DotNet.Build.Tasks.TargetFramework.props
index b3f97cd03ae..8898a423237 100644
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/sdk/Sdk.props
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/buildMultiTargeting/Microsoft.DotNet.Build.Tasks.TargetFramework.props
@@ -1,4 +1,4 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
-  <Import Project="..\build\Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.props" />
+  <Import Project="..\build\$(MSBuildThisFile)" />
 </Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/buildMultiTargeting/Microsoft.DotNet.Build.Tasks.TargetFramework.targets b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/buildMultiTargeting/Microsoft.DotNet.Build.Tasks.TargetFramework.targets
new file mode 100644
index 00000000000..cba1954a8be
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/buildMultiTargeting/Microsoft.DotNet.Build.Tasks.TargetFramework.targets
@@ -0,0 +1,53 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+  <UsingTask TaskName="ChooseBestTargetFrameworksTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkAssembly)" />
+
+  <!-- We filter _InnerBuildProjects items during DispatchToInnerBuilds and Clean to only run for best target frameworks. -->
+  <Target Name="RunOnlyBestTargetFrameworks"
+          Condition="'$(BuildTargetFramework)' != ''" 
+          BeforeTargets="DispatchToInnerBuilds;Clean"
+          DependsOnTargets="GetProjectWithBestTargetFrameworks">
+    <ItemGroup>
+      <_OriginalInnerBuildProjects Include="@(_InnerBuildProjects)" />
+      <_InnerBuildProjects Remove="@(_InnerBuildProjects)" />
+      <_InnerBuildProjects Include="@(InnerBuildProjectsWithBestTargetFramework)" />
+    </ItemGroup>
+  </Target>
+  
+  <!-- As _InnerBuildProjects items are used in the GetTargetFrameworks path as well (>= .NET 5), we restore the item state. -->
+  <Target Name="RestoreInnerBuildProjects"
+          BeforeTargets="GetTargetFrameworksWithPlatformFromInnerBuilds"
+          AfterTargets="DispatchToInnerBuilds;Clean"
+          Condition="'@(_OriginalInnerBuildProjects)' != ''">
+    <ItemGroup>
+      <_InnerBuildProjects Remove="@(_InnerBuildProjects)" />
+      <_InnerBuildProjects Include="@(_OriginalInnerBuildProjects)" />
+    </ItemGroup>
+  </Target>
+  
+  <Target Name="GetProjectWithBestTargetFrameworks">
+    <ItemGroup Condition="'$(BuildTargetFramework)' != ''">
+      <_BuildTargetFrameworkWithTargetOS Include="$(BuildTargetFramework)-$(TargetOS)" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(BuildTargetFramework)' == ''">
+      <_BuildTargetFrameworkWithoutOS Include="$([MSBuild]::Unescape($([System.Text.RegularExpressions.Regex]::Replace('$(TargetFrameworks)', '(-[^;]+)', ''))))" />
+      <!-- TODO: Find a better way to filter out non applicable TargetOS values for .NET Framework. -->
+      <_BuildTargetFrameworkWithTargetOS Include="@(_BuildTargetFrameworkWithoutOS->Distinct()->'%(Identity)-$(TargetOS)')"
+                                         Condition="'$(TargetOS)' == 'windows' or !$([System.String]::Copy('%(Identity)').StartsWith('net4'))" />
+    </ItemGroup>
+    
+    <ChooseBestTargetFrameworksTask BuildTargetFrameworks="@(_BuildTargetFrameworkWithTargetOS);$(AdditionalBuildTargetFrameworks)"
+                                    SupportedTargetFrameworks="$(TargetFrameworks)"
+                                    RuntimeGraph="$(RuntimeGraph)"
+                                    Distinct="true">
+      <Output TaskParameter="BestTargetFrameworks" ItemName="_BestTargetFramework" />
+    </ChooseBestTargetFrameworksTask>
+
+    <!-- Create inner build project nodes with the TargetFramework supplied via AdditionalProperties. -->
+    <ItemGroup>
+      <_BestTargetFramework Project="$(MSBuildProjectFile)" />
+      <InnerBuildProjectsWithBestTargetFramework Include="%(_BestTargetFramework.Project)"
+                                                 AdditionalProperties="TargetFramework=%(Identity)" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/src/GenerateFileFromTemplate.cs b/src/Microsoft.DotNet.Build.Tasks.Templating/src/GenerateFileFromTemplate.cs
new file mode 100644
index 00000000000..955e73da518
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Templating/src/GenerateFileFromTemplate.cs
@@ -0,0 +1,152 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.DotNet.Build.Tasks.Templating
+{
+    /// <summary>
+    /// <para>
+    /// Generates a new file at <see cref="OutputPath"/>.
+    /// </para>
+    /// <para>
+    /// The <see cref="TemplateFile"/> can define variables for substitution using <see cref="Properties"/>.
+    /// </para>
+    /// <example>
+    /// The input file might look like this:
+    /// <code>
+    /// 2 + 2 = ${Sum}
+    /// </code>
+    /// When the task is invoked like this, it will produce "2 + 2 = 4"
+    /// <code>
+    /// &lt;GenerateFileFromTemplate Properties="Sum=4;OtherValue=123;" ... &gt;
+    /// </code>
+    /// </example>
+    /// </summary>
+    public class GenerateFileFromTemplate : Microsoft.Build.Utilities.Task
+    {
+        /// <summary>
+        /// The template file using the variable syntax <c>${VarName}</c>.
+        /// If your template file needs to output this format, you can escape the dollar sign with a backtick e.g. <c>`${NotReplaced}</c>.
+        /// </summary>
+        [Required]
+        public string TemplateFile { get; set; }
+
+        /// <summary>
+        /// The destination for the generated file.
+        /// </summary>
+        [Required]
+        public string OutputPath { get; set; }
+
+        /// <summary>
+        /// Key=Value pairs of values, separated by semicolons e.g. <c>Properties="Sum=4;OtherValue=123;"</c>.
+        /// </summary>
+        [Required]
+        public string[] Properties { get; set; }
+
+        /// <summary>
+        /// The destination for the generated file resolved by this task.
+        /// </summary>
+        [Output]
+        public string ResolvedOutputPath { get; set; }
+
+        public override bool Execute()
+        {
+            ResolvedOutputPath = Path.GetFullPath(OutputPath.Replace('\\', '/'));
+
+            if (!File.Exists(TemplateFile))
+            {
+                Log.LogError($"File {TemplateFile} does not exist");
+                return false;
+            }
+
+            IDictionary<string, string> values = MSBuildListSplitter.GetNamedProperties(Properties, Log);
+            string template = File.ReadAllText(TemplateFile);
+
+            string result = Replace(template, values);
+            Directory.CreateDirectory(Path.GetDirectoryName(ResolvedOutputPath));
+            File.WriteAllText(ResolvedOutputPath, result);
+
+            return !Log.HasLoggedErrors;
+        }
+
+        public string Replace(string template, IDictionary<string, string> values)
+        {
+            StringBuilder sb = new();
+            StringBuilder varNameSb = new();
+            int line = 1;
+            for (int i = 0; i < template.Length; i++)
+            {
+                char templateChar = template[i];
+                char nextTemplateChar = i + 1 >= template.Length
+                        ? '\0'
+                        : template[i + 1];
+
+                // count lines in the template file
+                if (templateChar == '\n')
+                {
+                    line++;
+                }
+
+                if (templateChar == '`' && (nextTemplateChar == '$' || nextTemplateChar == '`'))
+                {
+                    // skip the backtick for known escape characters
+                    i++;
+                    sb.Append(nextTemplateChar);
+                    continue;
+                }
+
+                if (templateChar != '$' || nextTemplateChar != '{')
+                {
+                    // variables begin with ${. Moving on.
+                    sb.Append(templateChar);
+                    continue;
+                }
+
+                varNameSb.Clear();
+                i += 2;
+                for (; i < template.Length; i++)
+                {
+                    templateChar = template[i];
+                    if (templateChar != '}')
+                    {
+                        varNameSb.Append(templateChar);
+                    }
+                    else
+                    {
+                        // Found the end of the variable substitution
+                        string varName = varNameSb.ToString();
+                        if (values.TryGetValue(varName, out string value))
+                        {
+                            sb.Append(value);
+                        }
+                        else
+                        {
+                            Log.LogWarning(null, null, null, TemplateFile,
+                                line, 0, 0, 0,
+                                message: $"No property value is available for '{varName}'");
+                        }
+
+                        varNameSb.Clear();
+                        break;
+                    }
+                }
+
+                if (varNameSb.Length > 0)
+                {
+                    Log.LogWarning(null, null, null, TemplateFile,
+                                line, 0, 0, 0,
+                                message: "Expected closing bracket for variable placeholder. No substitution will be made.");
+                    sb.Append("${").Append(varNameSb.ToString());
+                }
+            }
+
+            return sb.ToString();
+        }
+    }
+}
+
diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/src/MSBuildListSplitter.cs b/src/Microsoft.DotNet.Build.Tasks.Templating/src/MSBuildListSplitter.cs
new file mode 100644
index 00000000000..9f37e10fde7
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Templating/src/MSBuildListSplitter.cs
@@ -0,0 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.DotNet.Build.Tasks.Templating
+{
+    internal static class MSBuildListSplitter
+    {
+        public static IDictionary<string, string> GetNamedProperties(string[] input, TaskLoggingHelper log)
+        {
+            Dictionary<string, string> values = new(StringComparer.OrdinalIgnoreCase);
+            if (input == null)
+            {
+                return values;
+            }
+
+            foreach (string item in input)
+            {
+                int splitIdx = item.IndexOf('=');
+                if (splitIdx < 0)
+                {
+                    log.LogWarning($"Property: {item} does not have a valid '=' separator");
+                    continue;
+                }
+
+                string key = item.Substring(0, splitIdx).Trim();
+                if (string.IsNullOrEmpty(key))
+                {
+                    log.LogWarning($"Property: {item} does not have a valid property name");
+                    continue;
+                }
+
+                string value = item.Substring(splitIdx + 1);
+                values[key] = value;
+            }
+
+            return values;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/src/Microsoft.DotNet.Build.Tasks.Templating.csproj b/src/Microsoft.DotNet.Build.Tasks.Templating/src/Microsoft.DotNet.Build.Tasks.Templating.csproj
new file mode 100644
index 00000000000..5ff51a445ad
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Templating/src/Microsoft.DotNet.Build.Tasks.Templating.csproj
@@ -0,0 +1,29 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Description>Templating task package</Description>
+    <PackageTags>Arcade Build Tool Templating</PackageTags>
+    <IncludeSymbols>false</IncludeSymbols>
+    <IncludeSource>false</IncludeSource>
+    <IsPackable>true</IsPackable>
+    <BuildOutputTargetFolder>tools\</BuildOutputTargetFolder>
+    <DevelopmentDependency>true</DevelopmentDependency>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+    <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="build/**/*.*" Pack="true">
+      <PackagePath>build</PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
+  </ItemGroup>
+
+  <Import Project="$(RepoRoot)eng\BuildTask.targets" />
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/src/build/Microsoft.DotNet.Build.Tasks.Templating.props b/src/Microsoft.DotNet.Build.Tasks.Templating/src/build/Microsoft.DotNet.Build.Tasks.Templating.props
new file mode 100644
index 00000000000..4baeb5b308f
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Templating/src/build/Microsoft.DotNet.Build.Tasks.Templating.props
@@ -0,0 +1,10 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <PropertyGroup>
+    <MicrosoftDotNetBuildTasksTemplatingAssembly>$(MSBuildThisFileDirectory)..\tools\netstandard2.0\Microsoft.DotNet.Build.Tasks.Templating.dll</MicrosoftDotNetBuildTasksTemplatingAssembly>
+  </PropertyGroup>
+
+  <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.Templating.GenerateFileFromTemplate" AssemblyFile="$(MicrosoftDotNetBuildTasksTemplatingAssembly)" />
+
+</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/test/GenerateFileFromTemplateTests.cs b/src/Microsoft.DotNet.Build.Tasks.Templating/test/GenerateFileFromTemplateTests.cs
new file mode 100644
index 00000000000..204cbf55e04
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Templating/test/GenerateFileFromTemplateTests.cs
@@ -0,0 +1,102 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.IO;
+using Microsoft.Arcade.Test.Common;
+using Xunit;
+
+namespace Microsoft.DotNet.Build.Tasks.Templating.Tests
+{
+    public class GenerateFileFromTemplateTests
+    {
+        [Fact]
+        public void GenerateFileFromTemplate_SubstitutesValidProperties()
+        {
+            string tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+            string filePath = Path.Combine(tempDir, "Directory.Build.props");
+
+            try
+            {
+                GenerateFileFromTemplate task = new();
+                task.TemplateFile = GetFullPath("Directory.Build.props.in");
+                task.OutputPath = filePath;
+                task.Properties = new[] { "DefaultNetCoreTargetFramework=net6.0" };
+
+                Assert.True(task.Execute());
+                Assert.Equal(ReadAllText("Directory.Build.props.in").Replace("${DefaultNetCoreTargetFramework}", "net6.0"), File.ReadAllText(filePath));
+            }
+            finally
+            {
+                Directory.Delete(tempDir, true);
+            }
+        }
+
+        [Theory]
+        [InlineData("DefaultNetCoreTargetFramework=")]
+        [InlineData("=net6.0")]
+        [InlineData("net6.0")]
+        [InlineData("DefaultNetCoreTargetFramework:net6.0")]
+        [InlineData("Default_NetCore_Target_Framework=net6.0")]
+        public void GenerateFileFromTemplate_RemovesInvalidProperties(string invalidProperty)
+        {
+            string tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+            string filePath = Path.Combine(tempDir, "Directory.Build.props");
+
+            try
+            {
+                GenerateFileFromTemplate task = new();
+                task.BuildEngine = new MockBuildEngine();
+                task.TemplateFile = GetFullPath("Directory.Build.props.in");
+                task.OutputPath = filePath;
+                task.Properties = new[] { invalidProperty };
+
+                Assert.True(task.Execute());
+                Assert.Equal(ReadAllText("Directory.Build.props.in").Replace("${DefaultNetCoreTargetFramework}", string.Empty), File.ReadAllText(filePath));
+            }
+            finally
+            {
+                Directory.Delete(tempDir, true);
+            }
+        }
+
+        [Theory]
+        [InlineData("Directory.Build.props.malformedbraces.in")]
+        [InlineData("Directory.Build.props.nobraces.in")]
+        public void GenerateFileFromTemplate_IgnoresMalformedTemplate(string filename)
+        {
+            string tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+            string filePath = Path.Combine(tempDir, "Directory.Build.props");
+
+            try
+            {
+                GenerateFileFromTemplate task = new();
+                task.BuildEngine = new MockBuildEngine();
+                task.TemplateFile = GetFullPath(filename);
+                task.OutputPath = filePath;
+                task.Properties = new[] { "DefaultNetCoreTargetFramework=net6.0" };
+
+                Assert.True(task.Execute());
+                Assert.Equal(ReadAllText(filename), File.ReadAllText(filePath));
+            }
+            finally
+            {
+                Directory.Delete(tempDir, true);
+            }
+        }
+
+        public static string GetFullPath(string relativeTestInputPath)
+        {
+            return Path.Combine(
+                Path.GetDirectoryName(typeof(GenerateFileFromTemplateTests).Assembly.Location),
+                "testassets",
+                relativeTestInputPath);
+        }
+
+        public static string ReadAllText(string relativeTestInputPath)
+        {
+            string path = GetFullPath(relativeTestInputPath);
+            return File.ReadAllText(path);
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj
new file mode 100644
index 00000000000..6d74739e160
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Common\Microsoft.Arcade.Test.Common\Microsoft.Arcade.Test.Common.csproj" />
+    <ProjectReference Include="..\src\Microsoft.DotNet.Build.Tasks.Templating.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="testassets\**">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="testassets\Directory.Build.props.malformedbraces.in" />
+    <None Remove="testassets\Directory.Build.props.nobraces.in" />
+  </ItemGroup>
+</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/test/testassets/Directory.Build.props.in b/src/Microsoft.DotNet.Build.Tasks.Templating/test/testassets/Directory.Build.props.in
new file mode 100644
index 00000000000..53438eec736
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Templating/test/testassets/Directory.Build.props.in
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <DefaultNetCoreTargetFramework>${DefaultNetCoreTargetFramework}</DefaultNetCoreTargetFramework>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/test/testassets/Directory.Build.props.malformedbraces.in b/src/Microsoft.DotNet.Build.Tasks.Templating/test/testassets/Directory.Build.props.malformedbraces.in
new file mode 100644
index 00000000000..ae2a552f86e
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Templating/test/testassets/Directory.Build.props.malformedbraces.in
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <DefaultNetCoreTargetFramework>${DefaultNetCoreTargetFramework</DefaultNetCoreTargetFramework>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/test/testassets/Directory.Build.props.nobraces.in b/src/Microsoft.DotNet.Build.Tasks.Templating/test/testassets/Directory.Build.props.nobraces.in
new file mode 100644
index 00000000000..fd0defc397e
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Templating/test/testassets/Directory.Build.props.nobraces.in
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <DefaultNetCoreTargetFramework>DefaultNetCoreTargetFramework</DefaultNetCoreTargetFramework>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj
index e1ff2fd44b7..ef3b7fb6bb9 100644
--- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj
@@ -1,4 +1,4 @@
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/FindLatestDrop.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/FindLatestDrop.cs
index 7609b913522..4fe8d7add66 100644
--- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/FindLatestDrop.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/FindLatestDrop.cs
@@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio
     /// <summary>
     /// Find the latest drop in a JSON list of VS drops.
     /// </summary>
-    public sealed class FindLatestDrop : Task
+    public sealed class FindLatestDrop : Microsoft.Build.Utilities.Task
     {
         /// <summary>
         /// Full path to JSON file containing list of drops.
diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingInputFiles.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingInputFiles.cs
index efc47343913..e80f4b68501 100644
--- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingInputFiles.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingInputFiles.cs
@@ -16,7 +16,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio
     /// Generates OptProf training input files for VS components listed in OptProf.json file and 
     /// their VSIX files located in the specified directory.
     /// </summary>
-    public sealed class GenerateTrainingInputFiles : Task
+    public sealed class GenerateTrainingInputFiles : Microsoft.Build.Utilities.Task
     {
         /// <summary>
         /// Absolute path to the OptProf.json config file.
diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingPropsFile.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingPropsFile.cs
index 4a7f5c59c46..9b182998d8f 100644
--- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingPropsFile.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GenerateTrainingPropsFile.cs
@@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio
     /// <summary>
     /// Generates a .props file pointing to a drops URL where IBC optimization inputs will be uploaded.
     /// </summary>
-    public sealed class GenerateTrainingPropsFile : Task
+    public sealed class GenerateTrainingPropsFile : Microsoft.Build.Utilities.Task
     {
         private const string ProductDropNamePrefix = "Products/";
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GetRunSettingsSessionConfiguration.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GetRunSettingsSessionConfiguration.cs
index a541891e895..f827518d6bc 100644
--- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GetRunSettingsSessionConfiguration.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/OptProf/GetRunSettingsSessionConfiguration.cs
@@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio
     /// Calculates the SessionConfiguration to be used in .runsettings for OptProf training 
     /// based on given OptProf.json configuration and VS bootstrapper information.
     /// </summary>
-    public sealed class GetRunSettingsSessionConfiguration : Task
+    public sealed class GetRunSettingsSessionConfiguration : Microsoft.Build.Utilities.Task
     {
         /// <summary>
         /// Absolute path to the OptProf.json config file.
diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/FinalizeInsertionVsixFile.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/FinalizeInsertionVsixFile.cs
index 7ac388f9f34..ad8211eb5cd 100644
--- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/FinalizeInsertionVsixFile.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/FinalizeInsertionVsixFile.cs
@@ -20,7 +20,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio
     /// 
     /// Replaces Experimental="true" attribute of the Installation element with SystemComponent="true" in the VSIX manifest file.
     /// </summary>
-    public sealed class FinalizeInsertionVsixFile : Task
+    public sealed class FinalizeInsertionVsixFile : Microsoft.Build.Utilities.Task
     {
         private const string VsixManifestPartName = "/extension.vsixmanifest";
         private const string VsixNamespace = "http://schemas.microsoft.com/developer/vsx-schema/2011";
diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/GetPkgDefAssemblyDependencyGuid.cs b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/GetPkgDefAssemblyDependencyGuid.cs
index 2830793fab2..220842ad890 100644
--- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/GetPkgDefAssemblyDependencyGuid.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Vsix/GetPkgDefAssemblyDependencyGuid.cs
@@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Build.Tasks.VisualStudio
     /// Calculates Guid used in .pkgdef files for codeBase and bindingRedirect entries.
     /// The implementation matches Microsoft.VisualStudio.Shell.ProvideDependentAssemblyAttribute.
     /// </summary>
-    public sealed class GetPkgDefAssemblyDependencyGuid : Task
+    public sealed class GetPkgDefAssemblyDependencyGuid : Microsoft.Build.Utilities.Task
     {
         [Required]
         public ITaskItem[] Items { get; set; }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/GenerateManifestMsiTests.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/GenerateManifestMsiTests.cs
new file mode 100644
index 00000000000..08f7e466972
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/GenerateManifestMsiTests.cs
@@ -0,0 +1,72 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Microsoft.Deployment.DotNet.Releases;
+using Xunit;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads.Tests
+{
+    public class GenerateManifestMsiTests
+    {
+        [WindowsOnlyFact]
+        public void ItThrowsIfPayloadRelativePathIsTooLong()
+        {
+            var task = new GenerateManifestMsi();
+            task.MsiVersion = "1.2.3.11111";
+
+            Exception e = Assert.Throws<Exception>(() => task.GenerateSwixPackageAuthoring(@"C:\Foo\Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100.6.0.0-preview.7.21377.12-x64.msi",
+                "Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100", "x64"));
+            Assert.Equal(@"Payload relative path exceeds max length (182): Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100,version=1.2.3,chip=x64,productarch=neutral\Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100.6.0.0-preview.7.21377.12-x64.msi", e.Message);
+        }
+
+        [WindowsOnlyTheory]
+        [InlineData("a.b.c", "6.0.100", "x86", "{1c857c83-6584-3c77-ab20-7c77f4fdc097}")]
+        [InlineData("a.b.c", "6.0.105", "x86", "{1c857c83-6584-3c77-ab20-7c77f4fdc097}")]
+        [InlineData("a.b.c", "7.0.105-preview.3.5.6.7.8.9", "x86", "{ca8c5ba1-6937-3237-99d5-cbae7b2b8868}")]
+        [InlineData("a.b.c", "7.0.105-preview.3.5.6.7.8.9", "x64", "{da611d31-8a65-3eea-8949-13bcf2a99950}")]
+        [InlineData("a.b.c", "7.0.105-preview.4.5.6.7.8.9", "x86", "{e6c1ec79-16d9-3cef-ad7b-0bcefa9636b1}")]
+        public void ItGeneratesStableUpgradeCodes(string manifestId, string sdkVersion, string platform, string expectedUpgradeCode)
+        {
+            ReleaseVersion sdkFeatureBandVersion = GenerateManifestMsi.GetSdkFeatureBandVersion(sdkVersion);
+            Guid upgradeCode = GenerateManifestMsi.GenerateUpgradeCode(manifestId, sdkFeatureBandVersion, platform);
+
+            Assert.Equal(expectedUpgradeCode.ToLowerInvariant(), upgradeCode.ToString("B"));
+        }
+
+        [WindowsOnlyTheory]
+        [InlineData("6.0.100", "6.0.100")]
+        [InlineData("6.0.103", "6.0.100")]
+        [InlineData("6.0.103-ci", "6.0.100")]
+        [InlineData("7.0.1243-preview.8+12345", "7.0.1200-preview.8")]
+        public void ItIncludesPrereleasePartsInFeatureBandVersion(string sdkVersion, string expectedFeatureBandVersion)
+        {
+            ReleaseVersion actual = GenerateManifestMsi.GetSdkFeatureBandVersion(sdkVersion);
+            ReleaseVersion expected = new ReleaseVersion(expectedFeatureBandVersion);
+
+            Assert.Equal(expected, actual);
+        }
+
+        [WindowsOnlyTheory]
+        [InlineData("Microsoft.NET.Workload.Emscripten.Manifest-6.0.100", "6.0.100")]
+        [InlineData("Microsoft.NET.Workload.Emscripten-7.0.100", null)]
+        [InlineData(null, null)]
+        [InlineData("Microsoft.NET.Workload.Emscripten.Manifest-7.3.504-preview.9", "7.3.504-preview.9")]
+        public void ItCanExtractTheSdkVersionFromTheManifestPackageId(string packageId, string expectedSdkVersion)
+        {
+            string actual = GenerateManifestMsi.GetSdkVersionFromPackageId(packageId);
+
+            Assert.Equal(expectedSdkVersion, actual);
+        }
+
+        [WindowsOnlyTheory]
+        [InlineData("Microsoft.NET.Workload.Emscripten.Manifest-6.0.100", "Microsoft.NET.Workload.Emscripten")]
+        [InlineData("Microsoft.NET.Workload.Emscripten-6.0.100", null)]
+        public void ItCanExtractTheManifestIdFromTheManifestPackageId(string packageId, string expectedManifestId)
+        {
+            string actual = GenerateManifestMsi.GetManifestIdFromPackageId(packageId);
+
+            Assert.Equal(expectedManifestId, actual);
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/GenerateVisualStudioWorkloadTests.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/GenerateVisualStudioWorkloadTests.cs
new file mode 100644
index 00000000000..db0628ae384
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/GenerateVisualStudioWorkloadTests.cs
@@ -0,0 +1,209 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Arcade.Test.Common;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Xunit;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads.Tests
+{
+    public class GenerateVisualStudioWorkloadTests
+    {
+        public string IntermediateBaseOutputPath = Path.Combine(AppContext.BaseDirectory, "obj");
+
+        public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
+
+        public string TestIntermediateBaseOutputPath => Path.Combine(IntermediateBaseOutputPath, Path.GetFileNameWithoutExtension(Path.GetTempFileName()));
+
+        [Fact]
+        public void ItIgnoresNotApplicableAliasedPacks()
+        {
+            string workloadManifest = Path.Combine(AppContext.BaseDirectory, "testassets", "AbstractWorkloadsNonWindowsPacks.json");
+
+            var buildTask = new GenerateVisualStudioWorkload()
+            {
+                WorkloadManifests = new TaskItem[]
+                {
+                    new TaskItem(workloadManifest)
+                },
+                ComponentVersions = new TaskItem[]
+                {
+                    new TaskItem("microsoft-net-runtime-ios", new Dictionary<string, string> { { "Version", "6.5.38766" } }),
+                    new TaskItem("runtimes-ios", new Dictionary<string, string> { { "Version", "6.5.38766" } }),
+                    new TaskItem("microsoft-net-runtime-mono-tooling", new Dictionary<string, string> { { "Version", "6.5.38766" } }),
+                },
+                GenerateMsis = false,
+                IntermediateBaseOutputPath = TestIntermediateBaseOutputPath,
+                WixToolsetPath = "",
+                BuildEngine = new MockBuildEngine()
+            };
+
+            Assert.True(buildTask.Execute());
+            string outputPath = Path.GetDirectoryName(buildTask.SwixProjects[0].GetMetadata("FullPath"));
+            string componentSwr = File.ReadAllText(Path.Combine(outputPath, "component.swr"));
+
+            Assert.Contains(@"package name=microsoft.net.runtime.ios", componentSwr);
+            Assert.DoesNotContain(@"vs.dependency id=Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm", componentSwr);
+            Assert.DoesNotContain(@"vs dependency id=Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64", componentSwr);
+            Assert.DoesNotContain(@"vs dependency id=Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64", componentSwr);
+            Assert.DoesNotContain(@"vs dependency id=Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64", componentSwr);
+            Assert.DoesNotContain(@"vs dependency id=Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86", componentSwr);
+            Assert.Contains(@"vs.dependency id=runtimes.ios", componentSwr);
+        }
+
+        [Fact]
+        public void ItGeneratesASwixProjectFromAWorkloadManifest()
+        {
+            string workloadManifest = Path.Combine(AppContext.BaseDirectory, "testassets", "WorkloadManifest.json");
+
+            var buildTask = new GenerateVisualStudioWorkload()
+            {
+                WorkloadManifests = new TaskItem[]
+                {
+                    new TaskItem(workloadManifest)
+                },
+                ComponentVersions = new TaskItem[]
+                {
+                    new TaskItem("microsoft-net-sdk-blazorwebassembly-aot", new Dictionary<string, string> { { "Version", "6.5.38766" } }),
+                },
+                GenerateMsis = false,
+                IntermediateBaseOutputPath = TestIntermediateBaseOutputPath,
+                WixToolsetPath = "",
+                BuildEngine = new MockBuildEngine()
+            };
+
+            Assert.True(buildTask.Execute());
+            string outputPath = Path.GetDirectoryName(buildTask.SwixProjects[0].GetMetadata("FullPath"));
+            string componentSwr = File.ReadAllText(Path.Combine(outputPath, "component.swr"));
+
+            Assert.Single(buildTask.SwixProjects);
+            Assert.Contains(@"package name=microsoft.net.sdk.blazorwebassembly.aot
+        version=6.5.38766", componentSwr);
+            Assert.Contains("vs.dependency id=Microsoft.NET.Runtime.MonoAOTCompiler.Task.6.0.0-preview.4.21201.1", componentSwr);
+        }
+
+        [Fact]
+        public void ItCanShortenPackageIds()
+        {
+            string workloadManifest = Path.Combine(AppContext.BaseDirectory, "testassets", "WorkloadManifest.json");
+
+            var buildTask = new GenerateVisualStudioWorkload()
+            {
+                WorkloadManifests = new TaskItem[]
+                {
+                    new TaskItem(workloadManifest)
+                },
+                ShortNames = new TaskItem[]
+                {
+                    new TaskItem("Microsoft.NET.Runtime", new Dictionary<string, string> { {"Replacement", "MSFT"} })
+                },
+                ComponentVersions = new TaskItem[]
+                {
+                    new TaskItem("microsoft-net-sdk-blazorwebassembly-aot", new Dictionary<string, string> { { "Version", "6.5.38766" } }),
+                },
+                GenerateMsis = false,
+                IntermediateBaseOutputPath = TestIntermediateBaseOutputPath,
+                WixToolsetPath = "",
+                BuildEngine = new MockBuildEngine()
+            };
+
+            Assert.True(buildTask.Execute());
+            string outputPath = Path.GetDirectoryName(buildTask.SwixProjects[0].GetMetadata("FullPath"));
+            string componentSwr = File.ReadAllText(Path.Combine(outputPath, "component.swr"));
+
+            Assert.Single(buildTask.SwixProjects);
+            Assert.Contains(@"package name=microsoft.net.sdk.blazorwebassembly.aot
+        version=6.5.38766", componentSwr);
+            Assert.Contains("vs.dependency id=MSFT.MonoAOTCompiler.Task.6.0.0-preview.4.21201.1", componentSwr);
+        }
+
+        [Fact]
+        public void ItGeneratesASwixProjectFromAWorkloadManifestPackage()
+        {
+            string workloadPackage = Path.Combine(AppContext.BaseDirectory, "testassets",
+                "microsoft.net.sdk.blazorwebassembly.aot.6.0.0-preview.4.21209.5.nupkg");
+
+            var buildTask = new GenerateVisualStudioWorkload()
+            {
+                WorkloadPackages = new TaskItem[]
+                {
+                    new TaskItem(workloadPackage)
+                },
+
+                GenerateMsis = false,
+                IntermediateBaseOutputPath = TestIntermediateBaseOutputPath,
+                WixToolsetPath = "",
+                BuildEngine = new MockBuildEngine()
+            };
+
+            Assert.True(buildTask.Execute());
+            string outputPath = Path.GetDirectoryName(buildTask.SwixProjects[0].GetMetadata("FullPath"));
+            string componentSwr = File.ReadAllText(Path.Combine(outputPath, "component.swr"));
+
+            Assert.Single(buildTask.SwixProjects);
+            Assert.Contains(@"package name=microsoft.net.sdk.blazorwebassembly.aot
+        version=1.0", componentSwr);
+            Assert.Contains("vs.dependency id=Microsoft.NET.Runtime.MonoAOTCompiler.Task.6.0.0-preview.4.21201.1", componentSwr);
+            Assert.Contains("vs.dependency id=Microsoft.NET.Runtime.Emscripten.Python.6.0.0-preview.4.21205.1", componentSwr);
+        }
+
+        [Fact]
+        public void ItIncludesAbstractManifests()
+        {
+            var buildTask = new GenerateVisualStudioWorkload()
+            {
+                WorkloadManifests = new TaskItem[]
+                {
+                    new TaskItem(Path.Combine(TestAssetsPath, "BlazorWorkloadManifest.json"))
+                },
+                GenerateMsis = false,
+                IntermediateBaseOutputPath = TestIntermediateBaseOutputPath,
+                WixToolsetPath = "",
+                BuildEngine = new MockBuildEngine()
+            };
+
+            Assert.True(buildTask.Execute());
+            string blazorOutputPath = Path.GetDirectoryName(buildTask.SwixProjects[0].GetMetadata("FullPath"));
+            string blazorComponentSwr = File.ReadAllText(Path.Combine(blazorOutputPath, "component.swr"));
+            Assert.Contains(@"package name=microsoft.net.sdk.blazorwebassembly.aot
+        version=6.0.0.0", blazorComponentSwr);
+            string androidOutputPath = Path.GetDirectoryName(buildTask.SwixProjects[1].GetMetadata("FullPath"));
+            string androidComponentSwr = File.ReadAllText(Path.Combine(androidOutputPath, "component.swr"));
+            Assert.Contains(@"package name=microsoft.net.runtime.android
+        version=6.0.0.0", androidComponentSwr);
+        }
+
+        [Fact]
+        public void ItReportsMissingPacks()
+        {
+            var buildTask = new GenerateVisualStudioWorkload()
+            {
+                WorkloadManifests = new TaskItem[]
+                {
+                    new TaskItem(Path.Combine(TestAssetsPath, "BlazorWorkloadManifest.json"))
+                },
+                GenerateMsis = true,
+                IntermediateBaseOutputPath = TestIntermediateBaseOutputPath,
+                WixToolsetPath = "",
+                PackagesPath = Path.Combine(TestAssetsPath, "packages"),
+                BuildEngine = new MockBuildEngine()
+            };
+
+            // The task will fail to generate VS components because we have no generated MSI packages.
+            // The package feeds are volatile until we actually release and the execution time for the unit tests would spike
+            Assert.False(buildTask.Execute());
+            ITaskItem missingPack = buildTask.MissingPacks.Where(mp => string.Equals(mp.ItemSpec, "Microsoft.NET.Runtime.MonoAOTCompiler.Task")).FirstOrDefault();
+
+            // This package would be required by the workload, but would be missing
+            Assert.Equal(Path.Combine(TestAssetsPath, "packages", "Microsoft.NET.Runtime.MonoAOTCompiler.Task.6.0.0-preview.5.21262.5.nupkg"), missingPack.GetMetadata("SourcePackage"));
+
+            // This package should not show as missing because it has the wrong platform and belongs to an abstract workload
+            Assert.DoesNotContain("Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm", buildTask.MissingPacks.Select(p => p.ItemSpec));
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/GenerateWorkloadMsisTests.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/GenerateWorkloadMsisTests.cs
new file mode 100644
index 00000000000..c42c81ffa56
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/GenerateWorkloadMsisTests.cs
@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.Build.Utilities;
+using Xunit;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads.Tests
+{
+    public class GenerateWorkloadMsisTests
+    {
+        public string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
+
+        [Fact]
+        public void ItRemovesDuplicateWorkloadPacks()
+        {
+            TaskItem[] manifests = new[]
+            {
+                new TaskItem(Path.Combine(TestAssetsPath, "emsdkWorkloadManifest.json")),
+                new TaskItem(Path.Combine(TestAssetsPath, "emsdkWorkloadManifest2.json")),
+            };
+
+            var packs = GenerateWorkloadMsis.GetWorkloadPacks(manifests).ToArray();
+
+            Assert.Equal(4, packs.Length);
+            Assert.Equal("Microsoft.NET.Runtime.Emscripten.Node", packs[0].Id.ToString());
+            Assert.Equal("7.0.0-alpha.2.22078.1", packs[0].Version);
+            Assert.Equal("Microsoft.NET.Runtime.Emscripten.Node", packs[3].Id.ToString());
+            Assert.Equal("7.0.0-alpha.2.22079.1", packs[3].Version);
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj
new file mode 100644
index 00000000000..7126eb86cf9
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk"> 
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Microsoft.Arcade.Test.Common\Microsoft.Arcade.Test.Common.csproj" />
+    <ProjectReference Include="..\Microsoft.DotNet.Build.Tasks.Workloads\src\Microsoft.DotNet.Build.Tasks.Workloads.csproj" />
+
+    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
+    <PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
+    <PackageReference Include="Microsoft.NET.Sdk.WorkloadManifestReader" Version="$(MicrosoftNetSdkWorkloadManifestReaderVersion)" />
+    <PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />    
+  </ItemGroup>
+
+  <ItemGroup>
+      <Content Include="testassets\**\*" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="testassets\emsdkWorkloadManifest.json" />
+    <None Remove="testassets\emsdkWorkloadManifest2.json" />
+    <None Remove="testassets\mauiWorkloadManifest.json" />
+  </ItemGroup>
+</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/TestHelper.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/TestHelper.cs
new file mode 100644
index 00000000000..680d88b0469
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/TestHelper.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Xunit;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads.Tests
+{
+    public class WindowsOnlyFactAttribute : FactAttribute
+    {
+        public WindowsOnlyFactAttribute()
+        {
+            if (Environment.OSVersion.Platform != PlatformID.Win32NT)
+            {
+                Skip = "Not running on Windows";
+            }
+        }
+    }
+
+    public class WindowsOnlyTheoryAttribute : TheoryAttribute
+    {
+        public WindowsOnlyTheoryAttribute()
+        {
+            if (Environment.OSVersion.Platform != PlatformID.Win32NT)
+            {
+                Skip = "Not running on Windows";
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/VisualStudioComponentTests.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/VisualStudioComponentTests.cs
new file mode 100644
index 00000000000..e9b92c0c0ad
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/VisualStudioComponentTests.cs
@@ -0,0 +1,106 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.NET.Sdk.WorkloadManifestReader;
+using Xunit;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads.Tests
+{
+    public class VisualStudioComponentTests
+    {
+        public static readonly ITaskItem[] NoItems = Array.Empty<ITaskItem>();
+
+        public string RandomPath => Path.Combine(AppContext.BaseDirectory, "obj", Path.GetFileNameWithoutExtension(Path.GetTempFileName()));
+
+        [Fact]
+        public void ItAssignsDefaultValues()
+        {
+            WorkloadManifest manifest = Create("WorkloadManifest.json");
+            WorkloadDefinition definition = (WorkloadDefinition)manifest.Workloads.FirstOrDefault().Value;
+            VisualStudioComponent component = VisualStudioComponent.Create(null, manifest, definition, NoItems, NoItems, NoItems, NoItems);
+
+            string swixProjDirectory = RandomPath;
+            Directory.CreateDirectory(swixProjDirectory);
+            component.Generate(swixProjDirectory);
+
+            string componentResSwr = File.ReadAllText(Path.Combine(swixProjDirectory, "component.res.swr"));
+
+            Assert.Contains(@"title=""Blazor WebAssembly AOT workload""", componentResSwr);
+            Assert.Contains(@"description=""Blazor WebAssembly AOT workload""", componentResSwr);
+            Assert.Contains(@"category="".NET""", componentResSwr);
+        }
+
+        [Fact]
+        public void ItCanOverrideDefaultValues()
+        {
+            WorkloadManifest manifest = Create("WorkloadManifest.json");
+            WorkloadDefinition definition = (WorkloadDefinition)manifest.Workloads.FirstOrDefault().Value;
+
+            ITaskItem[] resources = new ITaskItem[]
+            {
+                new TaskItem("microsoft-net-sdk-blazorwebassembly-aot", new Dictionary<string, string> {
+                    { "Title", "AOT" },
+                    { "Description", "A long wordy description." },
+                    { "Category", "Compilers, build tools, and runtimes" }
+                })
+            };
+
+            VisualStudioComponent component = VisualStudioComponent.Create(null, manifest, definition, NoItems, NoItems, resources, NoItems);
+
+            string swixProjDirectory = RandomPath;
+            Directory.CreateDirectory(swixProjDirectory);
+            component.Generate(swixProjDirectory);
+
+            string componentResSwr = File.ReadAllText(Path.Combine(swixProjDirectory, "component.res.swr"));
+
+            Assert.Contains(@"title=""AOT""", componentResSwr);
+            Assert.Contains(@"description=""A long wordy description.""", componentResSwr);
+            Assert.Contains(@"category=""Compilers, build tools, and runtimes""", componentResSwr);
+        }
+
+        [Fact]
+        public void ItCreatesSafeComponentIds()
+        {
+            WorkloadManifest manifest = Create("WorkloadManifest.json");
+            WorkloadDefinition definition = (WorkloadDefinition)manifest.Workloads.FirstOrDefault().Value;
+            VisualStudioComponent component = VisualStudioComponent.Create(null, manifest, definition, NoItems, NoItems, NoItems, NoItems);
+
+            string swixProjDirectory = RandomPath;
+            Directory.CreateDirectory(swixProjDirectory);
+            component.Generate(swixProjDirectory);
+
+            string componentSwr = File.ReadAllText(Path.Combine(swixProjDirectory, "component.swr"));
+
+            Assert.Contains(@"microsoft.net.sdk.blazorwebassembly.aot", componentSwr);
+        }
+
+        [Fact]
+        public void ItCreatesComponentsWhenWorkloadsDoNotIncludePacks()
+        {
+            WorkloadManifest manifest = Create("mauiWorkloadManifest.json");
+            WorkloadDefinition definition = (WorkloadDefinition)manifest.Workloads.FirstOrDefault().Value;
+            VisualStudioComponent component = VisualStudioComponent.Create(null, manifest, definition, NoItems, NoItems, NoItems, NoItems);
+
+            string swixProjDirectory = RandomPath;
+            Directory.CreateDirectory(swixProjDirectory);
+            component.Generate(swixProjDirectory);
+
+            string componentSwr = File.ReadAllText(Path.Combine(swixProjDirectory, "component.swr"));
+
+            Assert.Contains(@"vs.dependency id=maui.mobile", componentSwr);
+            Assert.Contains(@"vs.dependency id=maui.desktop", componentSwr);
+        }
+
+        private static WorkloadManifest Create(string filename)
+        {
+            return WorkloadManifestReader.ReadWorkloadManifest(Path.GetFileNameWithoutExtension(filename),
+                File.OpenRead(Path.Combine(AppContext.BaseDirectory, "testassets", filename)));
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/VisualStudioDependencyTests.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/VisualStudioDependencyTests.cs
new file mode 100644
index 00000000000..be810f26e5b
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/VisualStudioDependencyTests.cs
@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads.Tests
+{
+    public class VisualStudioDependencyTests
+    {
+        [Theory]
+        [InlineData("1.0.0", null, "[1.0.0,)")]
+        [InlineData("1.0.0", "2.0.0", "[1.0.0,2.0.0)")]
+        [InlineData("1.0.0", "1.0.0", "[1.0.0]")]
+        public void ItGeneratesVersionRanges(string minVersion, string maxVersion, string expectedVersionRange)
+        {
+            Version v1 = string.IsNullOrWhiteSpace(minVersion) ? null : new Version(minVersion);
+            Version v2 = string.IsNullOrWhiteSpace(maxVersion) ? null : new Version(maxVersion);
+
+            VisualStudioDependency dep = new VisualStudioDependency("foo", v1, v2);
+
+            Assert.Equal(expectedVersionRange, dep.GetVersion());
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/AbstractWorkloadsNonWindowsPacks.json b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/AbstractWorkloadsNonWindowsPacks.json
new file mode 100644
index 00000000000..0494cc63651
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/AbstractWorkloadsNonWindowsPacks.json
@@ -0,0 +1,262 @@
+{
+  "version": "6.0.0-preview.7.21358.4",
+  "depends-on": {
+    "Microsoft.NET.Workload.Emscripten": "6.0.0-preview.7.21330.1"
+  },
+  "workloads": {
+    "microsoft-net-runtime-ios": {
+      "abstract": true,
+      "description": "iOS Mono Runtime and AOT Workload",
+      "packs": [
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86"
+      ],
+      "extends": [ "runtimes-ios" ],
+      "platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
+    },
+    "runtimes-ios": {
+      "abstract": true,
+      "description": "iOS Mono Runtime Packs",
+      "packs": [
+        "Microsoft.NETCore.App.Runtime.Mono.ios-arm",
+        "Microsoft.NETCore.App.Runtime.Mono.ios-arm64",
+        "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64",
+        "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64",
+        "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
+      ],
+      "extends": [ "microsoft-net-runtime-mono-tooling" ],
+      "platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
+    },
+    "microsoft-net-runtime-mono-tooling": {
+      "abstract": true,
+      "description": "Shared native build tooling for Mono runtime",
+      "packs": [
+        "Microsoft.NET.Runtime.MonoAOTCompiler.Task",
+        "Microsoft.NET.Runtime.MonoTargets.Sdk"
+      ]
+    },
+  },
+  "packs": {
+    "Microsoft.NET.Runtime.MonoAOTCompiler.Task": {
+      "kind": "Sdk",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NET.Runtime.MonoTargets.Sdk": {
+      "kind": "Sdk",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NET.Runtime.WebAssembly.Sdk": {
+      "kind": "Sdk",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-arm": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-arm64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-x64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-x86": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-x86": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x86",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x86",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x64",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm64",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.osx-arm64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.osx-x64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.osx-arm64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.osx-x64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.ios-arm": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.ios-arm64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-x64": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-arm64": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-x64": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm": {
+      "kind": "Sdk",
+      "version": "2.3.4.5",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.browser-wasm",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.browser-wasm": {
+      "kind": "framework",
+      "version": "2.3.4.5"
+    }
+  }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/BlazorWorkloadManifest.json b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/BlazorWorkloadManifest.json
new file mode 100644
index 00000000000..d5047b135f1
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/BlazorWorkloadManifest.json
@@ -0,0 +1,259 @@
+{
+  "version": "6.0.0-preview.5.21262.5",
+  "workloads": {
+    "microsoft-net-sdk-blazorwebassembly-aot": {
+      "description": "Browser Runtime native performance tools",
+      "packs": [
+        "Microsoft.NETCore.App.Runtime.Mono.browser-wasm",
+        "Microsoft.NET.Runtime.MonoAOTCompiler.Task",
+        "Microsoft.NET.Runtime.WebAssembly.Sdk",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm",
+        "Microsoft.NET.Runtime.Emscripten.Node",
+        "Microsoft.NET.Runtime.Emscripten.Python",
+        "Microsoft.NET.Runtime.Emscripten.Sdk"
+      ]
+    },
+    "microsoft-net-runtime-android": {
+      "abstract": true,
+      "description": "Android Mono Runtime and AOT Workload",
+      "packs": [
+        "Microsoft.NET.Runtime.RuntimeConfigParser.Task",
+        "Microsoft.NET.Runtime.MonoAOTCompiler.Task",
+        "Microsoft.NETCore.App.Runtime.Mono.android-arm",
+        "Microsoft.NETCore.App.Runtime.Mono.android-arm64",
+        "Microsoft.NETCore.App.Runtime.Mono.android-x64",
+        "Microsoft.NETCore.App.Runtime.Mono.android-x86",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64"
+      ]
+    },
+    "microsoft-net-runtime-ios": {
+      "abstract": true,
+      "description": "iOS Mono Runtime and AOT Workload",
+      "packs": [
+        "Microsoft.NET.Runtime.RuntimeConfigParser.Task",
+        "Microsoft.NET.Runtime.MonoAOTCompiler.Task",
+        "Microsoft.NETCore.App.Runtime.Mono.ios-arm",
+        "Microsoft.NETCore.App.Runtime.Mono.ios-arm64",
+        "Microsoft.NETCore.App.Runtime.Mono.iossimulator",
+        "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86"
+      ],
+      "platforms": [ "osx-arm64", "osx-x64" ]
+    },
+    "microsoft-net-runtime-tvos": {
+      "abstract": true,
+      "description": "tvOS Mono Runtime and AOT Workload",
+      "packs": [
+        "Microsoft.NET.Runtime.RuntimeConfigParser.Task",
+        "Microsoft.NET.Runtime.MonoAOTCompiler.Task",
+        "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64",
+        "Microsoft.NETCore.App.Runtime.Mono.tvos-x64",
+        "Microsoft.NETCore.App.Runtime.Mono.tvossimulator",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator"
+      ],
+      "platforms": [ "osx-arm64", "osx-x64" ]
+    }
+  },
+  "packs": {
+    "Microsoft.NET.Runtime.RuntimeConfigParser.Task": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NET.Runtime.MonoAOTCompiler.Task": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NET.Runtime.WebAssembly.Sdk": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-arm": {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-arm64": {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-x64": {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-x86": {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-x86": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x86",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x86",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x64",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "win-x64": "Microsoft.netcore.app.runtime.aot.win-x64.Cross.android-arm64",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.ios-arm" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.ios-arm64" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.iossimulator" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.tvossimulator" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm",
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21262.5",
+      "alias-to": {
+        "win-x86": "Microsoft.NETCore.App.Runtime.AOT.win-x86.Cross.browser-wasm",
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.browser-wasm",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.browser-wasm" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.5.21262.5"
+    },
+    "Microsoft.NET.Runtime.Emscripten.Node" : {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21226.1",
+      "alias-to": {
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.osx-x64"
+      }
+    },
+    "Microsoft.NET.Runtime.Emscripten.Python" : {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21226.1",
+      "alias-to": {
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.osx-x64"
+      }
+    },
+    "Microsoft.NET.Runtime.Emscripten.Sdk" : {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.5.21226.1",
+      "alias-to": {
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.osx-x64"
+      }
+    }
+  }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/MonoWorkloadManifest.json b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/MonoWorkloadManifest.json
new file mode 100644
index 00000000000..3e1177e5e06
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/MonoWorkloadManifest.json
@@ -0,0 +1,273 @@
+{
+  "version": "6.0.0-preview.7.21358.4",
+  "depends-on": {
+    "Microsoft.NET.Workload.Emscripten": "6.0.0-preview.7.21330.1"
+  },
+  "workloads": {
+    "microsoft-net-sdk-blazorwebassembly-aot": {
+      "description": "Browser Runtime native performance tools",
+      "packs": [
+        "Microsoft.NET.Runtime.WebAssembly.Sdk",
+        "Microsoft.NETCore.App.Runtime.Mono.browser-wasm",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm",
+        "Microsoft.NET.Runtime.Emscripten.Node",
+        "Microsoft.NET.Runtime.Emscripten.Python",
+        "Microsoft.NET.Runtime.Emscripten.Sdk"
+      ],
+      "extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten" ],
+      "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
+    },
+    "microsoft-net-runtime-android": {
+      "abstract": true,
+      "description": "Android Mono Runtime",
+      "packs": [
+        "Microsoft.NETCore.App.Runtime.Mono.android-arm",
+        "Microsoft.NETCore.App.Runtime.Mono.android-arm64",
+        "Microsoft.NETCore.App.Runtime.Mono.android-x64",
+        "Microsoft.NETCore.App.Runtime.Mono.android-x86"
+      ],
+      "extends": [ "microsoft-net-runtime-mono-tooling" ],
+      "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
+    },
+    "microsoft-net-runtime-android-aot": {
+      "abstract": true,
+      "description": "Android Mono AOT Workload",
+      "packs": [
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.android-x86",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64"
+      ],
+      "extends": [ "microsoft-net-runtime-android" ],
+      "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
+    },
+    "microsoft-net-runtime-ios": {
+      "abstract": true,
+      "description": "iOS Mono Runtime and AOT Workload",
+      "packs": [
+        "Microsoft.NETCore.App.Runtime.Mono.ios-arm",
+        "Microsoft.NETCore.App.Runtime.Mono.ios-arm64",
+        "Microsoft.NETCore.App.Runtime.Mono.iossimulator",
+        "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86"
+      ],
+      "extends": [ "microsoft-net-runtime-mono-tooling" ],
+      "platforms": [ "osx-arm64", "osx-x64" ]
+    },
+    "microsoft-net-runtime-maccatalyst": {
+      "abstract": true,
+      "description": "MacCatalyst Mono Runtime and AOT Workload",
+      "packs": [
+        "Microsoft.NETCore.App.Runtime.Mono.maccatalyst",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst"
+      ],
+      "extends": [ "microsoft-net-runtime-mono-tooling" ],
+      "platforms": [ "osx-arm64", "osx-x64" ]
+    },
+    "microsoft-net-runtime-tvos": {
+      "abstract": true,
+      "description": "tvOS Mono Runtime and AOT Workload",
+      "packs": [
+        "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64",
+        "Microsoft.NETCore.App.Runtime.Mono.tvossimulator",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64",
+        "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator"
+      ],
+      "extends": [ "microsoft-net-runtime-mono-tooling" ],
+      "platforms": [ "osx-arm64", "osx-x64" ]
+    },
+    "microsoft-net-runtime-mono-tooling": {
+      "abstract": true,
+      "description": "Shared native build tooling for Mono runtime",
+      "packs": [
+        "Microsoft.NET.Runtime.MonoAOTCompiler.Task",
+        "Microsoft.NET.Runtime.MonoTargets.Sdk",
+      ],
+    }
+  },
+  "packs": {
+    "Microsoft.NET.Runtime.MonoAOTCompiler.Task": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+    "Microsoft.NET.Runtime.MonoTargets.Sdk": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+    "Microsoft.NET.Runtime.WebAssembly.Sdk": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-arm": {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-arm64": {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-x64": {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.android-x86": {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-x86": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x86",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x86",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x64",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm64",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.maccatalyst": {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.ios-arm" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.ios-arm64" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.iossimulator" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.tvossimulator" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm",
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.7.21358.4",
+      "alias-to": {
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.browser-wasm",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm",
+        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm"
+      }
+    },
+    "Microsoft.NETCore.App.Runtime.Mono.browser-wasm" : {
+      "kind": "framework",
+      "version": "6.0.0-preview.7.21358.4"
+    },
+  }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/WorkloadManifest.json b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/WorkloadManifest.json
new file mode 100644
index 00000000000..0f68fdd529f
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/WorkloadManifest.json
@@ -0,0 +1,66 @@
+{
+  "version": 1,
+  "workloads": {
+    "microsoft-net-sdk-blazorwebassembly-aot": {
+      "description": "Blazor WebAssembly AOT workload",
+      "packs": [
+        "Microsoft.NET.Runtime.MonoAOTCompiler.Task",
+        "Microsoft.NET.Runtime.WebAssembly.Sdk",
+        "Microsoft.Netcore.App.Runtime.Aot.Cross.browser-wasm",
+        "Microsoft.NET.Runtime.Emscripten.Node",
+        "Microsoft.NET.Runtime.Emscripten.Python",
+        "Microsoft.NET.Runtime.Emscripten.Sdk"
+      ]
+    }
+  },
+  "packs": {
+    "Microsoft.NET.Runtime.MonoAOTCompiler.Task": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.4.21201.1"
+    },
+    "Microsoft.NET.Runtime.WebAssembly.Sdk": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.4.21201.1"
+    },
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm": {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.4.21201.1",
+      "alias-to": {
+        "win-x86": "microsoft.netcore.app.runtime.aot.win-x86.cross.browser-wasm",
+        "win-x64": "microsoft.netcore.app.runtime.aot.win-x64.cross.browser-wasm",
+        "linux-x64": "microsoft.netcore.app.runtime.aot.linux-x64.cross.browser-wasm",
+        "osx-x64": "microsoft.netcore.app.runtime.aot.osx-x64.cross.browser-wasm"
+      }
+    },
+    "Microsoft.NET.Runtime.Emscripten.Node" : {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.4.21205.1",
+      "alias-to": {
+        "win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x86",
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.osx-x64"
+      }
+    },
+    "Microsoft.NET.Runtime.Emscripten.Python" : {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.4.21205.1",
+      "alias-to": {
+        "win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x86",
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.osx-x64"
+      }
+    },
+    "Microsoft.NET.Runtime.Emscripten.Sdk" : {
+      "kind": "Sdk",
+      "version": "6.0.0-preview.4.21205.1",
+      "alias-to": {
+        "win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x86",
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.osx-x64"
+      }
+    }
+  }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/emsdkWorkloadManifest.json b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/emsdkWorkloadManifest.json
new file mode 100644
index 00000000000..36de729b649
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/emsdkWorkloadManifest.json
@@ -0,0 +1,46 @@
+{
+  "version": "7.0.0-alpha.2.22078.1",
+  "workloads": {
+    "microsoft-net-sdk-emscripten": {
+      "abstract": true,
+      "description": "Emscripten SDK compiler tooling",
+      "packs": [
+        "Microsoft.NET.Runtime.Emscripten.Node",
+        "Microsoft.NET.Runtime.Emscripten.Python",
+        "Microsoft.NET.Runtime.Emscripten.Sdk"
+      ],
+      "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
+    }
+  },
+  "packs": {
+    "Microsoft.NET.Runtime.Emscripten.Node" : {
+      "kind": "Sdk",
+      "version": "7.0.0-alpha.2.22078.1",
+      "alias-to": {
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Node.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Node.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Node.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Node.osx-x64"
+      }
+    },
+    "Microsoft.NET.Runtime.Emscripten.Python" : {
+      "kind": "Sdk",
+      "version": "7.0.0-alpha.2.22078.1",
+      "alias-to": {
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Python.win-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Python.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Python.osx-x64"
+      }
+    },
+    "Microsoft.NET.Runtime.Emscripten.Sdk" : {
+      "kind": "Sdk",
+      "version": "7.0.0-alpha.2.22078.1",
+      "alias-to": {
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Sdk.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Sdk.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Sdk.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Sdk.osx-x64"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/emsdkWorkloadManifest2.json b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/emsdkWorkloadManifest2.json
new file mode 100644
index 00000000000..b0f371c1db0
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/emsdkWorkloadManifest2.json
@@ -0,0 +1,46 @@
+{
+  "version": "7.0.0-alpha.2.22078.1",
+  "workloads": {
+    "microsoft-net-sdk-emscripten": {
+      "abstract": true,
+      "description": "Emscripten SDK compiler tooling",
+      "packs": [
+        "Microsoft.NET.Runtime.Emscripten.Node",
+        "Microsoft.NET.Runtime.Emscripten.Python",
+        "Microsoft.NET.Runtime.Emscripten.Sdk"
+      ],
+      "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
+    }
+  },
+  "packs": {
+    "Microsoft.NET.Runtime.Emscripten.Node" : {
+      "kind": "Sdk",
+      "version": "7.0.0-alpha.2.22079.1",
+      "alias-to": {
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Node.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Node.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Node.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Node.osx-x64"
+      }
+    },
+    "Microsoft.NET.Runtime.Emscripten.Python" : {
+      "kind": "Sdk",
+      "version": "7.0.0-alpha.2.22078.1",
+      "alias-to": {
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Python.win-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Python.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Python.osx-x64"
+      }
+    },
+    "Microsoft.NET.Runtime.Emscripten.Sdk" : {
+      "kind": "Sdk",
+      "version": "7.0.0-alpha.2.22078.1",
+      "alias-to": {
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Sdk.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Sdk.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Sdk.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.34.Sdk.osx-x64"
+      }
+    }
+  }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/mauiWorkloadManifest.json b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/mauiWorkloadManifest.json
new file mode 100644
index 00000000000..03e0b1a5285
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/mauiWorkloadManifest.json
@@ -0,0 +1,12 @@
+{
+  "version": "6.0.100-preview.6.891",
+  "workloads": {
+    "maui": {
+      "description": ".NET MAUI SDK for all platforms",
+      "extends": [
+        "maui-mobile",
+        "maui-desktop"
+      ]
+    }
+  }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/microsoft.net.sdk.blazorwebassembly.aot.6.0.0-preview.4.21209.5.nupkg b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/microsoft.net.sdk.blazorwebassembly.aot.6.0.0-preview.4.21209.5.nupkg
new file mode 100644
index 00000000000..e480ef9406c
Binary files /dev/null and b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/testassets/microsoft.net.sdk.blazorwebassembly.aot.6.0.0-preview.4.21209.5.nupkg differ
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/EmbeddedTemplates.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/EmbeddedTemplates.cs
index 0db62ecef27..2fbabf1bcae 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/EmbeddedTemplates.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/EmbeddedTemplates.cs
@@ -64,6 +64,8 @@ static EmbeddedTemplates()
             {
                 { "DependencyProvider.wxs", $"{s_namespace}.MsiTemplate.DependencyProvider.wxs" },
                 { "Directories.wxs", $"{s_namespace}.MsiTemplate.Directories.wxs" },
+                { "dotnethome_x64.wxs", $"{s_namespace}.MsiTemplate.dotnethome_x64.wxs" },
+                { "ManifestProduct.wxs", $"{s_namespace}.MsiTemplate.ManifestProduct.wxs" },
                 { "Product.wxs", $"{s_namespace}.MsiTemplate.Product.wxs" },
                 { "Registry.wxs", $"{s_namespace}.MsiTemplate.Registry.wxs" },
                 { "Variables.wxi", $"{s_namespace}.MsiTemplate.Variables.wxi" },
@@ -73,7 +75,10 @@ static EmbeddedTemplates()
                 { $"component.swr", $"{s_namespace}.SwixTemplate.component.swr" },
                 { $"component.res.swr", $"{s_namespace}.SwixTemplate.component.res.swr" },
                 { $"component.swixproj", $"{s_namespace}.SwixTemplate.component.swixproj" },
-                { $"manifest.vsmanproj", $"{s_namespace}.SwixTempalte.manifest.vsmanproj"}
+                { $"manifest.vsmanproj", $"{s_namespace}.SwixTempalte.manifest.vsmanproj"},
+
+                { "Icon.png", $"{s_namespace}.Misc.Icon.png"},
+                { "LICENSE.TXT", $"{s_namespace}.Misc.LICENSE.TXT"}
             };
         }
     }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs
similarity index 100%
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs
new file mode 100644
index 00000000000..4f6391f7fc7
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs
@@ -0,0 +1,479 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using System.Xml;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.Deployment.DotNet.Releases;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads
+{
+    public class GenerateManifestMsi : GenerateTaskBase
+    {
+        private const string ManifestSeparator = ".Manifest-";
+
+        private ReleaseVersion _sdkFeaureBandVersion;
+
+        /// <summary>
+        /// Gets or sets whether a corresponding SWIX project should be generated for the MSI.
+        /// </summary>
+        public bool GenerateSwixAuthoring
+        {
+            get;
+            set;
+        } = true;
+
+        /// <summary>
+        /// The path where the generated MSIs will be placed.
+        /// </summary>
+        [Required]
+        public string OutputPath
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The ID of the workload manifest.
+        /// </summary>
+        public string ManifestId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The set of MSIs that were produced.
+        /// </summary>
+        [Output]
+        public ITaskItem[] Msis
+        {
+            get;
+            protected set;
+        }
+
+        private ReleaseVersion SdkFeatureBandVersion
+        {
+            get
+            {
+                _sdkFeaureBandVersion ??= GetSdkFeatureBandVersion(SdkVersion);
+
+                return _sdkFeaureBandVersion;
+            }
+        }
+
+        /// <summary>
+        /// The SDK version, e.g. 6.0.107.
+        /// </summary>
+        public string SdkVersion
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// An item group containing information to shorten the names of packages.
+        /// </summary>
+        public ITaskItem[] ShortNames
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Semicolon sepearate list of ICEs to suppress.
+        /// </summary>
+        public string SuppressIces
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The version of the MSI.
+        /// </summary>
+        [Required]
+        public string MsiVersion
+        {
+            get;
+            set;
+        }
+
+        [Required]
+        public string WorkloadManifestPackage
+        {
+            get;
+            set;
+        }
+
+        public override bool Execute()
+        {
+            try
+            {
+                NugetPackage nupkg = new(WorkloadManifestPackage, Log);
+                List<TaskItem> msis = new();
+
+                // Extract the manifest ID from manifest package ID if no value was provided.
+                if (string.IsNullOrWhiteSpace(ManifestId))
+                {
+                    ManifestId = GetManifestIdFromPackageId(nupkg.Id);
+
+                    if (string.IsNullOrWhiteSpace(ManifestId))
+                    {
+                        Log.LogError($"Unable to parse a manifest ID from package ID: '{nupkg.Id}'. Please provide the 'ManifestId' parameter.");
+                    }
+                }
+
+                // If no explicit SDK version is provided we extract it from the package ID. Manifest packages
+                // have a fixed format that must end in the target SDK.
+                if (string.IsNullOrWhiteSpace(SdkVersion))
+                {
+                    SdkVersion = GetSdkVersionFromPackageId(nupkg.Id);
+
+                    if (string.IsNullOrWhiteSpace(SdkVersion))
+                    { 
+                        Log.LogError($"Unable to parse the SDK version from package ID: '{nupkg.Id}'. Please provide the 'SdkVersion' parameter.");
+                    }
+                }
+
+                Log.LogMessage(MessageImportance.High, $"Generating workload manifest installer for {SdkFeatureBandVersion}");
+
+                // MSI ProductName defaults to the package title and fallback to the package ID with a warning.
+                string productName = nupkg.Title;
+
+                if (string.IsNullOrWhiteSpace(nupkg.Title))
+                {
+                    Log?.LogMessage(MessageImportance.High, $"'{WorkloadManifestPackage}' should have a non-empty title. The MSI ProductName will be set to the package ID instead.");
+                    productName = nupkg.Id;
+                }
+
+                // Extract once, but harvest multiple times because some generated attributes are platform dependent. 
+                string packageContentsDirectory = Path.Combine(PackageDirectory, $"{nupkg.Identity}");
+                nupkg.Extract(packageContentsDirectory, Enumerable.Empty<string>());
+                string packageContentsDataDirectory = Path.Combine(packageContentsDirectory, "data");
+
+                foreach (string platform in GenerateMsiBase.SupportedPlatforms)
+                {
+                    // Extract the MSI template and add it to the list of source files.
+                    List<string> sourceFiles = new();
+                    string msiSourcePath = Path.Combine(MsiDirectory, $"{nupkg.Id}", $"{nupkg.Version}", platform);
+                    sourceFiles.Add(EmbeddedTemplates.Extract("DependencyProvider.wxs", msiSourcePath));
+                    sourceFiles.Add(EmbeddedTemplates.Extract("dotnethome_x64.wxs", msiSourcePath));
+                    sourceFiles.Add(EmbeddedTemplates.Extract("ManifestProduct.wxs", msiSourcePath));
+
+                    string EulaRtfPath = Path.Combine(msiSourcePath, "eula.rtf");
+                    File.WriteAllText(EulaRtfPath, GenerateMsiBase.Eula.Replace("__LICENSE_URL__", nupkg.LicenseUrl));
+                    EmbeddedTemplates.Extract("Variables.wxi", msiSourcePath);
+
+                    // Harvest the package contents and add it to the source files we need to compile.
+                    string packageContentWxs = Path.Combine(msiSourcePath, "PackageContent.wxs");
+                    sourceFiles.Add(packageContentWxs);
+
+                    HarvestToolTask heat = new(BuildEngine, WixToolsetPath)
+                    {
+                        ComponentGroupName = GenerateMsiBase.PackageContentComponentGroupName,
+                        DirectoryReference = "ManifestIdDir",
+                        OutputFile = packageContentWxs,
+                        Platform = platform,
+                        SourceDirectory = packageContentsDataDirectory
+                    };
+
+                    if (!heat.Execute())
+                    {
+                        throw new Exception($"Failed to harvest package contents.");
+                    }
+
+                    // To support upgrades, the UpgradeCode must be stable withing a feature band.
+                    // For example, 6.0.101 and 6.0.108 will generate the same GUID for the same platform.
+                    var upgradeCode = GenerateUpgradeCode(ManifestId, SdkFeatureBandVersion, platform);
+                    var productCode = Guid.NewGuid();
+                    Log.LogMessage($"UC: {upgradeCode}, PC: {productCode}, {SdkFeatureBandVersion}, {SdkVersion}, {platform}");
+
+                    string providerKeyName = $"{ManifestId},{SdkFeatureBandVersion},{platform}";
+
+                    // Compile the MSI sources
+                    string candleIntermediateOutputPath = Path.Combine(IntermediateBaseOutputPath, "wixobj",
+                        $"{nupkg.Id}", $"{nupkg.Version}", platform);
+
+                    CompileToolTask candle = new(BuildEngine, WixToolsetPath)
+                    {
+                        // Candle expects the output path to end with a single '\'
+                        OutputPath = candleIntermediateOutputPath.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar,
+                        SourceFiles = sourceFiles,
+                        Arch = platform
+                    };
+
+                    // Configure preprocessor definitions. 
+                    string manufacturer = "Microsoft Corporation";
+
+                    if (!string.IsNullOrWhiteSpace(nupkg.Authors) && (nupkg.Authors.IndexOf("Microsoft", StringComparison.OrdinalIgnoreCase) < 0))
+                    {
+                        manufacturer = nupkg.Authors;
+                    }
+                    Log.LogMessage(MessageImportance.Low, $"Setting Manufacturer to '{manufacturer}'");
+
+                    candle.PreprocessorDefinitions.Add($@"PackageId={nupkg.Id}");
+                    candle.PreprocessorDefinitions.Add($@"PackageVersion={nupkg.Version}");
+                    candle.PreprocessorDefinitions.Add($@"ProductVersion={MsiVersion}");
+                    candle.PreprocessorDefinitions.Add($@"ProductCode={productCode}");
+                    candle.PreprocessorDefinitions.Add($@"UpgradeCode={upgradeCode}");
+                    // Override the default provider key
+                    candle.PreprocessorDefinitions.Add($@"DependencyProviderKeyName={providerKeyName}");
+                    candle.PreprocessorDefinitions.Add($@"ProductName={productName}");
+                    candle.PreprocessorDefinitions.Add($@"Platform={platform}");
+                    candle.PreprocessorDefinitions.Add($@"SourceDir={packageContentsDataDirectory}");
+                    candle.PreprocessorDefinitions.Add($@"Manufacturer={manufacturer}");
+                    candle.PreprocessorDefinitions.Add($@"EulaRtf={EulaRtfPath}");
+                    candle.PreprocessorDefinitions.Add($@"SdkFeatureBandVersion={SdkFeatureBandVersion}");
+
+                    // The temporary installer in the SDK used lower invariants of the manifest ID.
+                    // We have to do the same to ensure the keypath generation produces stable GUIDs so that
+                    // the manifests/targets get the same component GUIDs.
+                    candle.PreprocessorDefinitions.Add($@"ManifestId={ManifestId.ToLowerInvariant()}");
+
+                    // Compiler extension to process dependency provider authoring for package reference counting.
+                    candle.Extensions.Add("WixDependencyExtension");
+
+                    if (!candle.Execute())
+                    {
+                        throw new Exception($"Failed to compile MSI.");
+                    }
+
+                    // Link the MSI. The generated filename contains a the semantic version (excluding build metadata) and platform. 
+                    // If the source package already contains a platform, e.g. an aliased package that has a RID, then we don't add
+                    // the platform again.
+
+                    string shortPackageName = Path.GetFileNameWithoutExtension(WorkloadManifestPackage);
+
+                    string outputFile = Path.Combine(OutputPath, shortPackageName + $"-{platform}.msi");
+
+                    LinkToolTask light = new(BuildEngine, WixToolsetPath)
+                    {
+                        OutputFile = Path.Combine(OutputPath, outputFile),
+                        SourceFiles = Directory.EnumerateFiles(candleIntermediateOutputPath, "*.wixobj"),
+                        SuppressIces = this.SuppressIces
+                    };
+
+                    // Add WiX extensions
+                    light.Extensions.Add("WixDependencyExtension");
+                    light.Extensions.Add("WixUIExtension");
+                    light.Extensions.Add("WixUtilExtension");
+
+                    if (!light.Execute())
+                    {
+                        throw new Exception($"Failed to link MSI.");
+                    }
+
+                    // Generate metadata used for CLI based installations.
+                    string msiPath = light.OutputFile;
+                    MsiProperties msiProps = new MsiProperties
+                    {
+                        InstallSize = MsiUtils.GetInstallSize(msiPath),
+                        Language = Convert.ToInt32(MsiUtils.GetProperty(msiPath, "ProductLanguage")),
+                        Payload = Path.GetFileName(msiPath),
+                        ProductCode = MsiUtils.GetProperty(msiPath, "ProductCode"),
+                        ProductVersion = MsiUtils.GetProperty(msiPath, "ProductVersion"),
+                        ProviderKeyName = $"{providerKeyName}",
+                        UpgradeCode = MsiUtils.GetProperty(msiPath, "UpgradeCode"),
+                        RelatedProducts = MsiUtils.GetRelatedProducts(msiPath)
+                    };
+
+                    string msiJsonPath = Path.Combine(Path.GetDirectoryName(msiPath), Path.GetFileNameWithoutExtension(msiPath) + ".json");
+                    File.WriteAllText(msiJsonPath, JsonSerializer.Serialize<MsiProperties>(msiProps));
+
+                    TaskItem msi = new(light.OutputFile);
+                    msi.SetMetadata(Metadata.Platform, platform);
+                    msi.SetMetadata(Metadata.Version, nupkg.ProductVersion);
+                    msi.SetMetadata(Metadata.JsonProperties, msiJsonPath);
+                    msi.SetMetadata(Metadata.WixObj, candleIntermediateOutputPath);
+
+                    if (GenerateSwixAuthoring && IsSupportedByVisualStudio(platform))
+                    {
+                        string swixPackageId = $"{nupkg.Id.ToString().Replace(ShortNames)}";
+
+                        string swixProject = GenerateSwixPackageAuthoring(light.OutputFile,
+                            swixPackageId, platform);
+
+                        if (!string.IsNullOrWhiteSpace(swixProject))
+                        {
+                            msi.SetMetadata(Metadata.SwixProject, swixProject);
+                        }
+                    }
+
+                    // Generate a .csproj to build a NuGet payload package to carry the MSI and JSON manifest
+                    msi.SetMetadata(Metadata.PackageProject, GeneratePackageProject(msi.ItemSpec, msiJsonPath, platform, nupkg));
+
+                    msis.Add(msi);
+                }
+
+                Msis = msis.ToArray();
+            }
+            catch (Exception e)
+            {
+                Log.LogErrorFromException(e);
+            }
+
+            return !Log.HasLoggedErrors;
+        }
+
+        private string GeneratePackageProject(string msiPath, string msiJsonPath, string platform, NugetPackage nupkg)
+        {
+            string msiPackageProject = Path.Combine(MsiPackageDirectory, platform, nupkg.Id, "msi.csproj");
+            string msiPackageProjectDir = Path.GetDirectoryName(msiPackageProject);
+
+            Log?.LogMessage($"Generating package project: '{msiPackageProject}'");
+
+            if (Directory.Exists(msiPackageProjectDir))
+            {
+                Directory.Delete(msiPackageProjectDir, recursive: true);
+            }
+
+            Directory.CreateDirectory(msiPackageProjectDir);
+
+            string iconFileName = "Icon.png";
+            string licenseFileName = "LICENSE.TXT";
+            EmbeddedTemplates.Extract(iconFileName, msiPackageProjectDir);
+            EmbeddedTemplates.Extract(licenseFileName, msiPackageProjectDir);
+
+            XmlWriterSettings settings = new XmlWriterSettings
+            {
+                Indent = true,
+                IndentChars = "  ",
+            };
+
+            XmlWriter writer = XmlWriter.Create(msiPackageProject, settings);
+
+            writer.WriteStartElement("Project");
+            writer.WriteAttributeString("Sdk", "Microsoft.NET.Sdk");
+
+            writer.WriteStartElement("PropertyGroup");
+            writer.WriteElementString("TargetFramework", "net5.0");
+            writer.WriteElementString("GeneratePackageOnBuild", "true");
+            writer.WriteElementString("IncludeBuildOutput", "false");
+            writer.WriteElementString("IsPackable", "true");
+            writer.WriteElementString("PackageType", "DotnetPlatform");
+            writer.WriteElementString("SuppressDependenciesWhenPacking", "true");
+            writer.WriteElementString("NoWarn", "$(NoWarn);NU5128");
+            writer.WriteElementString("PackageId", $"{nupkg.Id}.Msi.{platform}");
+            writer.WriteElementString("PackageVersion", $"{nupkg.Version}");
+            writer.WriteElementString("Description", nupkg.Description);
+
+            if (!string.IsNullOrWhiteSpace(nupkg.Authors))
+            {
+                writer.WriteElementString("Authors", nupkg.Authors);
+            }
+
+            if (!string.IsNullOrWhiteSpace(nupkg.Copyright))
+            {
+                writer.WriteElementString("Copyright", nupkg.Copyright);
+            }
+
+            if (!string.IsNullOrWhiteSpace(nupkg.ProjectUrl))
+            {
+                writer.WriteElementString("PackageProjectUrl", nupkg.ProjectUrl);
+            }
+
+            writer.WriteElementString("PackageLicenseExpression", "MIT");
+            writer.WriteEndElement();
+
+            writer.WriteStartElement("ItemGroup");
+            WriteItem(writer, "None", msiPath, @"\data");
+            WriteItem(writer, "None", msiJsonPath, @"\data\msi.json");
+            WriteItem(writer, "None", licenseFileName, @"\");
+            writer.WriteEndElement(); // ItemGroup
+
+            writer.WriteRaw(@"
+<Target Name=""AddPackageIcon""
+        BeforeTargets=""$(GenerateNuspecDependsOn)""
+        Condition=""'$(PackageIcon)' == ''"">
+  <PropertyGroup>
+    <PackageIcon>Icon.png</PackageIcon>
+  </PropertyGroup>
+  <ItemGroup Condition=""'$(IsPackable)' == 'true'"">
+    <None Include=""$(PackageIcon)"" Pack=""true"" PackagePath=""$(PackageIcon)"" Visible=""false"" />
+  </ItemGroup>
+</Target>
+");
+
+            writer.WriteEndElement(); // Project
+            writer.Flush();
+            writer.Close();
+
+            return msiPackageProject;
+        }
+
+        private void WriteItem(XmlWriter writer, string itemName, string include, string packagePath)
+        {
+            writer.WriteStartElement(itemName);
+            writer.WriteAttributeString("Include", include);
+            writer.WriteAttributeString("Pack", "true");
+            writer.WriteAttributeString("PackagePath", packagePath);
+            writer.WriteEndElement();
+        }
+
+        internal string GenerateSwixPackageAuthoring(string msiPath, string packageId, string platform)
+        {
+            GenerateVisualStudioMsiPackageProject swixTask = new()
+            {
+                Chip = platform,
+                IntermediateBaseOutputPath = this.IntermediateBaseOutputPath,
+                PackageName = packageId,
+                MsiPath = msiPath,
+                Version = !string.IsNullOrEmpty(MsiVersion) ? new Version(MsiVersion) : null,
+                BuildEngine = this.BuildEngine,
+            };
+
+            string vsPayloadRelativePath = $"{swixTask.PackageName},version={swixTask.Version.ToString(3)},chip={swixTask.Chip},productarch={swixTask.ProductArch}\\{Path.GetFileName(msiPath)}";
+            CheckRelativePayloadPath(vsPayloadRelativePath);
+
+            if (!swixTask.Execute())
+            {
+                Log.LogError($"Failed to generate SWIX authoring for '{msiPath}'");
+            }
+
+            return swixTask.SwixProject;
+        }
+
+        internal static string GetManifestIdFromPackageId(string packageId)
+        {
+            return !string.IsNullOrWhiteSpace(packageId) && packageId.IndexOf(ManifestSeparator) > -1 ?
+                packageId.Substring(0, packageId.IndexOf(ManifestSeparator)) :
+                null;
+        }
+
+        internal static string GetSdkVersionFromPackageId(string packageId)
+        {
+            return !string.IsNullOrWhiteSpace(packageId) && packageId.IndexOf(ManifestSeparator) > -1 ?
+                packageId.Substring(packageId.IndexOf(ManifestSeparator) + ManifestSeparator.Length) :
+                null;
+        }
+
+        internal static ReleaseVersion GetSdkFeatureBandVersion(string version)
+        {
+            ReleaseVersion sdkVersion = new(version);
+
+            if (string.IsNullOrEmpty(sdkVersion.Prerelease) || sdkVersion.Prerelease.Split('.').Any(s => string.Equals("ci", s) || string.Equals("dev", s)))
+            {
+                return new ReleaseVersion(sdkVersion.Major, sdkVersion.Minor, sdkVersion.SdkFeatureBand);
+            }
+
+            string[] preleaseParts = sdkVersion.Prerelease.Split('.');
+
+            string prerelease = (preleaseParts.Length > 1) ?
+                $"{preleaseParts[0]}.{preleaseParts[1]}" :
+                preleaseParts[0];
+            
+            return new ReleaseVersion(sdkVersion.Major, sdkVersion.Minor, sdkVersion.SdkFeatureBand, prerelease);
+        }
+
+        internal static Guid GenerateUpgradeCode(string manifestId, ReleaseVersion sdkFeatureBandVersion, string platform)
+        {
+            return Utils.CreateUuid(GenerateMsiBase.UpgradeCodeNamespaceUuid, $"{manifestId};{sdkFeatureBandVersion};{platform}");
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs
similarity index 98%
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs
index 8cbf2202242..0c34271f6fe 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs
@@ -66,7 +66,7 @@ public override bool Execute()
                 // For a single MSI we always generate all platforms and simply use the ID of the source package for
                 // the SWIX projects.
                 List<ITaskItem> msis = new();
-                msis.AddRange(Generate(SourcePackage, null, OutputPath, GetInstallDir(kind), platforms));
+                msis.AddRange(Generate(SourcePackage, null, OutputPath, kind, platforms));
                 Msis = msis.ToArray();
             }
             catch (Exception e)
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs
similarity index 52%
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs
index 5c0bfb9c117..1bbf2c5b318 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs
@@ -5,7 +5,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
+using System.Text.Json;
+using System.Xml;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using Microsoft.NET.Sdk.WorkloadManifestReader;
@@ -32,6 +33,26 @@ public abstract class GenerateMsiBase : GenerateTaskBase
         /// </summary>
         internal static readonly Guid ProductCodeNamespaceUuid = Guid.Parse("3B04DD8B-41C4-4DA3-9E49-4B69F11533A7");
 
+        /// <summary>
+        /// Static RTF text for inserting a EULA into the MSI. The license URL of the NuGet package will be embedded 
+        /// as plain text since the text control used to render the MSI UI does not render hyperlinks even though RTF supports it.
+        /// </summary>
+        internal static readonly string Eula = @"{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
+{\colortbl ;\red0\green0\blue255;}
+{\*\generator Riched20 10.0.19041}\viewkind4\uc1 
+\pard\sa200\sl276\slmult1\f0\fs22\lang9 This software is licensed separately as set out in its accompanying license. By continuing, you also agree to that license (__LICENSE_URL__).\par
+\par
+}";
+
+        /// <summary>
+        /// An item group containing information to shorten the names of packages.
+        /// </summary>
+        public ITaskItem[] ShortNames
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// The set of supported target platforms for MSIs.
         /// </summary>
@@ -89,15 +110,24 @@ public string SuppressIces
             set;
         }
 
+        /// <summary>
+        /// Used to synchronize access to the NuGet being extracted.
+        /// </summary>
+        private readonly object extractNuGetLock = new object();
+
         /// <summary>
         /// Generate a set of MSIs for the specified platforms using the specified NuGet package.
         /// </summary>
         /// <param name="sourcePackage">The NuGet package to convert into an MSI.</param>
         /// <param name="outputPath">The output path of the generated MSI.</param>
         /// <param name="platforms"></param>
-        protected IEnumerable<ITaskItem> Generate(string sourcePackage, string swixPackageId, string outputPath, string installDir, params string[] platforms)
+        protected IEnumerable<ITaskItem> Generate(string sourcePackage, string swixPackageId, string outputPath, WorkloadPackKind kind, params string[] platforms)
         {
-            NugetPackage nupkg = new(sourcePackage, Log);
+            NugetPackage nupkg = null;
+            lock (extractNuGetLock)
+            {
+                nupkg = new(sourcePackage, Log);
+            }
             List<TaskItem> msis = new();
 
             // MSI ProductName defaults to the package title and fallback to the package ID with a warning.
@@ -105,43 +135,78 @@ protected IEnumerable<ITaskItem> Generate(string sourcePackage, string swixPacka
 
             if (string.IsNullOrWhiteSpace(nupkg.Title))
             {
-                Log?.LogWarning($"'{sourcePackage}' should have a non-empty title. The MSI ProductName will be set to the package ID instead.");
+                Log?.LogMessage(MessageImportance.High, $"'{sourcePackage}' should have a non-empty title. The MSI ProductName will be set to the package ID instead.");
                 productName = nupkg.Id;
             }
 
             // Extract once, but harvest multiple times because some generated attributes are platform dependent. 
             string packageContentsDirectory = Path.Combine(PackageDirectory, $"{nupkg.Identity}");
             IEnumerable<string> exclusions = GetExlusionPatterns();
-            Log.LogMessage(MessageImportance.Low, $"Extracting '{sourcePackage}' to '{packageContentsDirectory}'");
-            nupkg.Extract(packageContentsDirectory, exclusions);
+            string installDir = GetInstallDir(kind);
+            string packKind = kind.ToString().ToLowerInvariant();
+
+            if ((kind != WorkloadPackKind.Library) && (kind != WorkloadPackKind.Template))
+            {
+                Log.LogMessage(MessageImportance.Low, $"Extracting '{sourcePackage}' to '{packageContentsDirectory}'");
+                lock (extractNuGetLock)
+                {
+                    nupkg.Extract(packageContentsDirectory, exclusions);
+                }
+            }
+            else
+            {
+                // Library and template packs are not extracted. We want to harvest the nupkg itself,
+                // instead of the contents. The package is still copied to a separate folder for harvesting
+                // to avoid accidentally pulling in additional files and directories.
+                Log.LogMessage(MessageImportance.Low, $"Copying '{sourcePackage}' to '{packageContentsDirectory}'");
+
+                if (Directory.Exists(packageContentsDirectory))
+                {
+                    Directory.Delete(packageContentsDirectory, recursive: true);
+                }
+                Directory.CreateDirectory(packageContentsDirectory);
+
+                File.Copy(sourcePackage, Path.Combine(packageContentsDirectory, Path.GetFileName(sourcePackage)));
+            }
 
-            foreach (string platform in platforms)
+            System.Threading.Tasks.Parallel.ForEach(platforms, platform =>
             {
                 // Extract the MSI template and add it to the list of source files.
                 List<string> sourceFiles = new();
                 string msiSourcePath = Path.Combine(MsiDirectory, $"{nupkg.Id}", $"{nupkg.Version}", platform);
                 sourceFiles.Add(EmbeddedTemplates.Extract("DependencyProvider.wxs", msiSourcePath));
                 sourceFiles.Add(EmbeddedTemplates.Extract("Directories.wxs", msiSourcePath));
+                sourceFiles.Add(EmbeddedTemplates.Extract("dotnethome_x64.wxs", msiSourcePath));
                 sourceFiles.Add(EmbeddedTemplates.Extract("Product.wxs", msiSourcePath));
                 sourceFiles.Add(EmbeddedTemplates.Extract("Registry.wxs", msiSourcePath));
+
+                string EulaRtfPath = Path.Combine(msiSourcePath, "eula.rtf");
+                File.WriteAllText(EulaRtfPath, Eula.Replace("__LICENSE_URL__", nupkg.LicenseUrl));
                 EmbeddedTemplates.Extract("Variables.wxi", msiSourcePath);
 
                 // Harvest the package contents and add it to the source files we need to compile.
                 string packageContentWxs = Path.Combine(msiSourcePath, "PackageContent.wxs");
                 sourceFiles.Add(packageContentWxs);
 
+                string directoryReference = (kind == WorkloadPackKind.Library) || (kind == WorkloadPackKind.Template)
+                    ? "InstallDir"
+                    : PackageContentDirectoryReference;
+
                 HarvestToolTask heat = new(BuildEngine, WixToolsetPath)
                 {
                     ComponentGroupName = PackageContentComponentGroupName,
-                    DirectoryReference = PackageContentDirectoryReference,
+                    DirectoryReference = directoryReference,
                     OutputFile = packageContentWxs,
                     Platform = platform,
                     SourceDirectory = packageContentsDirectory
                 };
 
-                if (!heat.Execute())
+                lock (extractNuGetLock)
                 {
-                    throw new Exception($"Failed to harvest package contents.");
+                    if (!heat.Execute())
+                    {
+                        throw new Exception($"Failed to harvest package contents.");
+                    }
                 }
 
                 // Compile the MSI sources
@@ -171,6 +236,8 @@ protected IEnumerable<ITaskItem> Generate(string sourcePackage, string swixPacka
                 candle.PreprocessorDefinitions.Add($@"Platform={platform}");
                 candle.PreprocessorDefinitions.Add($@"SourceDir={packageContentsDirectory}");
                 candle.PreprocessorDefinitions.Add($@"Manufacturer={manufacturer}");
+                candle.PreprocessorDefinitions.Add($@"EulaRtf={EulaRtfPath}");
+                candle.PreprocessorDefinitions.Add($@"PackKind={packKind}");
 
                 // Compiler extension to process dependency provider authoring for package reference counting.
                 candle.Extensions.Add("WixDependencyExtension");
@@ -183,9 +250,12 @@ protected IEnumerable<ITaskItem> Generate(string sourcePackage, string swixPacka
                 // Link the MSI. The generated filename contains a the semantic version (excluding build metadata) and platform. 
                 // If the source package already contains a platform, e.g. an aliased package that has a RID, then we don't add
                 // the platform again.
+
+                string shortPackageName = Path.GetFileNameWithoutExtension(sourcePackage).Replace(ShortNames);
+
                 string outputFile = sourcePackage.Contains(platform) ?
-                    Path.Combine(OutputPath, Path.GetFileNameWithoutExtension(sourcePackage) + ".msi") :
-                    Path.Combine(OutputPath, Path.GetFileNameWithoutExtension(sourcePackage) + $"-{platform}.msi");
+                    Path.Combine(OutputPath, shortPackageName + ".msi") :
+                    Path.Combine(OutputPath, shortPackageName + $"-{platform}.msi");
 
                 LinkToolTask light = new(BuildEngine, WixToolsetPath)
                 {
@@ -197,33 +267,152 @@ protected IEnumerable<ITaskItem> Generate(string sourcePackage, string swixPacka
                 // Add WiX extensions
                 light.Extensions.Add("WixDependencyExtension");
                 light.Extensions.Add("WixUIExtension");
+                light.Extensions.Add("WixUtilExtension");
 
                 if (!light.Execute())
                 {
                     throw new Exception($"Failed to link MSI.");
                 }
 
+                // Generate metadata used for CLI based installations.
+                string msiPath = light.OutputFile;
+                MsiProperties msiProps = new MsiProperties
+                {
+                    InstallSize = MsiUtils.GetInstallSize(msiPath),
+                    Language = Convert.ToInt32(MsiUtils.GetProperty(msiPath, "ProductLanguage")),
+                    Payload = Path.GetFileName(msiPath),
+                    ProductCode = MsiUtils.GetProperty(msiPath, "ProductCode"),
+                    ProductVersion = MsiUtils.GetProperty(msiPath, "ProductVersion"),
+                    ProviderKeyName = $"{nupkg.Id},{nupkg.Version},{platform}",
+                    UpgradeCode = MsiUtils.GetProperty(msiPath, "UpgradeCode"),
+                    RelatedProducts = MsiUtils.GetRelatedProducts(msiPath)
+                };
+
+                string msiJsonPath = Path.Combine(Path.GetDirectoryName(msiPath), Path.GetFileNameWithoutExtension(msiPath) + ".json");
+                File.WriteAllText(msiJsonPath, JsonSerializer.Serialize<MsiProperties>(msiProps));
+
                 TaskItem msi = new(light.OutputFile);
-                msi.SetMetadata("Platform", platform);
-                msi.SetMetadata("Version", nupkg.ProductVersion);
+                msi.SetMetadata(Metadata.Platform, platform);
+                msi.SetMetadata(Metadata.Version, nupkg.ProductVersion);
+                msi.SetMetadata(Metadata.JsonProperties, msiJsonPath);
+                msi.SetMetadata(Metadata.WixObj, candleIntermediateOutputPath);
 
-                if (GenerateSwixAuthoring)
+                if (GenerateSwixAuthoring && IsSupportedByVisualStudio(platform))
                 {
-                    string swixProject = GenerateSwixPackageAuthoring(light.OutputFile, 
-                        !string.IsNullOrWhiteSpace(swixPackageId) ? swixPackageId : $"{nupkg.Id}", platform);
+                    string swixProject = GenerateSwixPackageAuthoring(light.OutputFile,
+                        !string.IsNullOrWhiteSpace(swixPackageId) ? swixPackageId :
+                        $"{nupkg.Id.Replace(ShortNames)}.{nupkg.Version}", platform);
 
                     if (!string.IsNullOrWhiteSpace(swixProject))
                     {
-                        msi.SetMetadata("SwixProject", swixProject);
+                        msi.SetMetadata(Metadata.SwixProject, swixProject);
                     }
                 }
 
+                // Generate a .csproj to build a NuGet payload package to carry the MSI and JSON manifest
+                msi.SetMetadata(Metadata.PackageProject, GeneratePackageProject(msi.ItemSpec, msiJsonPath, platform, nupkg));
+
                 msis.Add(msi);
-            }
+            });
 
             return msis;
         }
 
+        private string GeneratePackageProject(string msiPath, string msiJsonPath, string platform, NugetPackage nupkg)
+        {
+            string msiPackageProject = Path.Combine(MsiPackageDirectory, platform, nupkg.Id, "msi.csproj");
+            string msiPackageProjectDir = Path.GetDirectoryName(msiPackageProject);
+
+            Log?.LogMessage($"Generating package project: '{msiPackageProject}'");
+
+            if (Directory.Exists(msiPackageProjectDir))
+            {
+                Directory.Delete(msiPackageProjectDir, recursive: true);
+            }
+
+            Directory.CreateDirectory(msiPackageProjectDir);
+
+            string iconFileName = "Icon.png";
+            string licenseFileName = "LICENSE.TXT";
+            EmbeddedTemplates.Extract(iconFileName, msiPackageProjectDir);
+            EmbeddedTemplates.Extract(licenseFileName, msiPackageProjectDir);
+
+            XmlWriterSettings settings = new XmlWriterSettings
+            {
+                Indent = true,
+                IndentChars = "  ",
+            };
+
+            XmlWriter writer = XmlWriter.Create(msiPackageProject, settings);
+
+            writer.WriteStartElement("Project");
+            writer.WriteAttributeString("Sdk", "Microsoft.NET.Sdk");
+
+            writer.WriteStartElement("PropertyGroup");
+            writer.WriteElementString("TargetFramework", "net5.0");
+            writer.WriteElementString("GeneratePackageOnBuild", "true");
+            writer.WriteElementString("IncludeBuildOutput", "false");
+            writer.WriteElementString("IsPackable", "true");
+            writer.WriteElementString("PackageType", "DotnetPlatform");
+            writer.WriteElementString("SuppressDependenciesWhenPacking", "true");
+            writer.WriteElementString("NoWarn", "$(NoWarn);NU5128");
+            writer.WriteElementString("PackageId", $"{nupkg.Id}.Msi.{platform}");
+            writer.WriteElementString("PackageVersion", $"{nupkg.Version}");
+            writer.WriteElementString("Description", nupkg.Description);
+
+            if (!string.IsNullOrWhiteSpace(nupkg.Authors))
+            {
+                writer.WriteElementString("Authors", nupkg.Authors);
+            }
+
+            if (!string.IsNullOrWhiteSpace(nupkg.Copyright))
+            {
+                writer.WriteElementString("Copyright", nupkg.Copyright);
+            }
+
+            if (!string.IsNullOrWhiteSpace(nupkg.ProjectUrl))
+            {
+                writer.WriteElementString("PackageProjectUrl", nupkg.ProjectUrl);
+            }
+
+            writer.WriteElementString("PackageLicenseExpression", "MIT");
+            writer.WriteEndElement();
+
+            writer.WriteStartElement("ItemGroup");
+            WriteItem(writer, "None", msiPath, @"\data");
+            WriteItem(writer, "None", msiJsonPath, @"\data\msi.json");
+            WriteItem(writer, "None", licenseFileName, @"\");
+            writer.WriteEndElement(); // ItemGroup
+
+            writer.WriteRaw(@"
+<Target Name=""AddPackageIcon""
+        BeforeTargets=""$(GenerateNuspecDependsOn)""
+        Condition=""'$(PackageIcon)' == ''"">
+  <PropertyGroup>
+    <PackageIcon>Icon.png</PackageIcon>
+  </PropertyGroup>
+  <ItemGroup Condition=""'$(IsPackable)' == 'true'"">
+    <None Include=""$(PackageIcon)"" Pack=""true"" PackagePath=""$(PackageIcon)"" Visible=""false"" />
+  </ItemGroup>
+</Target>
+");
+
+            writer.WriteEndElement(); // Project
+            writer.Flush();
+            writer.Close();
+
+            return msiPackageProject;
+        }
+
+        private void WriteItem(XmlWriter writer, string itemName, string include, string packagePath)
+        {
+            writer.WriteStartElement(itemName);
+            writer.WriteAttributeString("Include", include);
+            writer.WriteAttributeString("Pack", "true");
+            writer.WriteAttributeString("PackagePath", packagePath);
+            writer.WriteEndElement();
+        }
+
         private string GenerateSwixPackageAuthoring(string msiPath, string packageId, string platform)
         {
             GenerateVisualStudioMsiPackageProject swixTask = new()
@@ -232,10 +421,9 @@ private string GenerateSwixPackageAuthoring(string msiPath, string packageId, st
                 IntermediateBaseOutputPath = this.IntermediateBaseOutputPath,
                 PackageName = packageId,
                 MsiPath = msiPath,
+                BuildEngine = this.BuildEngine,
             };
 
-            swixTask.BuildEngine = BuildEngine;
-
             if (!swixTask.Execute())
             {
                 Log.LogError($"Failed to generate SWIX authoring for '{msiPath}'");
@@ -281,7 +469,7 @@ internal static string GetInstallDir(WorkloadPackKind kind)
             {
                 WorkloadPackKind.Framework or WorkloadPackKind.Sdk => "packs",
                 WorkloadPackKind.Library => "library-packs",
-                WorkloadPackKind.Template => "templates",
+                WorkloadPackKind.Template => "template-packs",
                 WorkloadPackKind.Tool => "tool-packs",
                 _ => throw new ArgumentException($"Unknown package kind: {kind}"),
             };
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateTaskBase.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateTaskBase.cs
index 82d7dfe48b9..2f64819c60a 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateTaskBase.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateTaskBase.cs
@@ -10,8 +10,12 @@
 
 namespace Microsoft.DotNet.Build.Tasks.Workloads
 {
-    public abstract class GenerateTaskBase : Task
+    public abstract class GenerateTaskBase : Microsoft.Build.Utilities.Task
     {
+        public const int MaxPayloadRelativePath = 182;
+
+        public static readonly string[] SupportedVisualStudioPlatforms = { "x86", "x64" };
+
         /// <summary>
         /// The root intermediate output directory. 
         /// </summary>
@@ -42,6 +46,11 @@ public string IntermediateBaseOutputPath
         /// </summary>
         public string MsiDirectory => Path.Combine(SourceDirectory, "msi");
 
+        /// <summary>
+        /// Root directory for .csproj sources to build NuGet packages.
+        /// </summary>
+        public string MsiPackageDirectory => Path.Combine(SourceDirectory, "msiPackage");
+
         /// <summary>
         /// The directory containing the WiX toolset binaries.
         /// </summary>
@@ -51,5 +60,24 @@ public string WixToolsetPath
             get;
             set;
         }
+
+        /// <summary>
+        /// Determines if the specified platfor is support by Visual Studio.
+        /// </summary>
+        /// <param name="platform">The platform to check</param>
+        /// <returns><see langword="true" /> if the platform is supported by Visual Studio.</returns>
+        protected bool IsSupportedByVisualStudio(string platform)
+        {
+            return SupportedVisualStudioPlatforms.Contains(platform);
+        }
+
+        protected void CheckRelativePayloadPath(string relativePath)
+        {
+            if (relativePath.Length > MaxPayloadRelativePath)
+            {
+                // We'll let the task's execute method take care of logging this and terminating.
+                throw new Exception($"Payload relative path exceeds max length ({MaxPayloadRelativePath}): {relativePath}");
+            }
+        }
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioManifest.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioManifest.cs
index cf86b4d756e..825d9e887a4 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioManifest.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioManifest.cs
@@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Build.Tasks.Workloads
     /// MSBuild task for generating a Visual Studio manifest project (.vsmanproj). The generated project can be used
     /// to create a manifest (.vsman) by merging JSON manifest files produced from one or more SWIX project.
     /// </summary>
-    public class GenerateVisualStudioManifest : Task
+    public class GenerateVisualStudioManifest : Microsoft.Build.Utilities.Task
     {
         /// <summary>
         /// The base path where the project source will be generated.
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs
similarity index 82%
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs
index 75d0c576eb2..3b2573fa438 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs
@@ -4,9 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
 using System.Text;
+using Microsoft.Build.Framework;
 
 namespace Microsoft.DotNet.Build.Tasks.Workloads
 {
@@ -82,6 +81,15 @@ internal long InstallSize
             set;
         }
 
+        /// <summary>
+        /// The product architecture to which the package applies, the default is neutral.
+        /// </summary>
+        internal string ProductArch
+        {
+            get;
+            set;
+        } = "neutral";
+
         public override bool Execute()
         {
             try
@@ -96,11 +104,16 @@ public override bool Execute()
                     Log.LogMessage($"Using MSI version for package version: {Version}");
                 }
 
+                // Try to catch VS manifest validation errors before we get to VS.
+                string vsPayloadRelativePath = $"{PackageName},version={Version.ToString(3)},chip={Chip},productarch={ProductArch}\\{Path.GetFileName(MsiPath)}";
+                CheckRelativePayloadPath(vsPayloadRelativePath);
+
                 string swixSourceDirectory = Path.Combine(SwixDirectory, PackageName, Chip);
                 string msiSwr = EmbeddedTemplates.Extract("msi.swr", swixSourceDirectory);
-                string msiSwixProj = EmbeddedTemplates.Extract("msi.swixproj", swixSourceDirectory, $"{PackageName}.{Version.ToString(3)}.{Chip}.swixproj");
+                string fullProjectName = $"{PackageName}.{Version.ToString(3)}.{Chip}";
+                string msiSwixProj = EmbeddedTemplates.Extract("msi.swixproj", swixSourceDirectory, $"{Utils.GetHash(fullProjectName, "MD5")}.swixproj");
 
-                FileInfo msiInfo = new (MsiPath);
+                FileInfo msiInfo = new(MsiPath);
                 PayloadSize = msiInfo.Length;
                 InstallSize = MsiUtils.GetInstallSize(MsiPath);
                 Log.LogMessage($"MSI payload size: {PayloadSize}, install size (estimated): {InstallSize} ");
@@ -127,6 +140,7 @@ private Dictionary<string, string> GetReplacementTokens()
                 {"__VS_PACKAGE_VERSION__", Version.ToString() },
                 {"__VS_PACKAGE_CHIP__", Chip },
                 {"__VS_PACKAGE_INSTALL_SIZE_SYSTEM_DRIVE__", $"{InstallSize}"},
+                {"__VS_PACKAGE_PRODUCT_ARCH__", $"{ProductArch}" },
                 {"__VS_PAYLOAD_SOURCE__", MsiPath },
                 {"__VS_PAYLOAD_SIZE__", $"{PayloadSize}" },
             };
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs
deleted file mode 100644
index ead8941848f..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.NET.Sdk.WorkloadManifestReader;
-
-namespace Microsoft.DotNet.Build.Tasks.Workloads.src
-{
-    /// <summary>
-    /// MSBuild task for generating Visual Studio component projects representing
-    /// the workload definitions.
-    /// </summary>
-    public class GenerateVisualStudioWorkload : GenerateTaskBase
-    {
-        /// <summary>
-        /// The workload manifest files to use for generating the Visual Studio components.
-        /// </summary>
-        public ITaskItem[] WorkloadManifests
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// A set of packages containing workload manifests.
-        /// </summary>
-        public ITaskItem[] WorkloadPackages
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        [Output]
-        public ITaskItem[] SwixProjects
-        {
-            get;
-            set;
-        }
-
-        public override bool Execute()
-        {
-            try
-            {
-                List<ITaskItem> swixProjects = new();
-
-                foreach (ITaskItem workloadPackage in WorkloadPackages)
-                {
-                    swixProjects.AddRange(ProcessWorkloadManifest(workloadPackage.GetMetadata("FullPath")));
-                }
-
-                SwixProjects = swixProjects.ToArray();
-            }
-            catch (Exception e)
-            {
-                Log.LogMessage(MessageImportance.Low, e.StackTrace);
-                Log.LogErrorFromException(e);
-            }
-
-            return !Log.HasLoggedErrors;
-        }
-
-        /// <summary>
-        /// Extracts the workload manifest from the manifest package and generate a SWIX project for a Visual Studio component
-        /// matching the manifests dependencies.  
-        /// </summary>
-        /// <param name="workloadManifestPackage">The path of the workload package containing the manifest.</param>
-        /// <returns>A set of items containing the generated SWIX projects.</returns>
-        internal IEnumerable<ITaskItem> ProcessWorkloadManifest(string workloadManifestPackage)
-        {
-            NugetPackage workloadPackage = new(workloadManifestPackage, Log);
-
-            string packageContentPath = Path.Combine(PackageDirectory, $"{workloadPackage.Identity}");
-            workloadPackage.Extract(packageContentPath, Enumerable.Empty<string>());
-            string workloadManifestJsonPath = Directory.GetFiles(packageContentPath, "WorkloadManifest.json").FirstOrDefault();
-
-            if (string.IsNullOrWhiteSpace(workloadManifestJsonPath))
-            {
-                throw new FileNotFoundException($"Unable to locate WorkloadManifest.json under '{packageContentPath}'.");
-            }
-
-            WorkloadManifest manifest = WorkloadManifestReader.ReadWorkloadManifest(File.OpenRead(workloadManifestJsonPath));
-
-            List<TaskItem> swixProjects = new();
-            
-            foreach (WorkloadDefinition workloadDefinition in manifest.Workloads.Values)
-            {
-                VisualStudioComponent component = VisualStudioComponent.Create(manifest, workloadDefinition);
-                swixProjects.Add(component.Generate(Path.Combine(SourceDirectory, $"{workloadDefinition.Id}.{manifest.Version}.0")));
-            }
-
-            return swixProjects;
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs
new file mode 100644
index 00000000000..5d4a7c1aeed
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs
@@ -0,0 +1,311 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.NET.Sdk.WorkloadManifestReader;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads
+{
+    /// <summary>
+    /// MSBuild task for generating Visual Studio component projects representing
+    /// the workload definitions.
+    /// </summary>
+    public class GenerateVisualStudioWorkload : GenerateTaskBase
+    {
+        /// <summary>
+        /// An item group used to provide a customized title, description, and category for a specific workload ID in Visual Studio.
+        /// Workloads only define a description. Visual Studio defines a separate title (checkbox text) and description (checkbox tooltip).
+        /// </summary>
+        public ITaskItem[] ComponentResources
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The version of the component in the Visual Studio manifest. If no version is specified,
+        /// the manifest version is used.
+        /// </summary>
+        public ITaskItem[] ComponentVersions
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets whether MSIs for workload packs will be generated. When set to <see langword="false" />, only
+        /// Visual Studio component authoring files are generated.
+        /// </summary>
+        public bool GenerateMsis
+        {
+            get;
+            set;
+        } = true;
+
+        /// <summary>
+        /// Set of missing workload pack packages.
+        /// </summary>
+        [Output]
+        public ITaskItem[] MissingPacks
+        {
+            get;
+            set;
+        } = Array.Empty<ITaskItem>();
+
+        public string OutputPath
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The path where the workload-pack packages referenced by the workload manifests are located.
+        /// </summary>
+        public string PackagesPath
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// An item group containing information to shorten the names of packages.
+        /// </summary>
+        public ITaskItem[] ShortNames
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The workload manifest files to use for generating the Visual Studio components.
+        /// </summary>
+        public ITaskItem[] WorkloadManifests
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// A set of packages containing workload manifests.
+        /// </summary>
+        public ITaskItem[] WorkloadPackages
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Semicolon sepearate list of ICEs to suppress.
+        /// </summary>
+        public string SuppressIces
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Generate msis in parallel.
+        /// </summary>
+        public bool RunInParallel
+        {
+            get;
+            set;
+        } = true;
+
+        /// <summary>
+        /// The paths of the generated .swixproj files.
+        /// </summary>
+        [Output]
+        public ITaskItem[] SwixProjects
+        {
+            get;
+            set;
+        }
+
+        [Output]
+        public ITaskItem[] Msis
+        {
+            get;
+            set;
+        }
+
+        public override bool Execute()
+        {
+            try
+            {
+                if (WorkloadManifests != null)
+                {
+                    SwixProjects = GenerateSwixProjects(WorkloadManifests);
+                }
+                else if (WorkloadPackages != null)
+                {
+                    SwixProjects = GenerateSwixProjects(GetManifestsFromManifestPackages(WorkloadPackages));
+                }
+                else
+                {
+                    Log.LogError($"Either {nameof(WorkloadPackages)} or {nameof(WorkloadManifests)} item must be non-empty");
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                Log.LogMessage(MessageImportance.Low, e.StackTrace);
+                Log.LogErrorFromException(e);
+            }
+
+            return !Log.HasLoggedErrors;
+        }
+
+        ITaskItem[] GenerateSwixProjects(ITaskItem[] workloadManifests)
+        {
+            List<ITaskItem> swixProjects = new();
+
+            // Generate the MSIs first to see if we have missing packs so we can remove
+            // those dependencies from the components.
+            if (GenerateMsis)
+            {
+                Log?.LogMessage(MessageImportance.Low, "Generating MSIs...");
+                // Generate MSIs for workload packs and add their .swixproj files 
+                swixProjects.AddRange(GenerateMsisFromManifests(workloadManifests));
+            }
+
+            foreach (ITaskItem workloadManifest in workloadManifests)
+            {
+                swixProjects.AddRange(ProcessWorkloadManifestFile(workloadManifest.GetMetadata("FullPath")));
+            }
+
+            return swixProjects.ToArray();
+        }
+
+        internal IEnumerable<ITaskItem> GenerateMsisFromManifests(ITaskItem[] workloadManifests)
+        {
+            GenerateWorkloadMsis msiTask = new()
+            {
+                BuildEngine = this.BuildEngine,
+                GenerateSwixAuthoring = true,
+                IntermediateBaseOutputPath = this.IntermediateBaseOutputPath,
+                OutputPath = this.OutputPath,
+                PackagesPath = this.PackagesPath,
+                RunInParallel = this.RunInParallel,
+                ShortNames = this.ShortNames,
+                SuppressIces = this.SuppressIces,
+                WixToolsetPath = this.WixToolsetPath,
+                WorkloadManifests = workloadManifests
+            };
+
+            if (!msiTask.Execute())
+            {
+                Log?.LogError($"Failed to generate MSIs for workload packs.");
+                return Enumerable.Empty<ITaskItem>();
+            }
+            else
+            {
+                if (msiTask.MissingPacks != null)
+                {
+                    MissingPacks = msiTask.MissingPacks;
+
+                    foreach (ITaskItem item in MissingPacks)
+                    {
+                        Log?.LogMessage(MessageImportance.High, $"Unable to locate '{item.GetMetadata(Metadata.SourcePackage)}'. Short name: {item.GetMetadata(Metadata.ShortName)}, Platform: {item.GetMetadata(Metadata.Platform)}, Workload Pack: ({item.ItemSpec}).");
+                    }
+                }
+
+                Msis = msiTask.Msis;
+
+                // The Msis output parameter also contains the .swixproj files, but for VS, we want all the project files for
+                // packages and components.
+                return msiTask.Msis.Where(m => !string.IsNullOrWhiteSpace(m.GetMetadata(Metadata.SwixProject))).
+                    Select(m => new TaskItem(m.GetMetadata(Metadata.SwixProject)));
+            }
+        }
+
+        internal IEnumerable<ITaskItem> ProcessWorkloadManifestFile(string workloadManifestJsonPath)
+        {
+            WorkloadManifest manifest = WorkloadManifestReader.ReadWorkloadManifest(Path.GetFileNameWithoutExtension(workloadManifestJsonPath), File.OpenRead(workloadManifestJsonPath));
+
+            List<TaskItem> swixProjects = new();
+
+            foreach (WorkloadDefinition workloadDefinition in manifest.Workloads.Values)
+            {
+                if ((workloadDefinition.Platforms?.Count > 0) && (!workloadDefinition.Platforms.Any(p => p.StartsWith("win"))))
+                {
+                    Log?.LogMessage(MessageImportance.High, $"{workloadDefinition.Id} platforms does not support Windows and will be skipped ({string.Join(", ", workloadDefinition.Platforms)}).");
+                    continue;
+                }
+
+                // Each workload maps to a Visual Studio component.
+                VisualStudioComponent component = VisualStudioComponent.Create(Log, manifest, workloadDefinition,
+                    ComponentVersions, ShortNames, ComponentResources, MissingPacks);
+
+                // If there are no dependencies, regardless of whether we are generating MSIs, we'll report an
+                // error as we'd produce invalid SWIX.
+                if (!component.HasDependencies)
+                {
+                    Log?.LogError($"Visual Studio components '{component.Name}' must have at least one dependency.");
+                }
+
+                string vsPayloadRelativePath = $"{component.Name},version={component.Version}\\_package.json";
+                CheckRelativePayloadPath(vsPayloadRelativePath);
+
+                swixProjects.Add(component.Generate(Path.Combine(SourceDirectory, $"{workloadDefinition.Id}.{manifest.Version}.0")));
+            }
+
+            return swixProjects;
+        }
+
+        /// <summary>
+        /// Extracts the workload manifest from the manifest package and generate a SWIX project for a Visual Studio component
+        /// matching the manifests dependencies.  
+        /// </summary>
+        /// <param name="workloadManifestPackage">The path of the workload package containing the manifest.</param>
+        /// <returns>A set of items containing the generated SWIX projects.</returns>
+        internal IEnumerable<ITaskItem> ProcessWorkloadManifestPackage(string workloadManifestPackage)
+        {
+            NugetPackage workloadPackage = new(workloadManifestPackage, Log);
+            string packageContentPath = Path.Combine(PackageDirectory, $"{workloadPackage.Identity}");
+            workloadPackage.Extract(packageContentPath, Enumerable.Empty<string>());
+
+            return ProcessWorkloadManifestFile(GetWorkloadManifestJsonPath(packageContentPath));
+        }
+
+        internal ITaskItem[] GetManifestsFromManifestPackages(ITaskItem[] workloadPackages)
+        {
+            List<TaskItem> manifests = new();
+
+            foreach (ITaskItem item in workloadPackages)
+            {
+                NugetPackage workloadPackage = new(item.GetMetadata("FullPath"), Log);
+                string packageContentPath = Path.Combine(PackageDirectory, $"{workloadPackage.Identity}");
+                workloadPackage.Extract(packageContentPath, Enumerable.Empty<string>());
+                string workloadManifestJsonPath = GetWorkloadManifestJsonPath(packageContentPath);
+                Log?.LogMessage(MessageImportance.Low, $"Adding manifest: {workloadManifestJsonPath}");
+
+                manifests.Add(new TaskItem(workloadManifestJsonPath));
+            }
+
+            return manifests.ToArray();
+        }
+
+        internal string GetWorkloadManifestJsonPath(string packageContentPath)
+        {
+            string dataDirectory = Path.Combine(packageContentPath, "data");
+
+            // Check the data directory first, otherwise fall back to the older format where manifests were in the root of the package.
+            string workloadManifestJsonPath = Directory.Exists(dataDirectory) ?
+                Directory.GetFiles(dataDirectory, "WorkloadManifest.json").FirstOrDefault() :
+                Directory.GetFiles(packageContentPath, "WorkloadManifest.json").FirstOrDefault();
+
+            if (string.IsNullOrWhiteSpace(workloadManifestJsonPath))
+            {
+                throw new FileNotFoundException($"Unable to locate WorkloadManifest.json under '{packageContentPath}'.");
+            }
+
+            return workloadManifestJsonPath;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs
deleted file mode 100644
index 563a8bb9be3..00000000000
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.NET.Sdk.WorkloadManifestReader;
-
-namespace Microsoft.DotNet.Build.Tasks.Workloads
-{
-    /// <summary>
-    /// MSBuild task to generate a set of MSIs from a set of workload manifests.
-    /// </summary>
-    public class GenerateWorkloadMsis : GenerateMsiBase
-    {
-        /// <summary>
-        /// The workload manifests files to process.
-        /// </summary>
-        [Required]
-        public ITaskItem[] WorkloadManifests
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// The path where the packages referenced by the manifest files are located.
-        /// </summary>
-        public string PackagesPath
-        {
-            get;
-            set;
-        }
-
-        public override bool Execute()
-        {
-            try
-            {
-                List<ITaskItem> msis = new();
-
-                if (string.IsNullOrWhiteSpace(PackagesPath))
-                {
-                    Log.LogError($"{nameof(PackagesPath)} parameter cannot be null or empty.");
-                    return false;
-                }
-
-                foreach (WorkloadPack pack in GetWorkloadPacks())
-                {
-                    Log.LogMessage($"Processing workload pack: {pack.Id}, Version: {pack.Version}");
-
-                    foreach ((string sourcePackage, string[] platforms) in GetSourcePackages(pack))
-                    {
-                        // Always select the pack ID for the VS MSI package.
-                        msis.AddRange(Generate(sourcePackage, $"{pack.Id}", OutputPath, GetInstallDir(pack.Kind), platforms));
-                    }
-                }
-
-                Msis = msis.ToArray();
-            }
-            catch (Exception e)
-            {
-                Log.LogMessage(MessageImportance.Low, e.StackTrace);
-                Log.LogErrorFromException(e);
-            }
-
-            return !Log.HasLoggedErrors;
-        }
-
-        private IEnumerable<WorkloadPack> GetWorkloadPacks()
-        {
-            // We need to track duplicate packs so we only generate MSIs once. We'll key off the pack ID and version.
-            IEnumerable<WorkloadManifest> manifests = WorkloadManifests.Select(
-                w => WorkloadManifestReader.ReadWorkloadManifest(File.OpenRead(w.ItemSpec)));
-
-            return manifests.SelectMany(m => m.Packs.Values).GroupBy(x => new { x.Id, x.Version }).
-                Select(g => g.First());
-        }
-
-        private IEnumerable<(string, string[])> GetSourcePackages(WorkloadPack pack)
-        {
-            if (pack.IsAlias)
-            {
-                foreach (string rid in pack.AliasTo.Keys)
-                {
-                    string sourcePackage = Path.Combine(PackagesPath, $"{pack.AliasTo[rid]}.{pack.Version}.nupkg");
-
-                    switch (rid)
-                    {
-                        case "win7":
-                        case "win10":
-                        case "win":
-                        case "any":
-                            yield return (sourcePackage, SupportedPlatforms);
-                            break;
-                        case "win-x64":
-                            yield return (sourcePackage, new[] { "x64" });
-                            break;
-                        case "win-x86":
-                            yield return (sourcePackage, new[] { "x86" });
-                            break;
-                        case "win-arm64":
-                            yield return (sourcePackage, new[] { "arm64" });
-                            break;
-                        default:
-                            Log?.LogMessage($"Skipping alias ({rid}).");
-                            break;
-                    }
-                }
-            }
-            else
-            {
-                // For non-RID specific packs we'll produce MSIs for each supported platform.
-                yield return (Path.Combine(PackagesPath, $"{pack.Id}.{pack.Version}.nupkg"), SupportedPlatforms);
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs
new file mode 100644
index 00000000000..aa19a03b95f
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs
@@ -0,0 +1,210 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.NET.Sdk.WorkloadManifestReader;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads
+{
+    /// <summary>
+    /// MSBuild task to generate a set of MSIs from a set of workload manifests.
+    /// </summary>
+    public class GenerateWorkloadMsis : GenerateMsiBase
+    {
+        /// <summary>
+        /// The workload manifests files to process.
+        /// </summary>
+        [Required]
+        public ITaskItem[] WorkloadManifests
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The path where the workload-pack packages referenced by the manifest files are located.
+        /// </summary>
+        public string PackagesPath
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Generate msis in parallel.
+        /// </summary>
+        public bool RunInParallel
+        {
+            get;
+            set;
+        } = true;
+
+        /// <summary>
+        /// Gets the set of missing workload packs.
+        /// </summary>
+        [Output]
+        public ITaskItem[] MissingPacks
+        {
+            get;
+            set;
+        }
+
+        public override bool Execute()
+        {
+            try
+            {
+                List<ITaskItem> msis = new();
+                List<ITaskItem> missingPacks = new();
+
+                if (string.IsNullOrWhiteSpace(PackagesPath))
+                {
+                    Log.LogError($"{nameof(PackagesPath)} parameter cannot be null or empty.");
+                    return false;
+                }
+
+                // Each pack maps to multiple packs and different MSI packages. We consider a pack
+                // to be missing when none of its dependent MSIs were found/generated.
+                IEnumerable<WorkloadPack> workloadPacks = GetWorkloadPacks(WorkloadManifests);
+
+                List<string> missingPackIds = new(workloadPacks.Select(p => $"{p.Id}"));
+
+                List<(string sourcePackage, string swixPackageId, string outputPath, WorkloadPackKind kind, string[] platforms)> packsToGenerate = new();
+
+                foreach (WorkloadPack pack in workloadPacks)
+                {
+                    Log.LogMessage($"Processing workload pack: {pack.Id}, Version: {pack.Version}");
+
+                    foreach ((string sourcePackage, string[] platforms) in GetSourcePackages(pack))
+                    {
+                        if (!File.Exists(sourcePackage))
+                        {
+                            Log?.LogMessage(MessageImportance.High, $"Workload pack package does not exist: {sourcePackage}");
+
+                            missingPacks.Add(new TaskItem($"{pack.Id}", new Dictionary<string, string>
+                            {
+                                { Metadata.SourcePackage, sourcePackage },
+                                { Metadata.Platform, string.Join(",", platforms) },
+                                { Metadata.ShortName, $"{pack.Id.ToString().Replace(ShortNames)}" }
+                            }));
+
+                            continue;
+                        }
+
+                        // Swix package is always versioned to support upgrading SxS installs. The pack alias will be
+                        // used for individual MSIs
+                        string swixPackageId = $"{pack.Id.ToString().Replace(ShortNames)}.{pack.Version}";
+
+                        // Always select the pack ID for the VS MSI package, even when aliased.
+                        packsToGenerate.Add(new(sourcePackage, swixPackageId, OutputPath, pack.Kind, platforms));
+                    }
+                }
+
+                if (RunInParallel)
+                {
+                    System.Threading.Tasks.Parallel.ForEach(packsToGenerate, p =>
+                    {
+                        msis.AddRange(Generate(p.sourcePackage, p.swixPackageId, p.outputPath, p.kind, p.platforms));
+                    });
+                }
+                else
+                {
+                    foreach (var p in packsToGenerate)
+                    {
+                        msis.AddRange(Generate(p.sourcePackage, p.swixPackageId, p.outputPath, p.kind, p.platforms));
+                    }
+                }
+
+                Msis = msis.ToArray();
+                MissingPacks = missingPacks.ToArray();
+            }
+            catch (Exception e)
+            {
+                Log.LogMessage(MessageImportance.Low, e.StackTrace);
+                Log.LogErrorFromException(e);
+            }
+
+            return !Log.HasLoggedErrors;
+        }
+
+        internal static IEnumerable<WorkloadPack> GetWorkloadPacks(ITaskItem[] workloadManifestItems)
+        {
+            // We need to track duplicate packs (same ID and version) so we only build MSIs once when processing
+            // multiple manifests. We'll manually deduplicate the packs
+            // since WorkloadPack doesn't provide an override for GetHashCode/Equals.
+            Dictionary<string, WorkloadPack> packs = new();
+
+            foreach (ITaskItem item in workloadManifestItems)
+            {
+                var workloadManifest = WorkloadManifestReader.ReadWorkloadManifest(
+                    Path.GetFileNameWithoutExtension(item.ItemSpec), File.OpenRead(item.ItemSpec));
+
+                foreach (var workload in workloadManifest.Workloads.Values)
+                {
+                    if ((workload is WorkloadDefinition wd) && (wd.Platforms == null || wd.Platforms.Any(p => p.StartsWith("win"))) && (wd.Packs != null))
+                    {
+                        foreach (var packId in wd.Packs)
+                        {
+                            var pack = workloadManifest.Packs[packId];
+                            string key = $"{pack.Id},{pack.Version}";
+
+                            if (!packs.ContainsKey(key))
+                            {
+                                packs[key] = pack;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return packs.Values;
+        }
+
+        /// <summary>
+        /// Gets the packages associated with a specific workload pack.
+        /// </summary>
+        /// <param name="pack"></param>
+        /// <returns>An enumerable of tuples. Each tuple contains the full path of the NuGet package and the target platforms.</returns>
+        internal IEnumerable<(string, string[])> GetSourcePackages(WorkloadPack pack)
+        {
+            if (pack.IsAlias)
+            {
+                foreach (string rid in pack.AliasTo.Keys)
+                {
+                    string sourcePackage = Path.Combine(PackagesPath, $"{pack.AliasTo[rid]}.{pack.Version}.nupkg");
+
+                    switch (rid)
+                    {
+                        case "win7":
+                        case "win10":
+                        case "win":
+                        case "any":
+                            yield return (sourcePackage, SupportedPlatforms);
+                            break;
+                        case "win-x64":
+                            yield return (sourcePackage, new[] { "x64" });
+                            break;
+                        case "win-x86":
+                            yield return (sourcePackage, new[] { "x86" });
+                            break;
+                        case "win-arm64":
+                            yield return (sourcePackage, new[] { "arm64" });
+                            break;
+                        default:
+                            Log?.LogMessage($"Skipping alias ({rid}).");
+                            continue;
+                    }
+                }
+            }
+            else
+            {
+                // For non-RID specific packs we'll produce MSIs for each supported platform.
+                yield return (Path.Combine(PackagesPath, $"{pack.Id}.{pack.Version}.nupkg"), SupportedPlatforms);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GetWorkloadPackPackageReferences.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GetWorkloadPackPackageReferences.cs
new file mode 100644
index 00000000000..7af8eba77db
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GetWorkloadPackPackageReferences.cs
@@ -0,0 +1,142 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Xml;
+using System.IO;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.NET.Sdk.WorkloadManifestReader;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads
+{
+    public class GetWorkloadPackPackageReferences : Microsoft.Build.Utilities.Task
+    {
+        public string ProjectFile
+        {
+            get;
+            set;
+        }
+
+        public ITaskItem[] ExcludedPackIds
+        {
+            get;
+            set;
+        }
+
+        public string PackageSource
+        {
+            get;
+            set;
+        }
+
+        [Required]
+        public ITaskItem[] ManifestFiles
+        {
+            get;
+            set;
+        }
+
+        public override bool Execute()
+        {
+            try
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(ProjectFile));
+
+                List<string> packs = new();
+
+                var excludedPackIds = ExcludedPackIds.Select(i => i.ItemSpec);
+
+                XmlWriterSettings settings = new XmlWriterSettings
+                {
+                    Indent = true,
+                    IndentChars = "  "
+                };
+
+                XmlWriter writer = XmlWriter.Create(ProjectFile, settings);
+
+                writer.WriteStartElement("Project");
+                writer.WriteAttributeString("Sdk", "Microsoft.NET.Sdk");
+
+                writer.WriteStartElement("PropertyGroup");
+                writer.WriteElementString("TargetFramework", "net6.0");
+                writer.WriteElementString("IncludeBuildOutput", "false");
+                writer.WriteEndElement();
+
+                writer.WriteStartElement("ItemGroup");
+
+                foreach (var manifestFile in ManifestFiles)
+                {
+                    WorkloadManifest manifest = WorkloadManifestReader.ReadWorkloadManifest(Path.GetFileNameWithoutExtension(manifestFile.ItemSpec),
+                        File.OpenRead(manifestFile.ItemSpec));
+
+                    foreach (var pack in manifest.Packs.Values)
+                    {
+                        if (pack.IsAlias)
+                        {
+                            foreach (var alias in pack.AliasTo.Keys.Where(k => k.StartsWith("win")))
+                            {
+                                if (!excludedPackIds.Contains($"{pack.AliasTo[alias]}"))
+                                {
+                                    WriteItem(writer, "PackageDownload", ("Include", $"{pack.AliasTo[alias]}"), ("Version", $"[{pack.Version}]"));
+                                    packs.Add($"$(NuGetPackageRoot){pack.AliasTo[alias]}\\{pack.Version}\\*.nupkg");
+                                }
+                            }
+                        }
+                        else if (!excludedPackIds.Contains($"{pack.Id}"))
+                        {
+                            WriteItem(writer, "PackageDownload", ("Include", $"{pack.Id}"), ("Version", $"[{pack.Version}]"));
+                            packs.Add($"$(NuGetPackageRoot){pack.Id}\\{pack.Version}\\*.nupkg");
+                        }
+                    }
+                }
+
+                writer.WriteEndElement();
+
+                writer.WriteStartElement("Target");
+                writer.WriteAttributeString("Name", "CopyPacks");
+                writer.WriteAttributeString("AfterTargets", "Build");
+
+                writer.WriteStartElement("ItemGroup");
+
+                foreach (var pack in packs)
+                {
+                    WriteItem(writer, "Pack", ("Include", pack));
+                }                
+
+                writer.WriteEndElement();
+
+                writer.WriteStartElement("Copy");
+                writer.WriteAttributeString("SourceFiles", "@(Pack)");
+                writer.WriteAttributeString("DestinationFolder", $"{PackageSource}");
+                writer.WriteEndElement();
+
+                writer.WriteEndElement();
+
+                writer.WriteEndElement();
+                writer.Flush();
+                writer.Close();
+            }
+            catch (Exception e)
+            {
+                Log.LogErrorFromException(e);
+            }
+
+            return !Log.HasLoggedErrors;
+        }
+
+        private void WriteItem(XmlWriter writer, string itemName, params (string name, string value)[] metadata)
+        {
+            writer.WriteStartElement(itemName);
+
+            foreach (var m in metadata)
+            {
+                writer.WriteAttributeString(m.name, m.value);
+            }
+
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Metadata.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Metadata.cs
new file mode 100644
index 00000000000..2c5e220fcce
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Metadata.cs
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads
+{
+    internal class Metadata
+    {
+        public const string AliasTo = "AliasTo";
+        public const string Category = "Category";
+        public const string Description = "Description";
+        public const string JsonProperties = "JsonProperties";
+        public const string Platform = "Platform";
+        public const string Replacement = "Replacement";
+        public const string PackageProject = "PackageProject";
+        public const string ShortName = "ShortName";
+        public const string SourcePackage = "SourcePackage";
+        public const string SwixProject = "SwixProject";
+        public const string Title = "Title";
+        public const string Version = "Version";
+        public const string WixObj = "WixObj";
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
index 367c432da07..4626ab44c0b 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
@@ -1,7 +1,8 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>Latest</LangVersion>
     <IsPackable>true</IsPackable>
@@ -11,6 +12,16 @@
     <NoWarn>$(NoWarn);NU5127</NoWarn>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
     <RootNamespace>Microsoft.DotNet.Build.Tasks.Workloads</RootNamespace>
+
+    <!--
+      Only include WiX-powered features when running a non-from-source build. (For example, the
+      Microsoft build used to build .NET for Windows.)
+
+      This removes a dependency on prebuilt WiX binaries. The purpose of WiX is to produce Windows
+      installers, and source-build doesn't run on Windows, so excluding WiX while building in
+      source-build mode to remove the prebuilt dependency has no impact to available .NET features.
+    -->
+    <IncludeWiX Condition="'$(DotNetBuildFromSource)' != 'true'">true</IncludeWiX>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,11 +30,16 @@
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
     <PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />
-    <PackageReference Include="Wix" Version="3.11.2" />
     <PackageReference Include="Microsoft.NET.Sdk.WorkloadManifestReader" Version="$(MicrosoftNetSdkWorkloadManifestReaderVersion)" />
+    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" Condition="'$(TargetFramework)' == 'net472'" />
+    <PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(IncludeWiX)' == 'true'">
+    <PackageReference Include="Wix" Version="3.11.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IncludeWiX)' == 'true'">
     <Reference Include="$(WixInstallPath)\Microsoft.Deployment.Resources.dll" />
     <Reference Include="$(WixInstallPath)\Microsoft.Deployment.Compression.dll" />
     <Reference Include="$(WixInstallPath)\Microsoft.Deployment.Compression.Cab.dll" />
@@ -32,7 +48,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="Microsoft.DotNet.Build.Tasks.Workloads" />
+    <InternalsVisibleTo Include="Microsoft.DotNet.Build.Tasks.Workloads.Tests" />
   </ItemGroup>
 
   <ItemGroup>
@@ -46,9 +62,15 @@
     <EmbeddedResource Remove="obj\**" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(IncludeWiX)' != 'true'">
+    <Compile Remove="**\*.wix.cs" />
+  </ItemGroup>
+
   <ItemGroup>
+    <EmbeddedResource Include="Misc\*.*" />
     <EmbeddedResource Include="MsiTemplate\*.wxs" />
     <EmbeddedResource Include="MsiTemplate\*.wxi" />
+    <EmbeddedResource Include="..\..\Common\wix\dotnethome_x64.wxs" Link="MsiTemplate\dotnethome_x64.wxs" />
     <EmbeddedResource Include="SwixTemplate\*.swr" />
     <EmbeddedResource Include="SwixTemplate\*.swixproj" />
     <EmbeddedResource Include="SwixTemplate\*.vsmanproj" />
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/Icon.png b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/Icon.png
new file mode 100644
index 00000000000..a0f1fdbf4d5
Binary files /dev/null and b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/Icon.png differ
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/LICENSE.TXT b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/LICENSE.TXT
new file mode 100644
index 00000000000..984713a4962
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/LICENSE.TXT
@@ -0,0 +1,23 @@
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs
new file mode 100644
index 00000000000..7c8376c69a0
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs
@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads
+{
+    public class MsiProperties
+    {
+        public long InstallSize
+        {
+            get;
+            set;
+        }
+
+        public int Language
+        {
+            get;
+            set;
+        }
+
+        public string Payload
+        {
+            get;
+            set;
+        }
+
+        public string ProductCode
+        {
+            get;
+            set;
+        }
+
+        public string ProductVersion
+        {
+            get;
+            set;
+        }
+
+        public string ProviderKeyName
+        {
+            get;
+            set;
+        }
+
+        public string UpgradeCode
+        {
+            get;
+            set;
+        }
+
+        public IEnumerable<RelatedProduct> RelatedProducts
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Directories.wxs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Directories.wxs
index e3bc884ceee..e40ac5bb203 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Directories.wxs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Directories.wxs
@@ -7,12 +7,18 @@
       <Directory Id="$(var.ProgramFilesFolder)">
         <Directory Id="DOTNETHOME" Name="dotnet">
           <Directory Id="InstallDir" Name="$(var.InstallDir)">
+            <?if $(var.PackKind) != "library" and $(var.PackKind) != "template"?>
             <Directory Id="PackageDir" Name="$(var.PackageId)">
               <Directory Id="VersionDir" Name="$(var.PackageVersion)" />
             </Directory>
-          </Directory>                     
+            <?endif?>
+          </Directory>
         </Directory>
       </Directory>
     </Directory>
+
+    <?if $(var.Platform)~=x64?>
+    <CustomActionRef Id="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" />
+    <?endif?>
   </Fragment>
 </Wix>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/ManifestProduct.wxs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/ManifestProduct.wxs
new file mode 100644
index 00000000000..4537bf65bcb
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/ManifestProduct.wxs
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include Variables.wxi?>
+  <Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)"
+           Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+
+    <Package InstallerVersion="$(var.InstallerVersion)" Compressed="yes" InstallScope="perMachine" />
+
+    <!-- MajorUpgrade element doesn't support setting the language attribute in the upgrade table -->
+    <Upgrade Id="$(var.UpgradeCode)">
+      <UpgradeVersion Maximum="$(var.ProductVersion)" MigrateFeatures="yes" IncludeMinimum="no" Property="WIX_UPGRADE_DETECTED" />
+      <UpgradeVersion Minimum="$(var.ProductVersion)" IncludeMinimum="no" OnlyDetect="yes" Property="WIX_DOWNGRADE_DETECTED" />
+    </Upgrade>
+
+    <!-- The new MSI is installed before the older version is removed. This is the fastest upgrade option. -->
+    <InstallExecuteSequence>
+      <!-- See https://docs.microsoft.com/en-us/windows/win32/msi/removeexistingproducts-action for other options -->
+      <RemoveExistingProducts After="InstallFinalize" />
+    </InstallExecuteSequence>
+
+    <Condition Message="A newer version of [ProductName] is alread installed.">
+      NOT WIX_DOWNGRADE_DETECTED
+    </Condition>
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="$(var.ProgramFilesFolder)">
+        <Directory Id="DOTNETHOME" Name="dotnet">
+          <Directory Id="ManifestDir" Name="sdk-manifests">
+            <Directory Id="VersionDir" Name="$(var.SdkFeatureBandVersion)">
+              <Directory Id="ManifestIdDir" Name="$(var.ManifestId)" />
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <?if $(var.Platform)~=x64?>
+    <CustomActionRef Id="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" />
+    <?endif?>
+
+    <MediaTemplate CompressionLevel="high" EmbedCab="yes" />
+
+    <!-- Record the original package used to generate the MSI -->
+    <Property Id="PackageId" Value="$(var.PackageId)" />
+    <Property Id="PackageVersion" Value="$(var.PackageVersion)" />
+
+    <Feature Id="F_PackageContent">
+      <ComponentGroupRef Id="CG_PackageContent"/>
+    </Feature>
+
+    <FeatureRef Id="F_DependencyProvider" />
+
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.EulaRtf)" />
+    <UIRef Id="WixUI_Minimal"/>
+  </Product>
+</Wix>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Product.wxs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Product.wxs
index 3ee2a5a7762..6f628f7797b 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Product.wxs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Product.wxs
@@ -2,7 +2,7 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?include Variables.wxi?>
-  <Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)"
+  <Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)"
            Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
 
     <Package InstallerVersion="$(var.InstallerVersion)" Compressed="yes" InstallScope="perMachine" />
@@ -20,7 +20,7 @@
     <FeatureRef Id="F_DependencyProvider" />
     <FeatureRef Id="F_RegistryKeys" />
 
-    <!--<WixVariable Id="WixUILicenseRtf" Value="eula.rtf" />-->
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.EulaRtf)" />
     <UIRef Id="WixUI_Minimal"/>
   </Product>
 </Wix>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Registry.wxs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Registry.wxs
index fce56ea6036..8a206723b47 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Registry.wxs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Registry.wxs
@@ -5,12 +5,14 @@
   <Fragment>
     <Feature Id="F_RegistryKeys" Absent="disallow" AllowAdvertise="no" Description="Registry keys."
              Display="hidden" InstallDefault="local" Level="1" Title="Workload Pack Registration" TypicalDefault="install">
-      <Component Id="C_DependencyProviderRef" Win64="no" Directory="TARGETDIR">
-        <RegistryValue Id="RV_DependencyProviderRef" Root="HKLM" KeyPath="yes"
-                       Key="SOFTWARE\Microsoft\dotnet\InstalledPacks\$(var.PackageId)\$(var.PackageVersion)"
-                       Name="DependencyProviderKey"
-                       Type="string"
-                       Value="$(var.DependencyProviderKeyName)"/>
+      <Component Id="C_InstalledPack" Win64="$(var.Win64)" Directory="TARGETDIR">
+        <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\dotnet\InstalledPacks\$(var.Platform)\$(var.PackageId)\$(var.PackageVersion)">
+          <RegistryValue Name="DependencyProviderKey" Type="string" Value="$(var.DependencyProviderKeyName)" KeyPath="yes"/>
+          <RegistryValue Name="ProductCode" Type="string" Value="$(var.ProductCode)"/>
+          <RegistryValue Name="UpgradeCode" Type="string" Value="$(var.UpgradeCode)"/>
+          <RegistryValue Name="ProductVersion" Type="string" Value="$(var.ProductVersion)" />
+          <RegistryValue Name="ProductLanguage" Type="integer" Value="$(var.ProductLanguage)" />
+        </RegistryKey>
       </Component>
     </Feature>
   </Fragment>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Variables.wxi b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Variables.wxi
index 33388df5a58..0e1b15b5322 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Variables.wxi
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Variables.wxi
@@ -4,15 +4,25 @@
   <?if $(var.Platform)=x86?>
   <?define ProgramFilesFolder=ProgramFilesFolder?>
   <?define InstallerVersion="200"?>
+  <?define Win64=no?>
   <?elseif $(var.Platform)=x64?>
   <?define ProgramFilesFolder=ProgramFiles64Folder?>
   <?define InstallerVersion="200"?>
+  <?define Win64=yes?>
   <?elseif $(var.Platform)=arm64?>
   <?define ProgramFilesFolder=ProgramFiles64Folder?>
   <?define InstallerVersion="500"?>
+  <?define Win64=yes?>
   <?else?>
   <?error Unknown platform: $(var.Platform)?>
   <?endif?>
   
+  <?ifndef ProductLanguage?>
+  <?define ProductLanguage=1033?>
+  <?endif?>
+  
+  <!-- Default dependency provider key for packs. -->
+  <?ifndef DependencyProviderKeyName?>
   <?define DependencyProviderKeyName=$(var.PackageId),$(var.PackageVersion),$(var.Platform)?>
+  <?endif?>
 </Include>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs
similarity index 53%
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs
index 3b017d199c6..6ca695ff84f 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs
@@ -4,10 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Deployment.WindowsInstaller.Package;
 using Microsoft.Deployment.WindowsInstaller;
+using Microsoft.Deployment.WindowsInstaller.Package;
 
 namespace Microsoft.DotNet.Build.Tasks.Workloads
 {
@@ -15,12 +13,14 @@ public class MsiUtils
     {
         private const string _getFilesQuery = "SELECT `File`, `Component_`, `FileName`, `FileSize`, `Version`, `Language`, `Attributes`, `Sequence` FROM `File`";
 
+        private const string _getUpgradeQuery = "SELECT `UpgradeCode`, `VersionMin`, `VersionMax`, `Language`, `Attributes` FROM `Upgrade`";
+
         public static IEnumerable<FileRow> GetAllFiles(string packagePath)
         {
-            using InstallPackage ip = new InstallPackage(packagePath, DatabaseOpenMode.ReadOnly);
-            using Database db = new Database(packagePath, DatabaseOpenMode.ReadOnly);
+            using InstallPackage ip = new(packagePath, DatabaseOpenMode.ReadOnly);
+            using Database db = new(packagePath, DatabaseOpenMode.ReadOnly);
             using View fileView = db.OpenView(_getFilesQuery);
-            List<FileRow> files = new List<FileRow>();
+            List<FileRow> files = new();
             fileView.Execute();
 
             foreach (Record file in fileView)
@@ -31,12 +31,40 @@ public static IEnumerable<FileRow> GetAllFiles(string packagePath)
             return files;
         }
 
+        public static IEnumerable<RelatedProduct> GetRelatedProducts(string packagePath)
+        {
+            using InstallPackage ip = new(packagePath, DatabaseOpenMode.ReadOnly);
+            using Database db = new(packagePath, DatabaseOpenMode.ReadOnly);
+
+            if (db.Tables.Contains("Upgrade"))
+            {
+                using View upgradeView = db.OpenView(_getUpgradeQuery);
+                List<RelatedProduct> relatedProducts = new();
+                upgradeView.Execute();
+
+                foreach (Record relatedProduct in upgradeView)
+                {
+                    relatedProducts.Add(RelatedProduct.Create(relatedProduct));
+                }
+
+                return relatedProducts;
+            }
+
+            return Enumerable.Empty<RelatedProduct>();
+        }
+
+        /// <summary>
+        /// Extracts the specified property from the MSI's Property table.
+        /// </summary>
+        /// <param name="packagePath">The path to the MSI package.</param>
+        /// <param name="property">The name of the property to extract.</param>
+        /// <returns>The value of the property.</returns>
         public static string GetProperty(string packagePath, string property)
         {
-            using InstallPackage ip = new InstallPackage(packagePath, DatabaseOpenMode.ReadOnly);
+            using InstallPackage ip = new(packagePath, DatabaseOpenMode.ReadOnly);
             return ip.Property[property];
-            
         }
+
         /// <summary>
         /// Calculate the number of bytes a Windows Installer Package would consume on disk. The function assumes that all files will be installed.
         /// </summary>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/NuGetPackage.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/NuGetPackage.cs
index 9a31a2afd26..20f4c8ba06a 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/NuGetPackage.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/NuGetPackage.cs
@@ -1,17 +1,16 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.IO;
-using System.Text.RegularExpressions;
 using System.IO.Compression;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
 using NuGet.Packaging;
 using NuGet.Packaging.Core;
 using NuGet.Versioning;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
 
 namespace Microsoft.DotNet.Build.Tasks.Workloads
 {
@@ -28,6 +27,16 @@ public string Authors
             get;
         }
 
+        public string Copyright
+        {
+            get;
+        }
+
+        public string Description
+        {
+            get;
+        }
+
         /// <summary>
         /// The NuGet package identifier.
         /// </summary>
@@ -41,6 +50,16 @@ public PackageIdentity Identity
             get;
         }
 
+        public LicenseMetadata LicenseData
+        {
+            get;
+        }
+
+        public string LicenseUrl
+        {
+            get;
+        }
+
         public string PackagePath
         {
             get;
@@ -53,6 +72,11 @@ public string Title
             get;
         }
 
+        public string ProjectUrl
+        {
+            get;
+        }
+
         /// <summary>
         /// The version of the NuGet package.
         /// </summary>
@@ -73,6 +97,11 @@ public NugetPackage(string packagePath, TaskLoggingHelper log)
             Identity = nuspecReader.GetIdentity();
             Title = nuspecReader.GetTitle();
             Authors = nuspecReader.GetAuthors();
+            LicenseUrl = nuspecReader.GetLicenseUrl();
+            Description = nuspecReader.GetDescription();
+            Copyright = nuspecReader.GetCopyright();
+            LicenseData = nuspecReader.GetLicenseMetadata();
+            ProjectUrl = nuspecReader.GetProjectUrl();
         }
 
         /// <summary>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs
new file mode 100644
index 00000000000..4eb3a09ba1f
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs
@@ -0,0 +1,57 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Microsoft.Deployment.WindowsInstaller;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads
+{
+    // Represents a single row from the MSI Upgrade table.
+    public class RelatedProduct
+    {
+        public string UpgradeCode
+        {
+            get;
+            set;
+        }
+       
+        public string VersionMin
+        {
+            get;
+            set;
+        }
+
+        public string VersionMax
+        {
+            get;
+            set;
+        }
+
+        public string Language
+        {
+            get;
+            set;
+        }
+
+        public int Attributes
+        {
+            get; 
+            set;
+        }
+
+        public static RelatedProduct Create(Record record)
+        {
+            string versionMin = (string)record["VersionMin"];
+            string versionMax = (string)record["VersionMax"];
+
+            return new RelatedProduct
+            {
+                UpgradeCode = (string)record["UpgradeCode"],
+                VersionMin = string.IsNullOrWhiteSpace(versionMin) ? null : versionMin,
+                VersionMax = string.IsNullOrWhiteSpace(versionMax) ? null : versionMax,
+                Language = (string)record["Language"],
+                Attributes = (int)record["Attributes"]
+            };
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/StringExtensions.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/StringExtensions.cs
new file mode 100644
index 00000000000..a48d04655bb
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/StringExtensions.cs
@@ -0,0 +1,46 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.Build.Tasks;
+
+namespace Microsoft.DotNet.Build.Tasks.Workloads
+{
+    public static class StringExtensions
+    {
+        public static string TrimStart(this string str, string trimString)
+        {
+            return str.StartsWith(trimString) ? str.Remove(0, trimString.Length) : str;
+        }
+
+        public static string TrimStart(this string str, string trimString, StringComparison comparisonType)
+        {
+            return str.StartsWith(trimString, comparisonType) ? str.Remove(0, trimString.Length) : str;
+        }
+
+        /// <summary>
+        /// Replace multiple substrings using task items.
+        /// </summary>
+        /// <param name="str"></param>
+        /// <param name="replacementStrings">An array of task items containing substrings and replacement strings.</param>
+        /// <returns></returns>
+        public static string Replace(this string str, ITaskItem[] replacementStrings)
+        {
+            if ((replacementStrings is not null) && (replacementStrings.Length > 0))
+            {
+                foreach (ITaskItem item in replacementStrings)
+                {
+                    str = str.Replace(item.ItemSpec, item.GetMetadata(Metadata.Replacement));
+                }
+            }
+
+            return str;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/component.swixproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/component.swixproj
index df5c7962909..1408da52e9b 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/component.swixproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/component.swixproj
@@ -5,13 +5,10 @@
     <OutputLocalized>false</OutputLocalized>
     <OutputType>manifest</OutputType>
     <OutputPath>$(ManifestOutputPath)</OutputPath>
-    
-    <!-- Default to no, making this a component group. -->
-    <IsUIGroup Condition="'$(IsUIGroup)'==''">no</IsUIGroup>
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsUIGroup=$(IsUIGroup)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions)</PackagePreprocessorDefinitions>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/component.swr b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/component.swr
index 3ae9a504aa0..771ec0b7c68 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/component.swr
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/component.swr
@@ -5,6 +5,6 @@ package name=__VS_PACKAGE_NAME__
         vs.package.type=component
 
 vs.properties
-  isUiGroup=$(IsUIGroup)
+  isUiGroup=__VS_IS_UI_GROUP__
 
 vs.dependencies
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/msi.swr b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/msi.swr
index f24c2f61e52..5108da84125 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/msi.swr
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/SwixTemplate/msi.swr
@@ -3,7 +3,8 @@ use vs
 package name=__VS_PACKAGE_NAME__
         version=__VS_PACKAGE_VERSION__
         vs.package.chip=__VS_PACKAGE_CHIP__
-        vs.package.type=msi        
+        vs.package.productArch=__VS_PACKAGE_PRODUCT_ARCH__
+        vs.package.type=msi
 
 vs.installSize
   SystemDrive=__VS_PACKAGE_INSTALL_SIZE_SYSTEM_DRIVE__
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Utils.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Utils.cs
index b77929ef018..f12e4eab0ce 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Utils.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Utils.cs
@@ -122,7 +122,7 @@ public static Guid CreateUuid(Guid namespaceUuid, string name)
             Buffer.BlockCopy(nameBytes, 0, hashBuffer, 16, nameBytes.Length);
             byte[] hash;
 
-            using (SHA256 sha256 = new SHA256Managed())
+            using (SHA256 sha256 = SHA256.Create())
             {
                 hash = sha256.ComputeHash(hashBuffer);
             }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs
index 2098a162816..97f9d1ac855 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
@@ -17,6 +18,8 @@ namespace Microsoft.DotNet.Build.Tasks.Workloads
     /// </summary>
     public class VisualStudioComponent
     {
+        private static readonly string[] s_SupportedRids = new string[] { "win7", "win10", "any", "win", "win-x64", "win-x86", "win-arm64" };
+
         /// <summary>
         /// The component category.
         /// </summary>
@@ -33,6 +36,20 @@ public string Description
             get;
         }
 
+        /// <summary>
+        /// Gets whether this component has any dependencies.
+        /// </summary>
+        public bool HasDependencies => Dependencies.Count > 0;
+
+        /// <summary>
+        /// When "no", the component is visible in both the workloads and individual components tab.
+        /// When "yes", the component is only visible in the workloads tab.
+        /// </summary>
+        public string IsUiGroup
+        {
+            get;
+        } = "no";
+
         /// <summary>
         /// The component name (ID).
         /// </summary>
@@ -41,6 +58,15 @@ public string Name
             get;
         }
 
+        /// <summary>
+        /// An item group containing information to shorten the names of packages.
+        /// </summary>
+        public ITaskItem[] ShortNames
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// The title of the component to display in the installer UI, e.g. the individual component tab.
         /// </summary>
@@ -59,12 +85,26 @@ public Version Version
 
         private ICollection<VisualStudioDependency> Dependencies = new List<VisualStudioDependency>();
 
-        public VisualStudioComponent(string name, string description, string title, Version version)
+        public VisualStudioComponent(string name, string description, string title, Version version, string isUiGroup, ITaskItem[] shortNames,
+            string category)
         {
             Name = name;
             Description = description;
             Title = title;
             Version = version;
+            ShortNames = shortNames;
+            Category = category;
+            IsUiGroup = isUiGroup;
+        }
+
+        /// <summary>
+        /// Add a component dependency using the provided name and version.
+        /// </summary>
+        /// <param name="name">The name (ID) of the dependency.</param>
+        /// <param name="exactVersion">The version of the dependency.</param>
+        public void AddDependency(string name, Version exactVersion)
+        {
+            AddDependency(new VisualStudioDependency(name, exactVersion, exactVersion));
         }
 
         /// <summary>
@@ -72,9 +112,9 @@ public VisualStudioComponent(string name, string description, string title, Vers
         /// </summary>
         /// <param name="name">The name (ID) of the dependency.</param>
         /// <param name="version">The version of the dependency.</param>
-        public void AddDependency(string name, Version version)
+        public void AddDependency(string name, Version minVersion, Version maxVersion)
         {
-            AddDependency(new VisualStudioDependency(name, version));
+            AddDependency(new VisualStudioDependency(name, minVersion, maxVersion));
         }
 
         /// <summary>
@@ -92,16 +132,32 @@ public void AddDependency(VisualStudioDependency dependency)
         /// <param name="dependency">The dependency to add to this component.</param>
         public void AddDependency(ITaskItem dependency)
         {
-            AddDependency(new VisualStudioDependency(dependency.ItemSpec, new Version(dependency.GetMetadata("Version"))));
+            AddDependency(new VisualStudioDependency(dependency.ItemSpec.Replace(ShortNames), new Version(dependency.GetMetadata(Metadata.Version))));
         }
 
         /// <summary>
         /// Add a dependency using the specified workload pack.
         /// </summary>
-        /// <param name="dependency">The dependency to add to this component.</param>
-        public void AddDependency(WorkloadPack dependency)
+        /// <param name="pack">The dependency to add to this component.</param>
+        public void AddDependency(WorkloadPack pack)
+        {
+            AddDependency($"{pack.Id.ToString().Replace(ShortNames)}.{pack.Version}", new NuGetVersion(pack.Version).Version, maxVersion: null);
+        }
+
+        public IEnumerable<VisualStudioDependency> GetAliasedDependencies(WorkloadPack pack)
         {
-            AddDependency($"{dependency.Id}", new NuGetVersion(dependency.Version).Version);
+            foreach (var rid in pack.AliasTo.Keys)
+            {
+                switch (rid)
+                {
+                    case "win-x86":
+                    case "win-x64":
+                        yield return new VisualStudioDependency($"{pack.AliasTo[rid].ToString().Replace(ShortNames)}.{pack.Version}", new NuGetVersion(pack.Version).Version);
+                        break;
+                    default:
+                        break;
+                }
+            }
         }
 
         /// <summary>
@@ -130,7 +186,7 @@ public TaskItem Generate(string projectPath)
                 //                 version=[1.2.3.4]
 
                 swrWriter.WriteLine($"  vs.dependency id={dependency.Id}");
-                swrWriter.WriteLine($"                version=[{dependency.Version}]");
+                swrWriter.WriteLine($"                version={dependency.GetVersion()}");
                 swrWriter.WriteLine($"                behaviors=IgnoreApplicabilityFailures");
             }
 
@@ -145,27 +201,97 @@ private Dictionary<string, string> GetReplacementTokens()
                 {"__VS_PACKAGE_VERSION__", Version.ToString() },
                 {"__VS_COMPONENT_TITLE__", Title },
                 {"__VS_COMPONENT_DESCRIPTION__", Description },
-                {"__VS_COMPONENT_CATEGORY__", Category }
+                {"__VS_COMPONENT_CATEGORY__", Category ?? ".NET" },
+                {"__VS_IS_UI_GROUP__", IsUiGroup ?? "no" }
             };
         }
 
         /// <summary>
         /// Creates a <see cref="VisualStudioComponent"/> using a workload definition.
         /// </summary>
-        /// <param name="Definition"></param>
-        /// <param name="packs"></param>
+        /// <param name="manifest"></param>
+        /// <param name="workload"></param>
+        /// <param name="componentVersions"></param>
+        /// <param name="shortNames"></param>
+        /// <param name="shortNameMetadata"></param>
+        /// <param name="componentResources"></param>
         /// <returns></returns>
-        public static VisualStudioComponent Create(WorkloadManifest manifest, WorkloadDefinition definition)
+        public static VisualStudioComponent Create(TaskLoggingHelper log, WorkloadManifest manifest, WorkloadDefinition workload, ITaskItem[] componentVersions,
+            ITaskItem[] shortNames, ITaskItem[] componentResources, ITaskItem[] missingPacks)
         {
-            VisualStudioComponent package = new(Utils.ToSafeId(definition.Id.ToString()), definition.Description,
-                definition.Description, new Version($"{manifest.Version}.0"));
+            log?.LogMessage("Creating Visual Studio component");
+            string workloadId = $"{workload.Id}";
+
+            // If there's an explicit version mapping we use that, otherwise we fall back to the manifest version
+            // and normalize it since it can have semantic information and Visual Studio components do not support that.
+            ITaskItem versionItem = componentVersions?.Where(v => string.Equals(v.ItemSpec, workloadId, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+            Version version = (versionItem != null) && !string.IsNullOrWhiteSpace(versionItem.GetMetadata(Metadata.Version))
+                ? new Version(versionItem.GetMetadata(Metadata.Version))
+                : (new NuGetVersion(manifest.Version)).Version;
 
-            foreach (WorkloadPackId packId in definition.Packs)
+            ITaskItem resourceItem = componentResources?.Where(
+                r => string.Equals(r.ItemSpec, workloadId, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+
+            // Workload definitions do not have separate title/description fields so the only option
+            // is to default to the workload description for both.
+            string title = resourceItem?.GetMetadata(Metadata.Title) ?? workload.Description;
+            string description = resourceItem?.GetMetadata(Metadata.Description) ?? workload.Description;
+            string category = resourceItem?.GetMetadata(Metadata.Category) ?? ".NET";
+            string isUiGroup = workload.IsAbstract ? "yes" : "no";
+
+            VisualStudioComponent component = new(Utils.ToSafeId(workloadId), description,
+                title, version, isUiGroup, shortNames, category);
+
+            IEnumerable<string> missingPackIds = missingPacks.Select(p => p.ItemSpec);
+            log?.LogMessage(MessageImportance.Low, $"Missing packs: {string.Join(", ", missingPackIds)}");
+
+            // If the workload extends other workloads, we add those as component dependencies before
+            // processing direct pack dependencies
+            if (workload.Extends?.Count() > 0)
             {
-                package.AddDependency(manifest.Packs[packId]);
+                foreach (WorkloadId dependency in workload.Extends)
+                {
+                    // Component dependencies, aka. workload extensions only have minimum version dependencies.
+                    component.AddDependency($"{Utils.ToSafeId(dependency.ToString())}", new Version("1.0.0.0"), maxVersion: null);
+                }
+            }
+
+            if (workload.Packs != null)
+            {
+                // Visual Studio is case-insensitive. 
+                IEnumerable<WorkloadPackId> packIds = workload.Packs.Where(p => !missingPackIds.Contains($"{p}", StringComparer.OrdinalIgnoreCase));
+                log?.LogMessage(MessageImportance.Low, $"Packs: {string.Join(", ", packIds.Select(p => $"{p}"))}");
+
+                foreach (WorkloadPackId packId in packIds)
+                {
+                    // Check whether the pack dependency is aliased to non-Windows RIDs. If so, we can't add a dependency for the pack
+                    // because we won't be able to create installers.
+                    if (manifest.Packs.TryGetValue(packId, out WorkloadPack pack))
+                    {
+                        if (pack.IsAlias && !pack.AliasTo.Keys.Any(rid => s_SupportedRids.Contains(rid)))
+                        {
+                            log?.LogMessage($"Workload {workload.Id} supports Windows, but none of its aliased packs do. Only the following pack aliases were found: {String.Join("", "", pack.AliasTo.Keys)}.");
+                            continue;
+                        }
+                        else
+                        {
+                            log?.LogMessage(MessageImportance.Low, $"Adding component dependency for {packId} ");
+                            component.AddDependency(manifest.Packs[packId]);
+                        }
+                    }
+
+                    //if (manifest.Packs.ContainsKey(packId))
+                    //{
+                    //    component.AddDependency(manifest.Packs[packId]);
+                    //}
+                    //else
+                    //{
+                    //    log?.LogMessage(MessageImportance.High, $"Missing Visual Studio component dependency, packId: {packId}.");
+                    //}
+                }
             }
 
-            return package;
+            return component;
         }
     }
 }
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioDependency.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioDependency.cs
index db80a3d70fe..0f26d13e0c0 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioDependency.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioDependency.cs
@@ -18,18 +18,53 @@ public string Id
             get;            
         }
 
-        /// <summary>
-        /// The version of the dependent.
-        /// </summary>
-        public Version Version
+        public Version MinVersion
         {
             get;
         }
 
-        public VisualStudioDependency(string id, Version version)
+        public Version MaxVersion
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Creates a dependency with an exact version.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="version"></param>
+        public VisualStudioDependency(string id, Version version) : this(id, version, version)
+        {
+
+        }
+        
+        /// <summary>
+        /// Creates a dependency with a minimum and maximum versions.
+        /// </summary>
+        /// <param name="id">The Visual Studio package ID. The ID applies to packages, components, component groups, etc.</param>
+        /// <param name="minVersion">The minimum required version, inclusive.</param>
+        /// <param name="maxVersion">The maximum version, exclusive. May be <see langword="null"/> if there is only a minimum requirement. If
+        /// equal to <paramref name="minVersion"/>, an exact version requirement is created, e.g. [1.2.0].</param>
+        public VisualStudioDependency(string id, Version minVersion, Version maxVersion)
         {
             Id = id;
-            Version = version;
+            MinVersion = minVersion;
+            MaxVersion = maxVersion;
+        }
+
+        public string GetVersion()
+        {
+            if ((MaxVersion != null) && (MinVersion == MaxVersion))
+            {
+                return $"[{MinVersion}]";
+            }
+
+            if (MaxVersion == null)
+            {
+                return $"[{MinVersion},)";
+            }
+
+            return $"[{MinVersion},{MaxVersion})";
         }
     }
 }
diff --git a/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.targets b/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.targets
index 7ae90ea3044..c28bd647fe3 100644
--- a/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.targets
+++ b/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.targets
@@ -30,6 +30,8 @@
     <PropertyGroup>
       <_CMakeMultiConfigurationGenerator>true</_CMakeMultiConfigurationGenerator>
       <_CMakePassArchitectureToGenerator>true</_CMakePassArchitectureToGenerator>
+      <!-- We limit the VS version range for the generator since CMake only knows about specific VS versions -->
+      <VSGeneratorVersionRange Condition="'$(VSGeneratorVersionRange)' == ''">[15,18.0)</VSGeneratorVersionRange>
       <!-- Visual Studio uses the Win32 name for the x86 target architecture. -->
       <Platform Condition="'$(Platform)' == 'x86'">Win32</Platform>
     </PropertyGroup>
@@ -37,7 +39,7 @@
     <Error Condition="'$(_VSNativeCompilerComponentArchName)' == ''" Text="Unable to determine if Visual Studio has MSVC tools installed for the '$(Platform)' architecture." />
 
     <Exec
-      Command="$(VSWherePath) -latest -prerelease -products * -requires $(_VSNativeCompilerComponentName) -property installationVersion"
+      Command="$(VSWherePath) -latest -prerelease -products * -version $(VSGeneratorVersionRange) -requires $(_VSNativeCompilerComponentName) -property installationVersion"
       EchoOff="true"
       ConsoleToMsBuild="true"
       StandardOutputImportance="Low">
@@ -48,6 +50,7 @@
 
     <PropertyGroup>
       <VSGenerator Condition="$(_HighestCompatibleVSVersion.StartsWith(16.))">Visual Studio 16 2019</VSGenerator>
+      <VSGenerator Condition="$(_HighestCompatibleVSVersion.StartsWith(17.))">Visual Studio 17 2022</VSGenerator>
     </PropertyGroup>
 
     <Error Condition="'$(VSGenerator)' == ''"
@@ -67,7 +70,7 @@
     </PropertyGroup>
   </Target>
 
-  <Target Name="GetOutputPathForProjectReference" DependsOnTargets="GetRootCMakeListsDirectory;ResolveVSGenerator" Returns="$(_CMakeProjectReferenceFilesLocation)">
+  <Target Name="GetOutputPathForProjectReference" DependsOnTargets="GetRootCMakeListsDirectory;ResolveVSGenerator;IsMultiConfigurationGenerator" Returns="@(_CMakeProjectReferenceFilesLocationItem)">
     <PropertyGroup>
       <_NormalizedReferencedCMakeListsDirectory>$([System.IO.Path]::GetDirectoryName($(ReferencedCMakeLists)))</_NormalizedReferencedCMakeListsDirectory>
     </PropertyGroup>
@@ -83,6 +86,9 @@
       <_CMakeProjectReferenceFilesLocation
         Condition="'$(_CMakeMultiConfigurationGenerator)' == 'true'">$([MSBuild]::NormalizePath('$(_CMakeProjectReferenceFilesLocation)','$(Configuration)'))</_CMakeProjectReferenceFilesLocation>
     </PropertyGroup>
+    <ItemGroup>
+      <_CMakeProjectReferenceFilesLocationItem Include="$(_CMakeProjectReferenceFilesLocation)" IsMultiConfigurationGenerator="_CMakeMultiConfigurationGenerator" />
+    </ItemGroup>
   </Target>
 
   <Target Name="_ResolveVSCompilerToolchainForNonVSGenerators"
@@ -115,8 +121,9 @@
   <Target Name="_ResolveNonMSVCCompilerToolchain" Condition="'$(CMakeCompilerToolchain)' != 'MSVC' and '$(CMakeCompilerSearchScript)' == ''">
     <Error Condition="$([MSBuild]::IsOsPlatform(Windows))" Text="This SDK does not support using non-MSVC toolchains on Windows." />
     <PropertyGroup>
+      <_NativeScriptsDir>$([MSBuild]::NormalizeDirectory('$(RepositoryEngineeringDir)', 'common', 'native'))</_NativeScriptsDir>
       <CMakeCompilerSearchScript>
-      . $([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)', '$(RepositoryEngineeringDir)common/native/find-native-compiler.sh')) $(CMakeCompilerToolchain) $(CMakeCompilerMajorVersion) $(CMakeCompilerMinorVersion)
+      . &quot;$([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)', '$(_NativeScriptsDir)/init-compiler.sh'))&quot; &quot;$(_NativeScriptsDir)&quot; &quot;$(Platform)&quot; &quot;$(CMakeCompilerToolchain)&quot;
       </CMakeCompilerSearchScript>
     </PropertyGroup>
   </Target>
diff --git a/src/Microsoft.DotNet.CMake.Sdk/sdk/ProjectReference.targets b/src/Microsoft.DotNet.CMake.Sdk/sdk/ProjectReference.targets
index 02265d6be00..5e58ba92f33 100644
--- a/src/Microsoft.DotNet.CMake.Sdk/sdk/ProjectReference.targets
+++ b/src/Microsoft.DotNet.CMake.Sdk/sdk/ProjectReference.targets
@@ -11,15 +11,10 @@
   </Target>
 
   <Target Name="CopyNativeProjectBinaries">
-    <MSBuild Projects="$(ReferencedCMakeProject)"
-      Targets="IsMultiConfigurationGenerator">
-      <Output TaskParameter="TargetOutputs" PropertyName="_IsMultiConfigurationGenerator" />
-    </MSBuild>
-
-    <ItemGroup Condition="'$(_IsMultiConfigurationGenerator)' == 'true'">
+    <ItemGroup Condition="'$(IsMultiConfigurationGenerator)' == 'true'">
       <NativeProjectBinaries Include="$(NativeProjectOutputFolder)\*.*" />
     </ItemGroup>
-    <ItemGroup Condition="'$(_IsMultiConfigurationGenerator)' != 'true'">
+    <ItemGroup Condition="'$(IsMultiConfigurationGenerator)' != 'true'">
 
     <!-- ############################################################### -->
     <!-- The following is required because the single configuration      -->
@@ -122,12 +117,14 @@
 
     <MSBuild Projects="%(NativeProjectReferenceNormalized.CMakeProject)"
       Targets="GetOutputPathForProjectReference"
-      Properties="ReferencedCMakeLists=%(NativeProjectReferenceNormalized.Identity)">
+      Properties="ReferencedCMakeLists=%(NativeProjectReferenceNormalized.Identity);%(NativeProjectReferenceNormalized.AdditionalProperties)">
       <Output TaskParameter="TargetOutputs" ItemName="NativeProjectOutputFoldersToCopy" />
     </MSBuild>
 
     <ItemGroup>
-      <_NativeProjectReferenceToBuild Include="%(NativeProjectReferenceNormalized.CMakeProject)" Condition="'%(NativeProjectReferenceNormalized.BuildNative)' == 'true'" />
+      <_NativeProjectReferenceToBuild Include="%(NativeProjectReferenceNormalized.CMakeProject)"
+                                      Condition="'%(NativeProjectReferenceNormalized.BuildNative)' == 'true'"
+                                      AdditionalProperties="%(NativeProjectReferenceNormalized.AdditionalProperties)" />
     </ItemGroup>
 
     <RemoveDuplicates Inputs="@(_NativeProjectReferenceToBuild)">
@@ -142,7 +139,8 @@
     <MSBuild Projects="$(MSBuildProjectFile)" 
              Targets="CopyNativeProjectBinaries"
              Properties="NativeProjectOutputFolder=%(NativeProjectOutputFoldersToCopy.Identity);
-                         ReferencedCMakeProject=%(NativeProjectOutputFoldersToCopy.MSBuildSourceProjectFile)"
+                         ReferencedCMakeProject=%(NativeProjectOutputFoldersToCopy.MSBuildSourceProjectFile);
+                         IsMultiConfigurationGenerator=%(NativeProjectOutputFoldersToCopy.IsMultiConfigurationGenerator)"
              Condition="'@(NativeProjectReference)' != ''" />
 
   </Target>
diff --git a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj
index 30474e210e3..c964fbea18d 100644
--- a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj
+++ b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworks>
 
     <IsPackable>true</IsPackable>
     <Description>Aka.ms link manager</Description>
diff --git a/src/Microsoft.DotNet.GenAPI/build/Microsoft.DotNet.GenAPI.targets b/src/Microsoft.DotNet.GenAPI/build/Microsoft.DotNet.GenAPI.targets
index 9f10b25beb6..4239c494a85 100644
--- a/src/Microsoft.DotNet.GenAPI/build/Microsoft.DotNet.GenAPI.targets
+++ b/src/Microsoft.DotNet.GenAPI/build/Microsoft.DotNet.GenAPI.targets
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
 
@@ -7,12 +6,12 @@
     <DotNetTool Condition="'$(DotNetTool)' == ''">dotnet</DotNetTool>
 
     <GenAPITargetPath Condition="'$(GenAPITargetPath)' == ''">$(TargetDir)$(TargetName).cs</GenAPITargetPath>
-    <_GenAPIPath Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)\..\tools\netcoreapp3.1\Microsoft.DotNet.GenAPI.dll</_GenAPIPath>
-    <_GenAPIPath Condition="'$(MSBuildRuntimeType)' != 'core'">$(MSBuildThisFileDirectory)\..\tools\net472\Microsoft.DotNet.GenAPI.exe</_GenAPIPath>
+    <_GenAPIPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)\..\tools\netcoreapp3.1\Microsoft.DotNet.GenAPI.dll</_GenAPIPath>
+    <_GenAPIPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)\..\tools\net472\Microsoft.DotNet.GenAPI.exe</_GenAPIPath>
 
-    <_GenAPICommand Condition="'$(MSBuildRuntimeType)' == 'core'">"$(DotNetTool)" "$(_GenAPIPath)"</_GenAPICommand>
-    <_GenAPICommand Condition="'$(MSBuildRuntimeType)' != 'core' and '$(OS)' == 'Windows_NT'">"$(_GenAPIPath)"</_GenAPICommand>
-    <_GenAPICommand Condition="'$(MSBuildRuntimeType)' != 'core' and '$(OS)' != 'Windows_NT'">mono --runtime=v4.0.30319 "$(_GenAPIPath)"</_GenAPICommand>
+    <_GenAPICommand Condition="'$(MSBuildRuntimeType)' == 'Core'">"$(DotNetTool)" "$(_GenAPIPath)"</_GenAPICommand>
+    <_GenAPICommand Condition="'$(MSBuildRuntimeType)' != 'Core' and '$(OS)' == 'Windows_NT'">"$(_GenAPIPath)"</_GenAPICommand>
+    <_GenAPICommand Condition="'$(MSBuildRuntimeType)' != 'Core' and '$(OS)' != 'Windows_NT'">mono --runtime=v4.0.30319 "$(_GenAPIPath)"</_GenAPICommand>
 
     <!-- Sequence ourselves last in PrepareForRun
          This ensures the output has been copied to TargetPath, but still permits
@@ -23,21 +22,16 @@
     </PrepareForRunDependsOn>
   </PropertyGroup>
 
-  <Target Name="SetBuildProjectReferences">
+  <Target Name="_DontBuildProjectReferences">
     <PropertyGroup>
       <BuildProjectReferences>false</BuildProjectReferences>
     </PropertyGroup>
   </Target>
 
   <Target Name="GenerateReferenceAssemblySource"
-          DependsOnTargets="SetBuildProjectReferences;ResolveAssemblyReferences"
+          DependsOnTargets="_DontBuildProjectReferences;ResolveAssemblyReferences"
           Inputs="@(IntermediateAssembly)"
           Outputs="$(GenAPITargetPath)">
-
-    <PropertyGroup>
-      <IntermediateTargetPath Condition="'$(IntermediateTargetPath)' == ''">$(IntermediateOutputPath)$(TargetName)$(TargetExt)</IntermediateTargetPath>
-    </PropertyGroup>
-
     <ItemGroup Condition="'$(GenAPILibPath)' == ''">
       <!-- build out a list of directories where dependencies are located -->
       <_referencePathDirectoriesWithDuplicates Include="@(ReferencePath->'%(RootDir)%(Directory)'->TrimEnd('\'))" />
@@ -49,13 +43,13 @@
       <GenAPILibPath>@(_referencePathDirectories)</GenAPILibPath>
     </PropertyGroup>
 
-    <Exec Command="$(_GenAPICommand) &quot;$(IntermediateTargetPath)&quot; --lib-path &quot;$(GenAPILibPath)&quot; --out &quot;$(GenAPITargetPath)&quot; $(GenAPIAdditionalParameters)" />
+    <Exec Command="$(_GenAPICommand) &quot;$(IntermediateOutputPath)$(TargetName)$(TargetExt)&quot; --lib-path &quot;$(GenAPILibPath)&quot; --out &quot;$(GenAPITargetPath)&quot; $(GenAPIAdditionalParameters)" />
 
     <ItemGroup>
       <FileWrites Condition="'$(SkipGenAPITargetPathFileWrite)' != 'true'" Include="$(GenAPITargetPath)"/>
     </ItemGroup>
 
     <Message Text="Generated reference assembly source code: $(GenAPITargetPath)" Importance="high" />
-
   </Target>
+
 </Project>
diff --git a/src/Microsoft.DotNet.GenFacades/ClearAssemblyReferenceVersions.cs b/src/Microsoft.DotNet.GenFacades/ClearAssemblyReferenceVersions.cs
index ce1bd1638d3..73fe72c35c4 100644
--- a/src/Microsoft.DotNet.GenFacades/ClearAssemblyReferenceVersions.cs
+++ b/src/Microsoft.DotNet.GenFacades/ClearAssemblyReferenceVersions.cs
@@ -6,7 +6,6 @@
 using Microsoft.DotNet.Build.Tasks;
 using System;
 using System.IO;
-using System.Linq;
 using System.Reflection.Metadata;
 using System.Reflection.Metadata.Ecma335;
 using System.Reflection.PortableExecutable;
diff --git a/src/Microsoft.DotNet.GenFacades/ILRewriter/FacadeGenerationException.cs b/src/Microsoft.DotNet.GenFacades/ILRewriter/FacadeGenerationException.cs
deleted file mode 100644
index 86a5ab8be99..00000000000
--- a/src/Microsoft.DotNet.GenFacades/ILRewriter/FacadeGenerationException.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-
-namespace Microsoft.DotNet.GenFacades.ILRewriter
-{
-    internal sealed class FacadeGenerationException : Exception
-    {
-        public FacadeGenerationException(string message) : base(message)
-        {
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.GenFacades/ILRewriter/GenFacades.cs b/src/Microsoft.DotNet.GenFacades/ILRewriter/GenFacades.cs
deleted file mode 100644
index 0b00d971093..00000000000
--- a/src/Microsoft.DotNet.GenFacades/ILRewriter/GenFacades.cs
+++ /dev/null
@@ -1,886 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Microsoft.Cci;
-using Microsoft.Cci.Extensions;
-using Microsoft.Cci.MutableCodeModel;
-using System.Globalization;
-using Microsoft.DiaSymReader.Tools;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.DotNet.GenFacades.ILRewriter
-{
-    public class Generator
-    {
-        private const uint ReferenceAssemblyFlag = 0x70;
-
-        public static bool Execute(
-            string seeds,
-            string contracts,
-            string facadePath,
-            Version assemblyFileVersion = null,
-            bool clearBuildAndRevision = false,
-            bool ignoreMissingTypes = false,
-            bool ignoreBuildAndRevisionMismatch = false,
-            bool buildDesignTimeFacades = false,
-            string inclusionContracts = null,
-            ErrorTreatment seedLoadErrorTreatment = ErrorTreatment.Default,
-            ErrorTreatment contractLoadErrorTreatment = ErrorTreatment.Default,
-            string[] seedTypePreferencesUnsplit = null,
-            bool forceZeroVersionSeeds = false,
-            bool producePdb = true,
-            string partialFacadeAssemblyPath = null,
-            bool buildPartialReferenceFacade = false)
-        {
-            if (!Directory.Exists(facadePath))
-                Directory.CreateDirectory(facadePath);
-
-            var nameTable = new NameTable();
-            var internFactory = new InternFactory();
-
-            try
-            {
-                Dictionary<string, string> seedTypePreferences = ParseSeedTypePreferences(seedTypePreferencesUnsplit);
-
-                using (var contractHost = new HostEnvironment(nameTable, internFactory))
-                using (var seedHost = new HostEnvironment(nameTable, internFactory))
-                {
-                    contractHost.LoadErrorTreatment = contractLoadErrorTreatment;
-                    seedHost.LoadErrorTreatment = seedLoadErrorTreatment;
-
-                    var contractAssemblies = LoadAssemblies(contractHost, contracts);
-                    IReadOnlyDictionary<string, IEnumerable<string>> docIdTable = GenerateDocIdTable(contractAssemblies, inclusionContracts);
-
-                    IAssembly[] seedAssemblies = LoadAssemblies(seedHost, seeds).ToArray();
-
-                    IAssemblyReference seedCoreAssemblyRef = ((Microsoft.Cci.Immutable.PlatformType)seedHost.PlatformType).CoreAssemblyRef;
-
-                    if (forceZeroVersionSeeds)
-                    {
-                        // Create a deep copier, copy the seed assemblies, and zero out their versions.
-                        var copier = new MetadataDeepCopier(seedHost);
-
-                        for (int i = 0; i < seedAssemblies.Length; i++)
-                        {
-                            var mutableSeed = copier.Copy(seedAssemblies[i]);
-                            mutableSeed.Version = new Version(0, 0, 0, 0);
-                            // Copy the modified seed assembly back.
-                            seedAssemblies[i] = mutableSeed;
-
-                            if (mutableSeed.Name.UniqueKey == seedCoreAssemblyRef.Name.UniqueKey)
-                            {
-                                seedCoreAssemblyRef = mutableSeed;
-                            }
-                        }
-                    }
-
-                    var typeTable = GenerateTypeTable(seedAssemblies);
-                    var facadeGenerator = new FacadeGenerator(seedHost, contractHost, docIdTable, typeTable, seedTypePreferences, clearBuildAndRevision, buildDesignTimeFacades, assemblyFileVersion);
-
-                    if (buildPartialReferenceFacade && ignoreMissingTypes)
-                    {
-                        throw new FacadeGenerationException(
-                            "When buildPartialReferenceFacade is specified ignoreMissingTypes must not be specified.");
-                    }
-
-                    if (partialFacadeAssemblyPath != null)
-                    {
-                        if (contractAssemblies.Count() != 1)
-                        {
-                            throw new FacadeGenerationException(
-                                "When partialFacadeAssemblyPath is specified, only exactly one corresponding contract assembly can be specified.");
-                        }
-
-                        if (buildPartialReferenceFacade)
-                        {
-                            throw new FacadeGenerationException(
-                                "When partialFacadeAssemblyPath is specified, buildPartialReferenceFacade must not be specified.");
-                        }
-
-                        IAssembly contractAssembly = contractAssemblies.First();
-                        IAssembly partialFacadeAssembly = seedHost.LoadAssembly(partialFacadeAssemblyPath);
-                        if (contractAssembly.Name != partialFacadeAssembly.Name
-                            || contractAssembly.Version.Major != partialFacadeAssembly.Version.Major
-                            || contractAssembly.Version.Minor != partialFacadeAssembly.Version.Minor
-                            || (!ignoreBuildAndRevisionMismatch && contractAssembly.Version.Build != partialFacadeAssembly.Version.Build)
-                            || (!ignoreBuildAndRevisionMismatch && contractAssembly.Version.Revision != partialFacadeAssembly.Version.Revision)
-                            || contractAssembly.GetPublicKeyToken() != partialFacadeAssembly.GetPublicKeyToken())
-                        {
-                            throw new FacadeGenerationException(
-                                string.Format("The partial facade assembly's name, version, and public key token must exactly match the contract to be filled. Contract: {0}, Facade: {1}",
-                                    contractAssembly.AssemblyIdentity,
-                                    partialFacadeAssembly.AssemblyIdentity));
-                        }
-
-                        Assembly filledPartialFacade = facadeGenerator.GenerateFacade(contractAssembly, seedCoreAssemblyRef, ignoreMissingTypes, 
-                            overrideContractAssembly: partialFacadeAssembly, 
-                            forceAssemblyReferenceVersionsToZero: forceZeroVersionSeeds);
-
-                        if (filledPartialFacade == null)
-                        {
-                            Trace.TraceError("Errors were encountered while generating the facade.");
-                            return false;
-                        }
-
-                        string pdbLocation = null;
-
-                        if (producePdb)
-                        {
-                            string pdbFolder = Path.GetDirectoryName(partialFacadeAssemblyPath);
-                            pdbLocation = Path.Combine(pdbFolder, contractAssembly.Name + ".pdb");
-                            if (producePdb && !File.Exists(pdbLocation))
-                            {
-                                pdbLocation = null;
-                                Trace.TraceWarning("No PDB file present for un-transformed partial facade. No PDB will be generated.");
-                            }
-                        }
-
-                        OutputFacadeToFile(facadePath, seedHost, filledPartialFacade, contractAssembly, pdbLocation);
-                    }
-                    else
-                    {
-                        foreach (var contract in contractAssemblies)
-                        {
-                            Assembly facade = facadeGenerator.GenerateFacade(contract, seedCoreAssemblyRef, ignoreMissingTypes, buildPartialReferenceFacade: buildPartialReferenceFacade);
-                            if (facade == null)
-                            {
-#if !COREFX
-                                Debug.Assert(Environment.ExitCode != 0);
-#endif
-                                return false;
-                            }
-
-                            OutputFacadeToFile(facadePath, seedHost, facade, contract);
-                        }
-                    }
-                }
-
-                return true;
-            }
-            catch (FacadeGenerationException ex)
-            {
-                Trace.TraceError(ex.Message);
-#if !COREFX
-                Debug.Assert(Environment.ExitCode != 0);
-#endif
-                return false;
-            }
-        }
-
-        private static void OutputFacadeToFile(string facadePath, HostEnvironment seedHost, Assembly facade, IAssembly contract, string pdbLocation = null)
-        {
-            bool needsConversion = false;
-            string pdbOutputPath = Path.Combine(facadePath, contract.Name + ".pdb");
-            string finalPdbOutputPath = pdbOutputPath;
-
-            // Use the filename (including extension .dll/.winmd) so people can have some control over the output facade file name.
-            string facadeFileName = Path.GetFileName(contract.Location);
-            string facadeOutputPath = Path.Combine(facadePath, facadeFileName);
-            using (Stream peOutStream = File.Create(facadeOutputPath))
-            {
-                if (pdbLocation != null)
-                {
-                    if (File.Exists(pdbLocation))
-                    {
-                        // Convert from portable to windows PDBs if necessary.  If we convert
-                        // set the pdbOutput path to a *.windows.pdb file so we can convert it back 
-                        // to 'finalPdbOutputPath'.
-                        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                            needsConversion = ConvertFromPortableIfNecessary(facade.Location, ref pdbLocation);
-                        if (needsConversion)
-                        {                
-                            // We want to keep the same file name for the PDB because it is used as a key when looking it up on a symbol server 
-                            string pdbOutputPathPdbDir = Path.Combine(Path.GetDirectoryName(pdbOutputPath), "WindowsPdb");
-                            Directory.CreateDirectory(pdbOutputPathPdbDir);
-                            pdbOutputPath = Path.Combine(pdbOutputPathPdbDir, Path.GetFileName(pdbOutputPath));
-                        }
-
-                        // do the main GenFacades logic (which today only works with windows PDBs). 
-                        using (Stream pdbReadStream = File.OpenRead(pdbLocation))
-                        using (PdbReader pdbReader = new PdbReader(pdbReadStream, seedHost))
-                        using (PdbWriter pdbWriter = new PdbWriter(pdbOutputPath, pdbReader))
-                        {
-                            PeWriter.WritePeToStream(facade, seedHost, peOutStream, pdbReader, pdbReader, pdbWriter);
-                        }
-                    }
-                    else
-                    {
-                        throw new FacadeGenerationException("Couldn't find the pdb at the given location: " + pdbLocation);
-                    }
-                }
-                else
-                {
-                    PeWriter.WritePeToStream(facade, seedHost, peOutStream);
-                }
-            }
-
-            // If we started with Portable PDBs we need to convert the output to portable again. 
-            // We have to do this after facadeOutputPath is closed for writing.   
-            if (needsConversion)
-            {
-                Trace.TraceInformation("Converting PDB generated by GenFacades " + pdbOutputPath + " to portable format " + finalPdbOutputPath);
-                ConvertFromWindowsPdb(facadeOutputPath, pdbOutputPath, finalPdbOutputPath);
-            }
-        }
-
-        /// <summary>
-        /// Given dllInputPath determine if it is portable.  If so convert it *\WindowsPdb\*.pdb and update 'pdbInputPath' to 
-        /// point to this converted file.
-        /// Returns true if the conversion was done (that is the original file was portable).  
-        /// 'dllInputPath' is the DLL that goes along with 'pdbInputPath'.  
-        /// </summary>
-        private static bool ConvertFromPortableIfNecessary(string dllInputPath, ref string pdbInputPath)
-        {
-            string originalPdbInputPath = pdbInputPath;
-            using (Stream pdbReadStream = File.OpenRead(pdbInputPath))
-            {
-                // If the input is not portable, there is nothing to do, and we can early out.  
-                if (!PdbConverter.IsPortable(pdbReadStream))
-                    return false;
-
-                // We want to keep the same file name for the PDB because it is used as a key when looking it up on a symbol server 
-                string pdbInputPathPdbDir = Path.Combine(Path.GetDirectoryName(pdbInputPath), "WindowsPdb");
-                Directory.CreateDirectory(pdbInputPathPdbDir);
-                pdbInputPath =  Path.Combine(pdbInputPathPdbDir, Path.GetFileName(pdbInputPath)); 
-
-                Trace.TraceInformation("PDB " + originalPdbInputPath + " is a portable PDB, converting it to " + pdbInputPath);
-                PdbConverter converter = new PdbConverter(d => Trace.TraceError(d.ToString(CultureInfo.InvariantCulture)));
-                using (Stream peStream = File.OpenRead(dllInputPath))
-                using (Stream pdbWriteStream = File.OpenWrite(pdbInputPath))
-                {
-                    converter.ConvertPortableToWindows(peStream, pdbReadStream, pdbWriteStream, new PortablePdbConversionOptions(suppressSourceLinkConversion: true));
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Convert the windows PDB winPdbInputPath to portablePdbOutputPath. 
-        /// 'dllInputPath' is the DLL that goes along with 'winPdbInputPath'.  
-        /// </summary>
-        private static void ConvertFromWindowsPdb(string dllInputPath, string winPdbInputPath, string portablePdbOutputPath)
-        {
-            PdbConverter converter = new PdbConverter(d => Trace.TraceError(d.ToString(CultureInfo.InvariantCulture)));
-            using (Stream peStream = File.OpenRead(dllInputPath))
-            using (Stream pdbReadStream = File.OpenRead(winPdbInputPath))
-            using (Stream pdbWriteStream = File.OpenWrite(portablePdbOutputPath))
-            {
-                converter.ConvertWindowsToPortable(peStream, pdbReadStream, pdbWriteStream);
-            }
-        }
-
-        private static Dictionary<string, string> ParseSeedTypePreferences(string[] preferences)
-        {
-            var dictionary = new Dictionary<string, string>(StringComparer.Ordinal);
-
-            if (preferences != null)
-            {
-                foreach (string preference in preferences)
-                {
-                    int i = preference.IndexOf('=');
-                    if (i < 0)
-                    {
-                        throw new FacadeGenerationException("Invalid seed type preference. Correct usage is /preferSeedType:FullTypeName=AssemblyName");
-                    }
-
-                    string key = preference.Substring(0, i);
-                    string value = preference.Substring(i + 1);
-
-                    if (!key.StartsWith("T:", StringComparison.Ordinal))
-                    {
-                        key = "T:" + key;
-                    }
-
-                    string existingValue;
-                    if (dictionary.TryGetValue(key, out existingValue))
-                    {
-                        Trace.TraceWarning("Overriding /preferSeedType:{0}={1} with /preferSeedType:{2}={3}.", key, existingValue, key, value);
-                    }
-
-                    dictionary[key] = value;
-                }
-            }
-
-            return dictionary;
-        }
-
-        private static IEnumerable<IAssembly> LoadAssemblies(HostEnvironment host, string assemblyPaths)
-        {
-            host.UnifyToLibPath = true;
-            string[] splitPaths = HostEnvironment.SplitPaths(assemblyPaths);
-
-            foreach (string path in splitPaths)
-            {
-                if (Directory.Exists(path))
-                {
-                    host.AddLibPath(Path.GetFullPath(path));
-                }
-                else if (File.Exists(path))
-                {
-                    host.AddLibPath(Path.GetDirectoryName(Path.GetFullPath(path)));
-                }
-            }
-
-            return host.LoadAssemblies(splitPaths);
-        }
-
-        private static IReadOnlyDictionary<string, IEnumerable<string>> GenerateDocIdTable(IEnumerable<IAssembly> contractAssemblies, string inclusionContracts)
-        {
-            Dictionary<string, HashSet<string>> mutableDocIdTable = new Dictionary<string, HashSet<string>>();
-            foreach (IAssembly contractAssembly in contractAssemblies)
-            {
-                string simpleName = contractAssembly.AssemblyIdentity.Name.Value;
-                if (mutableDocIdTable.ContainsKey(simpleName))
-                    throw new FacadeGenerationException(string.Format("Multiple contracts named \"{0}\" specified on -contracts.", simpleName));
-                mutableDocIdTable[simpleName] = new HashSet<string>(EnumerateDocIdsToForward(contractAssembly));
-            }
-
-            if (inclusionContracts != null)
-            {
-                foreach (string inclusionContractPath in HostEnvironment.SplitPaths(inclusionContracts))
-                {
-                    // Assembly identity conflicts are permitted and normal in the inclusion contract list so load each one in a throwaway host to avoid problems.
-                    using (HostEnvironment inclusionHost = new HostEnvironment(new NameTable(), new InternFactory()))
-                    {
-                        IAssembly inclusionAssembly = inclusionHost.LoadAssemblyFrom(inclusionContractPath);
-                        if (inclusionAssembly == null || inclusionAssembly is Dummy)
-                            throw new FacadeGenerationException(string.Format("Could not load assembly \"{0}\".", inclusionContractPath));
-                        string simpleName = inclusionAssembly.Name.Value;
-                        HashSet<string> hashset;
-                        if (!mutableDocIdTable.TryGetValue(simpleName, out hashset))
-                        {
-                            Trace.TraceWarning("An assembly named \"{0}\" was specified in the -include list but no contract was specified named \"{0}\". Ignoring.", simpleName);
-                        }
-                        else
-                        {
-                            foreach (string docId in EnumerateDocIdsToForward(inclusionAssembly))
-                            {
-                                hashset.Add(docId);
-                            }
-                        }
-                    }
-                }
-            }
-
-            Dictionary<string, IEnumerable<string>> docIdTable = new Dictionary<string, IEnumerable<string>>();
-            foreach (KeyValuePair<string, HashSet<string>> kv in mutableDocIdTable)
-            {
-                string key = kv.Key;
-                IEnumerable<string> sortedDocIds = kv.Value.OrderBy(s => s, StringComparer.OrdinalIgnoreCase);
-                docIdTable.Add(key, sortedDocIds);
-            }
-            return docIdTable;
-        }
-
-        private static IEnumerable<string> EnumerateDocIdsToForward(IAssembly contractAssembly)
-        {
-            // Use INamedTypeReference instead of INamespaceTypeReference in order to also include nested
-            // class type-forwards.
-            var typeForwardsToForward = contractAssembly.ExportedTypes.Select(alias => alias.AliasedType)
-                                                                      .OfType<INamedTypeReference>();
-
-            var typesToForward = contractAssembly.GetAllTypes().Where(t => TypeHelper.IsVisibleOutsideAssembly(t))
-                                                               .OfType<INamespaceTypeDefinition>();
-            List<string> result = typeForwardsToForward.Concat(typesToForward)
-                                        .Select(type => TypeHelper.GetTypeName(type, NameFormattingOptions.DocumentationId)).ToList();
-
-            foreach(var type in typesToForward)
-            {
-                AddNestedTypeDocIds(result, type);
-            }
-
-            return result;
-        }
-
-        private static void AddNestedTypeDocIds(List<string> docIds, INamedTypeDefinition type)
-        {
-            foreach (var nestedType in type.NestedTypes)
-            {
-                if (TypeHelper.IsVisibleOutsideAssembly(nestedType))
-                    docIds.Add(TypeHelper.GetTypeName(nestedType, NameFormattingOptions.DocumentationId));
-                AddNestedTypeDocIds(docIds, nestedType);
-            }
-        }
-
-        private static IReadOnlyDictionary<string, IReadOnlyList<INamedTypeDefinition>> GenerateTypeTable(IEnumerable<IAssembly> seedAssemblies)
-        {
-            var typeTable = new Dictionary<string, IReadOnlyList<INamedTypeDefinition>>();
-            foreach (var assembly in seedAssemblies)
-            {
-                foreach (var type in assembly.GetAllTypes().OfType<INamedTypeDefinition>())
-                {
-                    if (!TypeHelper.IsVisibleOutsideAssembly(type))
-                        continue;
-                    AddTypeAndNestedTypesToTable(typeTable, type);
-                }
-            }
-            return typeTable;
-        }
-
-        private static void AddTypeAndNestedTypesToTable(Dictionary<string, IReadOnlyList<INamedTypeDefinition>> typeTable, INamedTypeDefinition type)
-        {
-            if (type != null)
-            {
-                IReadOnlyList<INamedTypeDefinition> seedTypes;
-                string docId = TypeHelper.GetTypeName(type, NameFormattingOptions.DocumentationId);
-                if (!typeTable.TryGetValue(docId, out seedTypes))
-                {
-                    seedTypes = new List<INamedTypeDefinition>(1);
-                    typeTable.Add(docId, seedTypes);
-                }
-                if (!seedTypes.Contains(type))
-                    ((List<INamedTypeDefinition>)seedTypes).Add(type);
-
-                foreach (INestedTypeDefinition nestedType in type.NestedTypes)
-                {
-                    if (TypeHelper.IsVisibleOutsideAssembly(nestedType))
-                        AddTypeAndNestedTypesToTable(typeTable, nestedType);
-                }
-            }
-        }
-
-        private class FacadeGenerator
-        {
-            private readonly IMetadataHost _seedHost;
-            private readonly IMetadataHost _contractHost;
-            private readonly IReadOnlyDictionary<string, IEnumerable<string>> _docIdTable;
-            private readonly IReadOnlyDictionary<string, IReadOnlyList<INamedTypeDefinition>> _typeTable;
-            private readonly IReadOnlyDictionary<string, string> _seedTypePreferences;
-            private readonly bool _clearBuildAndRevision;
-            private readonly bool _buildDesignTimeFacades;
-            private readonly Version _assemblyFileVersion;
-
-            public FacadeGenerator(
-                IMetadataHost seedHost,
-                IMetadataHost contractHost,
-                IReadOnlyDictionary<string, IEnumerable<string>> docIdTable,
-                IReadOnlyDictionary<string, IReadOnlyList<INamedTypeDefinition>> typeTable,
-                IReadOnlyDictionary<string, string> seedTypePreferences,
-                bool clearBuildAndRevision,
-                bool buildDesignTimeFacades,
-                Version assemblyFileVersion
-                )
-            {
-                _seedHost = seedHost;
-                _contractHost = contractHost;
-                _docIdTable = docIdTable;
-                _typeTable = typeTable;
-                _seedTypePreferences = seedTypePreferences;
-                _clearBuildAndRevision = clearBuildAndRevision;
-                _buildDesignTimeFacades = buildDesignTimeFacades;
-                _assemblyFileVersion = assemblyFileVersion;
-            }
-
-            public Assembly GenerateFacade(IAssembly contractAssembly, 
-                IAssemblyReference seedCoreAssemblyReference, 
-                bool ignoreMissingTypes, IAssembly overrideContractAssembly = null,
-                bool buildPartialReferenceFacade = false, 
-                bool forceAssemblyReferenceVersionsToZero = false)
-            {
-                Assembly assembly;
-                if (overrideContractAssembly != null)
-                {
-                    MetadataDeepCopier copier = new MetadataDeepCopier(_seedHost);
-                    assembly = copier.Copy(overrideContractAssembly); // Use non-empty partial facade if present
-                }
-                else
-                {
-                    MetadataDeepCopier copier = new MetadataDeepCopier(_contractHost);
-                    assembly = copier.Copy(contractAssembly);
-
-                    // if building a reference facade don't strip the contract
-                    if (!buildPartialReferenceFacade)
-                    {
-                        ReferenceAssemblyToFacadeRewriter rewriter = new ReferenceAssemblyToFacadeRewriter(_seedHost, _contractHost, seedCoreAssemblyReference, _assemblyFileVersion != null);
-                        rewriter.Rewrite(assembly);
-                    }
-                }
-
-                if (forceAssemblyReferenceVersionsToZero)
-                {
-                    foreach (AssemblyReference ar in assembly.AssemblyReferences)
-                    {
-                        ar.Version = new Version(0, 0, 0, 0);
-                    }
-                }
-
-                string contractAssemblyName = contractAssembly.AssemblyIdentity.Name.Value;
-                IEnumerable<string> docIds = _docIdTable[contractAssemblyName];
-
-                // Add all the type forwards
-                bool error = false;
-
-                Dictionary<string, INamedTypeDefinition> existingDocIds = assembly.AllTypes.ToDictionary(typeDef => typeDef.RefDocId(), typeDef => typeDef);
-                IEnumerable<string> docIdsToForward = buildPartialReferenceFacade ? existingDocIds.Keys : docIds.Where(id => !existingDocIds.ContainsKey(id));
-                Dictionary<string, INamedTypeReference> forwardedTypes = new Dictionary<string, INamedTypeReference>();
-                foreach (string docId in docIdsToForward)
-                {
-                    IReadOnlyList<INamedTypeDefinition> seedTypes;
-                    if (!_typeTable.TryGetValue(docId, out seedTypes))
-                    {
-                        if (!ignoreMissingTypes && !buildPartialReferenceFacade)
-                        {
-                            Trace.TraceError("Did not find type '{0}' in any of the seed assemblies.", docId);
-                            error = true;
-                        }
-                        continue;
-                    }
-
-                    INamedTypeDefinition seedType = GetSeedType(docId, seedTypes);
-                    if (seedType == null)
-                    {
-                        TraceDuplicateSeedTypeError(docId, seedTypes);
-                        error = true;
-                        continue;
-                    }
-
-                    if (buildPartialReferenceFacade)
-                    {
-                        // honor preferSeedType for keeping contract type
-                        string preferredSeedAssembly;
-                        bool keepType = _seedTypePreferences.TryGetValue(docId, out preferredSeedAssembly) &&
-                            contractAssemblyName.Equals(preferredSeedAssembly, StringComparison.OrdinalIgnoreCase);
-
-                        if (keepType)
-                        {
-                            continue;
-                        }
-
-                        assembly.AllTypes.Remove(existingDocIds[docId]);
-                        forwardedTypes.Add(docId, seedType);
-                    }
-
-                    AddTypeForward(assembly, seedType);
-                }
-
-                if (buildPartialReferenceFacade)
-                {
-                    if (forwardedTypes.Count == 0)
-                    {
-                        Trace.TraceError("Did not find any types in any of the seed assemblies.");
-                        return null;
-                    }
-                    else
-                    {
-                        // for any thing that's now a typeforward, make sure typerefs point to that rather than
-                        // the type previously inside the assembly.
-                        TypeReferenceRewriter typeRefRewriter = new TypeReferenceRewriter(_seedHost, oldType =>
-                        {
-                            INamedTypeReference newType = null;
-                            return forwardedTypes.TryGetValue(oldType.DocId(), out newType) ? newType : oldType;
-                        });
-
-                        var remainingTypes = assembly.AllTypes.Where(t => t.Name.Value != "<Module>");
-
-                        if (!remainingTypes.Any())
-                        {
-                            Trace.TraceInformation($"Removed all types from {contractAssembly.Name} thus will remove ReferenceAssemblyAttribute.");
-                            assembly.AssemblyAttributes.RemoveAll(ca => ca.FullName() == "System.Runtime.CompilerServices.ReferenceAssemblyAttribute");
-                            assembly.Flags &= ~ReferenceAssemblyFlag;
-                        }
-
-                        typeRefRewriter.Rewrite(assembly);
-                    }
-                }
-
-                if (error)
-                {
-                    return null;
-                }
-
-                if (_assemblyFileVersion != null)
-                {
-                    assembly.AssemblyAttributes.Add(CreateAttribute("System.Reflection.AssemblyFileVersionAttribute", seedCoreAssemblyReference.ResolvedAssembly, _assemblyFileVersion.ToString()));
-                    assembly.AssemblyAttributes.Add(CreateAttribute("System.Reflection.AssemblyInformationalVersionAttribute", seedCoreAssemblyReference.ResolvedAssembly, _assemblyFileVersion.ToString()));
-                }
-
-                if (_buildDesignTimeFacades)
-                {
-                    assembly.AssemblyAttributes.Add(CreateAttribute("System.Runtime.CompilerServices.ReferenceAssemblyAttribute", seedCoreAssemblyReference.ResolvedAssembly));
-                    assembly.Flags |= ReferenceAssemblyFlag;
-                }
-
-                if (_clearBuildAndRevision)
-                {
-                    assembly.Version = new Version(assembly.Version.Major, assembly.Version.Minor, 0, 0);
-                }
-
-                AddWin32VersionResource(contractAssembly.Location, assembly);
-
-                return assembly;
-            }
-
-            private INamedTypeDefinition GetSeedType(string docId, IReadOnlyList<INamedTypeDefinition> seedTypes)
-            {
-                Debug.Assert(seedTypes.Count != 0); // we should already have checked for non-existent types.
-
-                if (seedTypes.Count == 1)
-                {
-                    return seedTypes[0];
-                }
-
-                string preferredSeedAssembly;
-                if (_seedTypePreferences.TryGetValue(docId, out preferredSeedAssembly))
-                {
-                    return seedTypes.SingleOrDefault(t => String.Equals(t.GetAssembly().Name.Value, preferredSeedAssembly, StringComparison.OrdinalIgnoreCase));
-                }
-
-                return null;
-            }
-
-            private static void TraceDuplicateSeedTypeError(string docId, IReadOnlyList<INamedTypeDefinition> seedTypes)
-            {
-                var sb = new StringBuilder();
-                sb.AppendFormat("The type '{0}' is defined in multiple seed assemblies. If this is intentional, specify one of the following arguments to choose the preferred seed type:", docId);
-
-                foreach (INamedTypeDefinition type in seedTypes)
-                {
-                    sb.AppendFormat("  /preferSeedType:{0}={1}", docId.Substring("T:".Length), type.GetAssembly().Name.Value);
-                }
-
-                Trace.TraceError(sb.ToString());
-            }
-
-            private void AddTypeForward(Assembly assembly, INamedTypeDefinition seedType)
-            {
-                var alias = new NamespaceAliasForType();
-                alias.AliasedType = ConvertDefinitionToReferenceIfTypeIsNested(seedType, _seedHost);
-                alias.IsPublic = true;
-
-                if (assembly.ExportedTypes == null)
-                    assembly.ExportedTypes = new List<IAliasForType>();
-                // Make sure that the typeforward doesn't already exist in the ExportedTypes
-                if (!assembly.ExportedTypes.Any(t => t.AliasedType.RefDocId() == alias.AliasedType.RefDocId()))
-                    assembly.ExportedTypes.Add(alias);
-                else
-                    throw new FacadeGenerationException($"{seedType.FullName()} typeforward already exists");
-            }
-
-            private void AddWin32VersionResource(string contractLocation, Assembly facade)
-            {
-                var versionInfo = FileVersionInfo.GetVersionInfo(contractLocation);
-                Version fileVersion = new Version(versionInfo.FileMajorPart, versionInfo.FileMinorPart, versionInfo.FileBuildPart, versionInfo.FilePrivatePart);
-                Version productVersion = new Version(versionInfo.ProductMajorPart, versionInfo.ProductMinorPart, versionInfo.ProductBuildPart, versionInfo.ProductPrivatePart);
-                var versionSerializer = new VersionResourceSerializer(
-                    true,
-                    versionInfo.Comments,
-                    versionInfo.CompanyName,
-                    versionInfo.FileDescription,
-                    fileVersion,
-                    versionInfo.InternalName,
-                    versionInfo.LegalCopyright,
-                    versionInfo.LegalTrademarks,
-                    versionInfo.OriginalFilename,
-                    versionInfo.ProductName,
-                    productVersion,
-                    facade.Version);
-
-                using (var stream = new MemoryStream())
-                using (var writer = new BinaryWriter(stream, Encoding.Unicode, true))
-                {
-                    versionSerializer.WriteVerResource(writer);
-
-                    var resource = new Win32Resource();
-                    resource.Id = 1;
-                    resource.TypeId = 0x10;
-                    resource.Data = stream.ToArray().ToList();
-
-                    facade.Win32Resources.Add(resource);
-                }
-            }
-
-            // This shouldn't be necessary, but CCI is putting a nonzero TypeDefId in the ExportedTypes table
-            // for nested types if NamespaceAliasForType.AliasedType is set to an ITypeDefinition
-            // so we make an ITypeReference copy as a workaround.
-            private static INamedTypeReference ConvertDefinitionToReferenceIfTypeIsNested(INamedTypeDefinition typeDef, IMetadataHost host)
-            {
-                var nestedTypeDef = typeDef as INestedTypeDefinition;
-                if (nestedTypeDef == null)
-                    return typeDef;
-
-                var typeRef = new NestedTypeReference();
-                typeRef.Copy(nestedTypeDef, host.InternFactory);
-                return typeRef;
-            }
-
-            private ICustomAttribute CreateAttribute(string typeName, IAssembly seedCoreAssembly, string argument = null)
-            {
-                var type = seedCoreAssembly.GetAllTypes().FirstOrDefault(t => t.FullName() == typeName);
-                if (type == null)
-                {
-                    throw new FacadeGenerationException(String.Format("Cannot find {0} type in seed core assembly.", typeName));
-                }
-
-                IEnumerable<IMethodDefinition> constructors = type.GetMembersNamed(_seedHost.NameTable.Ctor, false).OfType<IMethodDefinition>();
-
-                IMethodDefinition constructor = null;
-                if (argument != null)
-                {
-                    constructor = constructors.SingleOrDefault(m => m.ParameterCount == 1 && m.Parameters.First().Type.AreEquivalent("System.String"));
-                }
-                else
-                {
-                    constructor = constructors.SingleOrDefault(m => m.ParameterCount == 0);
-                }
-
-                if (constructor == null)
-                {
-                    throw new FacadeGenerationException(String.Format("Cannot find {0} constructor taking single string argument in seed core assembly.", typeName));
-                }
-
-                var attribute = new CustomAttribute();
-                attribute.Constructor = constructor;
-
-                if (argument != null)
-                {
-                    var argumentExpression = new MetadataConstant();
-                    argumentExpression.Type = _seedHost.PlatformType.SystemString;
-                    argumentExpression.Value = argument;
-
-                    attribute.Arguments = new List<IMetadataExpression>(1);
-                    attribute.Arguments.Add(argumentExpression);
-                }
-
-                return attribute;
-            }
-        }
-
-        private class ReferenceAssemblyToFacadeRewriter : MetadataRewriter
-        {
-            private IMetadataHost _seedHost;
-            private IMetadataHost _contractHost;
-            private IAssemblyReference _seedCoreAssemblyReference;
-            private bool _stripFileVersionAttributes;
-
-            public ReferenceAssemblyToFacadeRewriter(
-                IMetadataHost seedHost,
-                IMetadataHost contractHost,
-                IAssemblyReference seedCoreAssemblyReference,
-                bool stripFileVersionAttributes)
-                : base(seedHost)
-            {
-                _seedHost = seedHost;
-                _contractHost = contractHost;
-                _stripFileVersionAttributes = stripFileVersionAttributes;
-                _seedCoreAssemblyReference = seedCoreAssemblyReference;
-            }
-
-            public override IAssemblyReference Rewrite(IAssemblyReference assemblyReference)
-            {
-                if (assemblyReference == null)
-                    return assemblyReference;
-
-                if (assemblyReference.UnifiedAssemblyIdentity.Equals(_contractHost.CoreAssemblySymbolicIdentity) &&
-                    !assemblyReference.ModuleIdentity.Equals(host.CoreAssemblySymbolicIdentity))
-                {
-                    assemblyReference = _seedCoreAssemblyReference;
-                }
-
-                return base.Rewrite(assemblyReference);
-            }
-
-            public override void RewriteChildren(RootUnitNamespace rootUnitNamespace)
-            {
-                var assemblyReference = rootUnitNamespace.Unit as IAssemblyReference;
-                if (assemblyReference != null)
-                    rootUnitNamespace.Unit = Rewrite(assemblyReference).ResolvedUnit;
-
-                base.RewriteChildren(rootUnitNamespace);
-            }
-
-            public override List<INamespaceMember> Rewrite(List<INamespaceMember> namespaceMembers)
-            {
-                // Ignore traversing or rewriting any namspace members.
-                return base.Rewrite(new List<INamespaceMember>());
-            }
-
-            public override void RewriteChildren(Assembly assembly)
-            {
-                // Clear all win32 resources. The version resource will get repopulated.
-                assembly.Win32Resources = new List<IWin32Resource>();
-
-                // Remove all the references they will get repopulated while outputing.
-                assembly.AssemblyReferences.Clear();
-
-                // Remove all the module references (aka native references)
-                assembly.ModuleReferences = new List<IModuleReference>();
-
-                // Remove all file references (ex: *.nlp files in mscorlib)
-                assembly.Files = new List<IFileReference>();
-
-                // Remove all security attributes (ex: permissionset in IL)
-                assembly.SecurityAttributes = new List<ISecurityAttribute>();
-
-                // Reset the core assembly symbolic identity to the seed core assembly (e.g. mscorlib, corefx)
-                // and not the contract core (e.g. System.Runtime).
-                assembly.CoreAssemblySymbolicIdentity = _seedCoreAssemblyReference.AssemblyIdentity;
-
-                // Add reference to seed core assembly up-front so that we keep the same order as the C# compiler.
-                assembly.AssemblyReferences.Add(_seedCoreAssemblyReference);
-
-                // Remove all type definitions except for the "<Module>" type. Remove all fields and methods from it.
-                NamespaceTypeDefinition moduleType = assembly.AllTypes.SingleOrDefault(t => t.Name.Value == "<Module>") as NamespaceTypeDefinition;
-                assembly.AllTypes.Clear();
-                if (moduleType != null)
-                {
-                    moduleType.Fields?.Clear();
-                    moduleType.Methods?.Clear();
-                    assembly.AllTypes.Add(moduleType);
-                }
-
-                // Remove any preexisting typeforwards.
-                assembly.ExportedTypes = new List<IAliasForType>();
-
-                // Remove any preexisting resources.
-                assembly.Resources = new List<IResourceReference>();
-
-                // Clear the reference assembly flag from the contract.
-                // For design-time facades, it will be added back later.
-                assembly.Flags &= ~ReferenceAssemblyFlag;
-
-                // This flag should not be set until the delay-signed assembly we emit is actually signed.
-                assembly.StrongNameSigned = false;
-
-                base.RewriteChildren(assembly);
-            }
-
-            public override List<ICustomAttribute> Rewrite(List<ICustomAttribute> customAttributes)
-            {
-                if (customAttributes == null)
-                    return customAttributes;
-
-                List<ICustomAttribute> newCustomAttributes = new List<ICustomAttribute>();
-
-                // Remove all of them except for the ones that begin with Assembly
-                // Also remove AssemblyFileVersion and AssemblyInformationVersion if stripFileVersionAttributes is set
-                foreach (ICustomAttribute attribute in customAttributes)
-                {
-                    ITypeReference attributeType = attribute.Type;
-                    if (attributeType is Dummy)
-                        continue;
-
-                    string typeName = TypeHelper.GetTypeName(attributeType, NameFormattingOptions.OmitContainingNamespace | NameFormattingOptions.OmitContainingType);
-
-                    if (!typeName.StartsWith("Assembly"))
-                        continue;
-
-                    // We need to remove the signature key attribute otherwise we will not be able to re-sign these binaries.
-                    if (typeName == "AssemblySignatureKeyAttribute")
-                        continue;
-
-                    if (_stripFileVersionAttributes && ((typeName == "AssemblyFileVersionAttribute" || typeName == "AssemblyInformationalVersionAttribute")))
-                        continue;
-
-                    newCustomAttributes.Add(attribute);
-                }
-                return base.Rewrite(newCustomAttributes);
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.GenFacades/ILRewriter/GenFacadesTask.cs b/src/Microsoft.DotNet.GenFacades/ILRewriter/GenFacadesTask.cs
deleted file mode 100644
index 3eb2988b9c2..00000000000
--- a/src/Microsoft.DotNet.GenFacades/ILRewriter/GenFacadesTask.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.DotNet.Build.Tasks;
-using Microsoft.Cci.Extensions;
-using System;
-using System.Diagnostics;
-using System.Linq;
-using MSBuild = Microsoft.Build.Utilities;
-
-namespace Microsoft.DotNet.GenFacades.ILRewriter
-{
-    /// <summary>
-    /// Runs GenFacades In-Proc.
-    /// </summary>
-    public sealed class GenFacadesTask : BuildTask
-    {
-        [Required]
-        public string Seeds { get; set; }
-
-        [Required]
-        public string Contracts { get; set; }
-
-        [Required]
-        public string FacadePath { get; set; }
-
-        public Version AssemblyFileVersion { get; set; }
-
-        public bool ClearBuildAndRevision { get; set; }
-
-        public bool IgnoreMissingTypes { get; set; }
-
-        public bool IgnoreBuildAndRevisionMismatch { get; set; }
-
-        public bool BuildDesignTimeFacades { get; set; }
-
-        public string InclusionContracts { get; set; }
-
-        public string SeedLoadErrorTreatment { get; set; }
-
-        public string ContractLoadErrorTreatment { get; set; }
-
-        public ITaskItem[] SeedTypePreferencesUnsplit { get; set; }
-
-        public bool ForceZeroVersionSeeds { get; set; }
-
-        public bool ProducePdb { get; set; } = true;
-
-        public string PartialFacadeAssemblyPath { get; set; }
-
-        public bool BuildPartialReferenceFacade { get; set; }
-
-        public override bool Execute()
-        {
-            TraceLogger logger = new TraceLogger(Log);
-
-            try
-            {
-                Trace.Listeners.Add(logger);
-                ErrorTreatment seedLoadErrorTreatment = ErrorTreatment.Default;
-                ErrorTreatment contractLoadErrorTreatment = ErrorTreatment.Default;
-
-                if (SeedLoadErrorTreatment != null)
-                {
-                    seedLoadErrorTreatment = (ErrorTreatment)Enum.Parse(typeof(ErrorTreatment), SeedLoadErrorTreatment);
-                }
-                if (ContractLoadErrorTreatment != null)
-                {
-                    contractLoadErrorTreatment = (ErrorTreatment)Enum.Parse(typeof(ErrorTreatment), ContractLoadErrorTreatment);
-                }
-
-                string[] seedTypePreferencesUnsplit = null;
-                if (SeedTypePreferencesUnsplit != null)
-                {
-                    seedTypePreferencesUnsplit = SeedTypePreferencesUnsplit.Select(iti => $"{iti.ItemSpec}={iti.GetMetadata("Assembly")}").ToArray();
-                    Trace.WriteLine("seedTypePreferencesUnsplit: " + string.Join(" || ", seedTypePreferencesUnsplit));
-                }
-
-                bool result = Generator.Execute(
-                    Seeds,
-                    Contracts,
-                    FacadePath,
-                    AssemblyFileVersion,
-                    ClearBuildAndRevision,
-                    IgnoreMissingTypes,
-                    IgnoreBuildAndRevisionMismatch,
-                    BuildDesignTimeFacades,
-                    InclusionContracts,
-                    seedLoadErrorTreatment,
-                    contractLoadErrorTreatment,
-                    seedTypePreferencesUnsplit,
-                    ForceZeroVersionSeeds,
-                    ProducePdb,
-                    PartialFacadeAssemblyPath,
-                    BuildPartialReferenceFacade);
-
-                if (!result)
-                {
-                    Log.LogError("Errors were encountered when generating facade(s).");
-                }
-
-                return result;
-            }
-            catch (Exception e)
-            {
-                Log.LogErrorFromException(e, showStackTrace: false);
-                return false;
-            }
-            finally
-            {
-                Trace.Listeners.Remove(logger);
-            }
-        }
-    }
-
-    // Trace listener which writes to the MSBuild log.
-    public class TraceLogger : TraceListener
-    {
-        private readonly ILog _log;
-
-        public TraceLogger(ILog log)
-        {
-            _log = log;
-        }
-
-        public override void TraceEvent(TraceEventCache eventCache, String source, TraceEventType eventType, int id, string message)
-        {
-            TraceEvent(eventCache, source, eventType, id, message, null);
-        }
-
-        public override void TraceEvent(TraceEventCache eventCache, String source, TraceEventType eventType, int id, string format, params object[] args)
-        {
-            string message = args == null ? format : string.Format(format, args);
-
-            if (eventType == TraceEventType.Error)
-            {
-                // Disabled until we fix warnings -https://github.com/dotnet/corefx/issues/29861
-                //_log.LogError(message);
-                _log.LogWarning(message);
-            }
-            else if (eventType == TraceEventType.Warning)
-            {
-                _log.LogWarning(message);
-            }
-            else
-            {
-                _log.LogMessage(message);
-            }
-        }        
-
-        public override void Write(string message)
-        {
-            _log.LogMessage(message);
-        }
-
-        public override void WriteLine(string message)
-        {
-            _log.LogMessage(message + Environment.NewLine);
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.GenFacades/ILRewriter/TypeReferenceRewriter.cs b/src/Microsoft.DotNet.GenFacades/ILRewriter/TypeReferenceRewriter.cs
deleted file mode 100644
index 4291c29c24e..00000000000
--- a/src/Microsoft.DotNet.GenFacades/ILRewriter/TypeReferenceRewriter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.Cci;
-using Microsoft.Cci.MutableCodeModel;
-using System;
-
-namespace Microsoft.DotNet.GenFacades.ILRewriter
-{
-    internal sealed class TypeReferenceRewriter : MetadataRewriter
-    {
-        private readonly Func<ITypeReference, ITypeReference> transform;
-
-        public TypeReferenceRewriter(IMetadataHost host, Func<ITypeReference, ITypeReference> transform): base(host, true)
-        {
-            this.transform = transform;
-        }
-
-        T TransformType<T>(T oldValue) where T: class, ITypeReference
-        {
-            return transform(oldValue) as T;
-        }
-
-        public override INamespaceTypeReference Rewrite(INamespaceTypeReference namespaceTypeReference)
-        {
-            return base.Rewrite(TransformType(namespaceTypeReference));
-        }
-
-        public override INestedTypeReference Rewrite(INestedTypeReference nestedTypeReference)
-        {
-            return base.Rewrite(TransformType(nestedTypeReference));
-        }
-
-        public override void RewriteChildren(GenericTypeInstanceReference genericTypeInstanceReference)
-        {
-            genericTypeInstanceReference.GenericType = TransformType(genericTypeInstanceReference.GenericType);
-            base.RewriteChildren(genericTypeInstanceReference);
-            genericTypeInstanceReference.GenericArguments = this.Rewrite(genericTypeInstanceReference.GenericArguments);
-            genericTypeInstanceReference.GenericType = this.Rewrite(genericTypeInstanceReference.GenericType);
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.GenFacades/ILRewriter/VersionResourceSerializer.cs b/src/Microsoft.DotNet.GenFacades/ILRewriter/VersionResourceSerializer.cs
deleted file mode 100644
index 94c1534b386..00000000000
--- a/src/Microsoft.DotNet.GenFacades/ILRewriter/VersionResourceSerializer.cs
+++ /dev/null
@@ -1,279 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-// This code is from Roslyn/Source/Compilers/Core/CvtRes.cs
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-using DWORD = System.UInt32;
-using WCHAR = System.Char;
-using WORD = System.UInt16;
-
-namespace Microsoft.DotNet.GenFacades.ILRewriter
-{
-    internal class VersionResourceSerializer
-    {
-        private readonly string _commentsContents;
-        private readonly string _companyNameContents;
-        private readonly string _fileDescriptionContents;
-        private readonly Version _fileVersion;
-        private readonly string _internalNameContents;
-        private readonly string _legalCopyrightContents;
-        private readonly string _legalTrademarksContents;
-        private readonly string _originalFileNameContents;
-        private readonly string _productNameContents;
-        private readonly Version _productVersion;
-        private readonly Version _assemblyVersion;
-
-        private const string vsVersionInfoKey = "VS_VERSION_INFO";
-        private const string varFileInfoKey = "VarFileInfo";
-        private const string translationKey = "Translation";
-        private const string stringFileInfoKey = "StringFileInfo";
-        private readonly string _langIdAndCodePageKey; //should be 8 characters
-        private const DWORD CP_WINUNICODE = 1200;
-
-        private const ushort sizeVS_FIXEDFILEINFO = sizeof(DWORD) * 13;
-        private readonly bool _isDll;
-
-        internal VersionResourceSerializer(bool isDll, string comments, string companyName, string fileDescription, Version fileVersion,
-            string internalName, string legalCopyright, string legalTrademark, string originalFileName, string productName, Version productVersion,
-            Version assemblyVersion)
-        {
-            _isDll = isDll;
-            _commentsContents = comments;
-            _companyNameContents = companyName;
-            _fileDescriptionContents = fileDescription;
-            _fileVersion = fileVersion;
-            _internalNameContents = internalName;
-            _legalCopyrightContents = legalCopyright;
-            _legalTrademarksContents = legalTrademark;
-            _originalFileNameContents = originalFileName;
-            _productNameContents = productName;
-            _productVersion = productVersion;
-            _assemblyVersion = assemblyVersion;
-            _langIdAndCodePageKey = System.String.Format("{0:x4}{1:x4}", 0 /*langId*/, CP_WINUNICODE /*codepage*/);
-        }
-
-        private const uint VFT_APP = 0x00000001;
-        private const uint VFT_DLL = 0x00000002;
-
-        private IEnumerable<KeyValuePair<string, string>> GetVerStrings()
-        {
-            if (_commentsContents != null) yield return new KeyValuePair<string, string>("Comments", _commentsContents);
-            if (_companyNameContents != null) yield return new KeyValuePair<string, string>("CompanyName", _companyNameContents);
-            if (_fileDescriptionContents != null) yield return new KeyValuePair<string, string>("FileDescription", _fileDescriptionContents);
-            if (_fileVersion != null) yield return new KeyValuePair<string, string>("FileVersion", _fileVersion.ToString());
-            if (_internalNameContents != null) yield return new KeyValuePair<string, string>("InternalName", _internalNameContents);
-            if (_legalCopyrightContents != null) yield return new KeyValuePair<string, string>("LegalCopyright", _legalCopyrightContents);
-            if (_legalTrademarksContents != null) yield return new KeyValuePair<string, string>("LegalTrademarks", _legalTrademarksContents);
-            if (_originalFileNameContents != null) yield return new KeyValuePair<string, string>("OriginalFilename", _originalFileNameContents);
-            if (_productNameContents != null) yield return new KeyValuePair<string, string>("ProductName", _productNameContents);
-            if (_productVersion != null) yield return new KeyValuePair<string, string>("ProductVersion", _productVersion.ToString());
-            if (_assemblyVersion != null) yield return new KeyValuePair<string, string>("Assembly Version", _assemblyVersion.ToString());
-        }
-
-        private uint FileType { get { return (_isDll) ? VFT_DLL : VFT_APP; } }
-
-        private void WriteVSFixedFileInfo(BinaryWriter writer)
-        {
-            writer.Write((DWORD)0xFEEF04BD);
-            writer.Write((DWORD)0x00010000);
-            writer.Write((DWORD)(_fileVersion.Major << 16) | (uint)_fileVersion.Minor);
-            writer.Write((DWORD)(_fileVersion.Build << 16) | (uint)_fileVersion.Revision);
-            writer.Write((DWORD)(_productVersion.Major << 16) | (uint)_productVersion.Minor);
-            writer.Write((DWORD)(_productVersion.Build << 16) | (uint)_productVersion.Revision);
-            writer.Write((DWORD)0x0000003F);   //VS_FFI_FILEFLAGSMASK  (EDMAURER) really? all these bits are valid?
-            writer.Write((DWORD)0);    //file flags
-            writer.Write((DWORD)0x00000004);   //VOS__WINDOWS32
-            writer.Write((DWORD)this.FileType);
-            writer.Write((DWORD)0);    //file subtype
-            writer.Write((DWORD)0);    //date most sig
-            writer.Write((DWORD)0);    //date least sig
-        }
-
-        /// <summary>
-        /// Assume that 3 WORDs preceded this string and that the they began 32-bit aligned.
-        /// Given the string length compute the number of bytes that should be written to end
-        /// the buffer on a 32-bit boundary</summary>
-        /// <param name="cb"></param>
-        /// <returns></returns>
-        private static int PadKeyLen(int cb)
-        {
-            //add previously written 3 WORDS, round up, then subtract the 3 WORDS.
-            return PadToDword(cb + 3 * sizeof(WORD)) - 3 * sizeof(WORD);
-        }
-        /// <summary>
-        /// assuming the length of bytes submitted began on a 32-bit boundary,
-        /// round up this length as necessary so that it ends at a 32-bit boundary.
-        /// </summary>
-        /// <param name="cb"></param>
-        /// <returns></returns>
-        private static int PadToDword(int cb)
-        {
-            return (cb + 3) & ~3;
-        }
-
-        private const int HDRSIZE = 3 * sizeof(ushort);
-
-        private static ushort SizeofVerString(string lpszKey, string lpszValue)
-        {
-            int cbKey, cbValue;
-
-            cbKey = (lpszKey.Length + 1) * 2;  // Make room for the NULL
-            cbValue = (lpszValue.Length + 1) * 2;
-            if (cbKey + cbValue >= 0xFFF0)
-                return 0xFFFF;
-
-            return (ushort)(PadKeyLen(cbKey) +    // key, 0 padded to DWORD boundary
-                            PadToDword(cbValue) +  // value, 0 padded to dword boundary
-                            HDRSIZE);             // block header.
-        }
-
-        private static void WriteVersionString(KeyValuePair<string, string> keyValuePair, BinaryWriter writer)
-        {
-            System.Diagnostics.Debug.Assert(keyValuePair.Value != null);
-
-            ushort cbBlock = SizeofVerString(keyValuePair.Key, keyValuePair.Value);
-            int cbKey = (keyValuePair.Key.Length + 1) * 2;     // includes terminating NUL
-            int cbVal = (keyValuePair.Value.Length + 1) * 2;     // includes terminating NUL
-
-            var startPos = writer.BaseStream.Position;
-
-            writer.Write((WORD)cbBlock);
-            writer.Write((WORD)(keyValuePair.Value.Length + 1)); //add 1 for nul
-            writer.Write((WORD)1);
-            writer.Write(keyValuePair.Key.ToCharArray());
-            writer.Write((WORD)'\0');
-            writer.Write(new byte[PadKeyLen(cbKey) - cbKey]);
-            writer.Write(keyValuePair.Value.ToCharArray());
-            writer.Write((WORD)'\0');
-            writer.Write(new byte[PadToDword(cbVal) - cbVal]);
-
-            System.Diagnostics.Debug.Assert(cbBlock == writer.BaseStream.Position - startPos);
-        }
-
-        /// <summary>
-        /// compute number of chars needed to end up on a 32-bit boundary assuming that three
-        /// WORDS preceded this string.
-        /// </summary>
-        /// <param name="sz"></param>
-        /// <returns></returns>
-        private static int KEYSIZE(string sz)
-        {
-            return PadKeyLen((sz.Length + 1) * sizeof(WCHAR)) / sizeof(WCHAR);
-        }
-        private static int KEYBYTES(string sz)
-        {
-            return KEYSIZE(sz) * sizeof(WCHAR);
-        }
-
-        private int GetStringsSize()
-        {
-            return GetVerStrings().Aggregate(0, (curSum, pair) => SizeofVerString(pair.Key, pair.Value) + curSum);
-        }
-
-        internal int GetDataSize()
-        {
-            int sizeEXEVERRESOURCE = sizeof(WORD) * 3 * 5 + 2 * sizeof(WORD) + //five headers + two words for CP and lang
-                KEYBYTES(vsVersionInfoKey) +
-                KEYBYTES(varFileInfoKey) +
-                KEYBYTES(translationKey) +
-                KEYBYTES(stringFileInfoKey) +
-                KEYBYTES(_langIdAndCodePageKey) +
-                sizeVS_FIXEDFILEINFO;
-
-            return GetStringsSize() + sizeEXEVERRESOURCE;
-        }
-
-        internal void WriteVerResource(BinaryWriter writer)
-        {
-            /*
-                must be assumed to start on a 32-bit boundary.
-             * 
-             * the sub-elements of the VS_VERSIONINFO consist of a header (3 WORDS) a string
-             * and then beginning on the next 32-bit boundary, the elements children
-                 
-                struct VS_VERSIONINFO
-                {
-                    WORD cbRootBlock;                                     // size of whole resource
-                    WORD cbRootValue;                                     // size of VS_FIXEDFILEINFO structure
-                    WORD fRootText;                                       // root is text?
-                    WCHAR szRootKey[KEYSIZE("VS_VERSION_INFO")];          // Holds "VS_VERSION_INFO"
-                    VS_FIXEDFILEINFO vsFixed;                             // fixed information.
-                    WORD cbVarBlock;                                      // size of VarFileInfo block
-                    WORD cbVarValue;                                      // always 0
-                    WORD fVarText;                                        // VarFileInfo is text?
-                    WCHAR szVarKey[KEYSIZE("VarFileInfo")];               // Holds "VarFileInfo"
-                    WORD cbTransBlock;                                    // size of Translation block
-                    WORD cbTransValue;                                    // size of Translation value
-                    WORD fTransText;                                      // Translation is text?
-                    WCHAR szTransKey[KEYSIZE("Translation")];             // Holds "Translation"
-                    WORD langid;                                          // language id
-                    WORD codepage;                                        // codepage id
-                    WORD cbStringBlock;                                   // size of StringFileInfo block
-                    WORD cbStringValue;                                   // always 0
-                    WORD fStringText;                                     // StringFileInfo is text?
-                    WCHAR szStringKey[KEYSIZE("StringFileInfo")];         // Holds "StringFileInfo"
-                    WORD cbLangCpBlock;                                   // size of language/codepage block
-                    WORD cbLangCpValue;                                   // always 0
-                    WORD fLangCpText;                                     // LangCp is text?
-                    WCHAR szLangCpKey[KEYSIZE("12345678")];               // Holds hex version of language/codepage
-                    // followed by strings
-                };
-            */
-
-            var debugPos = writer.BaseStream.Position;
-            var dataSize = GetDataSize();
-
-            writer.Write((WORD)dataSize);
-            writer.Write((WORD)sizeVS_FIXEDFILEINFO);
-            writer.Write((WORD)0);
-            writer.Write(vsVersionInfoKey.ToCharArray());
-            writer.Write(new byte[KEYBYTES(vsVersionInfoKey) - vsVersionInfoKey.Length * 2]);
-            System.Diagnostics.Debug.Assert((writer.BaseStream.Position & 3) == 0);
-            WriteVSFixedFileInfo(writer);
-            writer.Write((WORD)(sizeof(WORD) * 2 + 2 * HDRSIZE + KEYBYTES(varFileInfoKey) + KEYBYTES(translationKey)));
-            writer.Write((WORD)0);
-            writer.Write((WORD)1);
-            writer.Write(varFileInfoKey.ToCharArray());
-            writer.Write(new byte[KEYBYTES(varFileInfoKey) - varFileInfoKey.Length * 2]);   //padding
-            System.Diagnostics.Debug.Assert((writer.BaseStream.Position & 3) == 0);
-            writer.Write((WORD)(sizeof(WORD) * 2 + HDRSIZE + KEYBYTES(translationKey)));
-            writer.Write((WORD)(sizeof(WORD) * 2));
-            writer.Write((WORD)0);
-            writer.Write(translationKey.ToCharArray());
-            writer.Write(new byte[KEYBYTES(translationKey) - translationKey.Length * 2]);   //padding
-            System.Diagnostics.Debug.Assert((writer.BaseStream.Position & 3) == 0);
-            writer.Write((WORD)0);      //langId; MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL)) = 0
-            writer.Write((WORD)CP_WINUNICODE);   //codepage; 1200 = CP_WINUNICODE
-            System.Diagnostics.Debug.Assert((writer.BaseStream.Position & 3) == 0);
-            writer.Write((WORD)(2 * HDRSIZE + KEYBYTES(stringFileInfoKey) + KEYBYTES(_langIdAndCodePageKey) + GetStringsSize()));
-            writer.Write((WORD)0);
-            writer.Write((WORD)1);
-            writer.Write(stringFileInfoKey.ToCharArray());      //actually preceded by 5 WORDS so not consistent with the
-            //assumptions of KEYBYTES, but equivalent.
-            writer.Write(new byte[KEYBYTES(stringFileInfoKey) - stringFileInfoKey.Length * 2]); //padding. 
-            System.Diagnostics.Debug.Assert((writer.BaseStream.Position & 3) == 0);
-            writer.Write((WORD)(HDRSIZE + KEYBYTES(_langIdAndCodePageKey) + GetStringsSize()));
-            writer.Write((WORD)0);
-            writer.Write((WORD)1);
-            writer.Write(_langIdAndCodePageKey.ToCharArray());
-            writer.Write(new byte[KEYBYTES(_langIdAndCodePageKey) - _langIdAndCodePageKey.Length * 2]); //padding
-            System.Diagnostics.Debug.Assert((writer.BaseStream.Position & 3) == 0);
-
-            System.Diagnostics.Debug.Assert(writer.BaseStream.Position - debugPos == dataSize - GetStringsSize());
-            debugPos = writer.BaseStream.Position;
-
-            foreach (var entry in GetVerStrings())
-            {
-                System.Diagnostics.Debug.Assert(entry.Value != null);
-                WriteVersionString(entry, writer);
-            }
-
-            System.Diagnostics.Debug.Assert(writer.BaseStream.Position - debugPos == GetStringsSize());
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
index f79632b9289..bca9958d17e 100644
--- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
+++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;$(TargetFrameworkForNETSDK)</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworkForNETSDK);net472</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworkForNETSDK)</TargetFrameworks>
-    <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
     <PackageType>MSBuildSdk</PackageType>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsPackable>true</IsPackable>
@@ -21,24 +20,6 @@
     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
   </ItemGroup>
 
-  <!-- Required for compiling Microsoft.DotNet.GenFacades.ILRewriter -->
-  <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-    <PackageReference Include="Microsoft.Cci" Version="$(MicrosoftCciVersion)" />
-    <PackageReference Include="Microsoft.DiaSymReader.Converter" Version="$(MicrosoftDiaSymReaderConverterVersion)" />
-    <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" />
-    <PackageReference Include="System.Diagnostics.TextWriterTraceListener" Version="4.0.0" />
-    <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-    <ProjectReference Include="..\Microsoft.Cci.Extensions\Microsoft.Cci.Extensions.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
-    <Compile Remove="ILRewriter\**" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
     <Compile Include="..\Common\Internal\AssemblyResolver.cs" />
     <Compile Include="..\Common\Internal\BuildTask.Desktop.cs" />
@@ -48,19 +29,6 @@
     <Compile Include="..\Common\Internal\BuildTask.cs" />
   </ItemGroup>
 
-  <!-- On Core, these native binaries wind up in the Runtimes folder of this package. For Desktop, we have to manually mark them to get them packed -->
-  <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(DotNetBuildFromSource)' != 'true'">
-    <None Include="$(NuGetPackageRoot)\microsoft.diasymreader.native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.x86.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>false</Visible>
-    </None>
-    <None Include="$(NuGetPackageRoot)\microsoft.diasymreader.native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\win\native\Microsoft.DiaSymReader.Native.amd64.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>false</Visible>
-    </None>
-  </ItemGroup>
-
-
   <Import Project="$(RepoRoot)eng\BuildTask.targets" />
 
 </Project>
diff --git a/src/Microsoft.DotNet.GenFacades/NotSupportedAssemblyGenerator.cs b/src/Microsoft.DotNet.GenFacades/NotSupportedAssemblyGenerator.cs
index a79c72099b9..235f10e4c5c 100644
--- a/src/Microsoft.DotNet.GenFacades/NotSupportedAssemblyGenerator.cs
+++ b/src/Microsoft.DotNet.GenFacades/NotSupportedAssemblyGenerator.cs
@@ -31,60 +31,55 @@ public override bool Execute()
             if (SourceFiles == null || SourceFiles.Length == 0)
             {
                 Log.LogError("There are no ref source files.");
+                return false;
             }
-            else
-            {
-                GenerateNotSupportedAssemblyFiles(SourceFiles);
-            }
+
+            GenerateNotSupportedAssemblyFiles(SourceFiles);
+
             return !Log.HasLoggedErrors;
         }
 
         private void GenerateNotSupportedAssemblyFiles(IEnumerable<ITaskItem> sourceFiles)
         {
+            string[] apiExclusions = null;
+            if (!string.IsNullOrEmpty(ApiExclusionListPath) && File.Exists(ApiExclusionListPath))
+            {
+                apiExclusions = File.ReadAllLines(ApiExclusionListPath);
+            }
+
             foreach (ITaskItem item in sourceFiles)
             {
                 string sourceFile = item.ItemSpec;
-                if (string.IsNullOrEmpty(sourceFile))
-                {
-                    continue;
-                }
+                string outputPath = item.GetMetadata("OutputPath");
+
                 if (!File.Exists(sourceFile))
                 {
                     Log.LogError($"File {sourceFile} was not found.");
                     continue;
                 }
-                string text = GenerateNotSupportedAssemblyForSourceFile(sourceFile);
 
-                if(text != null)
-                    File.WriteAllText(item.GetMetadata("NotSupportedPath"), text);
+                GenerateNotSupportedAssemblyForSourceFile(sourceFile, outputPath, apiExclusions);
             }
         }
 
-        private string GenerateNotSupportedAssemblyForSourceFile(string sourceFile)
+        private void GenerateNotSupportedAssemblyForSourceFile(string sourceFile, string outputPath, string[] apiExclusions)
         {
-            string[] apiExclusions;
             SyntaxTree syntaxTree;
+
             try
             {
                 syntaxTree = CSharpSyntaxTree.ParseText(File.ReadAllText(sourceFile));
             }
             catch(Exception ex)
             {
-                Log.LogError(ex.Message);
-                return null;
+                Log.LogErrorFromException(ex, false);
+                return;
             }
 
-            if (string.IsNullOrEmpty(ApiExclusionListPath) || !File.Exists(ApiExclusionListPath))
-            {
-                apiExclusions = null;
-            }
-            else
-            {
-                apiExclusions = File.ReadAllLines(ApiExclusionListPath);
-            }
             var rewriter = new NotSupportedAssemblyRewriter(Message, apiExclusions);
             SyntaxNode root = rewriter.Visit(syntaxTree.GetRoot());
-            return root.GetText().ToString();
+            string text = root.GetText().ToString();
+            File.WriteAllText(outputPath, text);
         }
     }
 
@@ -127,6 +122,22 @@ public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node)
             return node.WithBody(block);
         }
 
+        public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax node)
+        {
+            if (_exclusionApis != null && _exclusionApis.Contains(GetPropertyDefinition(node)))
+                return null;
+
+            return base.VisitPropertyDeclaration(node);
+        }
+
+        public override SyntaxNode VisitEventDeclaration(EventDeclarationSyntax node)
+        {
+            if (_exclusionApis != null && _exclusionApis.Contains(GetEventDefinition(node)))
+                return null;
+
+            return base.VisitEventDeclaration(node);
+        }
+
         public override SyntaxNode VisitClassDeclaration(ClassDeclarationSyntax node)
         {
             if (_exclusionApis != null && _exclusionApis.Contains(GetFullyQualifiedName(node)))
@@ -194,7 +205,11 @@ private string GetFullyQualifiedName(TypeDeclarationSyntax node)
         private string GetFullyQualifiedName(NamespaceDeclarationSyntax node) => node.Name.ToFullString().Trim();
 
         private string GetMethodDefinition(MethodDeclarationSyntax node) => GetFullyQualifiedName((TypeDeclarationSyntax)node.Parent) + "." + node.Identifier.ValueText;
-    
+
+        private string GetPropertyDefinition(PropertyDeclarationSyntax node) => GetFullyQualifiedName((TypeDeclarationSyntax)node.Parent) + "." + node.Identifier.ValueText;
+
+        private string GetEventDefinition(EventDeclarationSyntax node) => GetFullyQualifiedName((TypeDeclarationSyntax)node.Parent) + "." + node.Identifier.ValueText;
+
         private string GetDefaultMessage() => "{ throw new System.PlatformNotSupportedException(" + $"{ _message }); " + " }\n";
     }
 }
diff --git a/src/Microsoft.DotNet.GenFacades/SourceGenerator.cs b/src/Microsoft.DotNet.GenFacades/SourceGenerator.cs
index f7014698b41..b34212138a4 100644
--- a/src/Microsoft.DotNet.GenFacades/SourceGenerator.cs
+++ b/src/Microsoft.DotNet.GenFacades/SourceGenerator.cs
@@ -47,7 +47,7 @@ public bool GenerateSource(
 
             StringBuilder sb = new StringBuilder();
             sb.AppendLine("// <auto-generated/>"); // Adding this because the following code is autogenerated.
-            sb.AppendLine("#pragma warning disable CS0618"); // Adding this to avoid warnings while adding typeforwards for obselete types.
+            sb.AppendLine("#pragma warning disable CS0618,CA2252"); // Adding this to avoid warnings while adding typeforwards for obselete types. CA2252 suppresses warnings on preview APIs
 
             bool result = true;
 
diff --git a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets
index 06bf66277c6..9a6f0feea61 100644
--- a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets
+++ b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets
@@ -2,17 +2,11 @@
 <Project>
 
   <PropertyGroup>
-    <_MicrosoftDotNetGenFacadesTaskDir Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)../tools/netcoreapp3.1/</_MicrosoftDotNetGenFacadesTaskDir>
-    <_MicrosoftDotNetGenFacadesTaskDir Condition="'$(MSBuildRuntimeType)' != 'core'">$(MSBuildThisFileDirectory)../tools/net472/</_MicrosoftDotNetGenFacadesTaskDir>
+    <GenFacadesTargetAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.GenFacades.dll</GenFacadesTargetAssemblyPath>
+    <GenFacadesTargetAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.GenFacades.dll</GenFacadesTargetAssemblyPath>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <GenFacadesTargetAssemblyPath Condition="'$(GenFacadesTargetAssemblyPath)' == ''">$(_MicrosoftDotNetGenFacadesTaskDir)Microsoft.DotNet.GenFacades.dll</GenFacadesTargetAssemblyPath>
-  </PropertyGroup>
-
-  <UsingTask TaskName="GenFacadesTask" AssemblyFile="$(GenFacadesTargetAssemblyPath)" />
-
-  <Import Condition="'$(IsPartialFacadeAssembly)' == 'true' AND '$(IsReferenceAssembly)' != 'true'" Project="Microsoft.DotNet.GenPartialFacadeSource.targets" />
-  <Import Condition="'$(IsPartialFacadeAssembly)' == 'true' AND '$(IsReferenceAssembly)' == 'true'" Project="Microsoft.DotNet.GenFacadesILRewriter.targets" />
-  <Import Project="Microsoft.DotNet.GenFacadesNotSupported.targets" />
+  <Import Project="Microsoft.DotNet.GenPartialFacadeSource.targets" Condition="'$(IsPartialFacadeAssembly)' == 'true'" />
+  <Import Project="Microsoft.DotNet.GenFacadesNotSupported.targets" Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' or
+                                                                               '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''" />
 </Project>
diff --git a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacadesILRewriter.targets b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacadesILRewriter.targets
deleted file mode 100644
index b8d3f388405..00000000000
--- a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacadesILRewriter.targets
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-  <PropertyGroup>
-    <!-- reference facades will always have overlapping types so suppress compiler warnings -->
-    <NoWarn>$(NoWarn);0436</NoWarn>
-  </PropertyGroup>
-
-  <!-- Inputs and outputs of FillPartialFacade -->
-  <PropertyGroup>
-    <PartialFacadeAssemblyPath>$(IntermediateOutputPath)$(TargetName)$(TargetExt)</PartialFacadeAssemblyPath>
-    <PartialFacadeSymbols>$(IntermediateOutputPath)$(TargetName).pdb</PartialFacadeSymbols>
-    <GenFacadesInputPath>$(IntermediateOutputPath)PreGenFacades/</GenFacadesInputPath>
-    <GenFacadesInputAssembly>$(GenFacadesInputPath)$(TargetName)$(TargetExt)</GenFacadesInputAssembly>
-    <GenFacadesInputSymbols>$(GenFacadesInputPath)$(TargetName).pdb</GenFacadesInputSymbols>
-    <GenFacadesOutputPath>$(IntermediateOutputPath)</GenFacadesOutputPath>
-    <GenFacadesResponseFile>$(GenFacadesInputPath)genfacades.rsp</GenFacadesResponseFile>
-  </PropertyGroup>
-
-  <!-- Hook both partial-facade-related targets into TargetsTriggeredByCompilation. This will cause them
-          to only be invoked upon a successful compilation; they can conceptualized as an extension
-          of the assembly compilation process.
-  -->
-  <PropertyGroup>
-    <TargetsTriggeredByCompilation Condition="'$(DesignTimeBuild)' != 'true' and '$(DotNetBuildFromSource)' != 'true'">
-      $(TargetsTriggeredByCompilation);FillPartialFacadeUsingTask
-    </TargetsTriggeredByCompilation>
-  </PropertyGroup>
-
-  <!-- FillPartialFacade
-       Inputs:
-         * An "input assembly"
-         * A contract assembly
-         * Seed assemblies
-
-       Fills the "input assembly" by finding types in the contract assembly that are missing from it, and adding type-forwards
-         to those matching types in the seed assemblies.
-  -->
-  <Target Name="FillPartialFacadeUsingTask" DependsOnTargets="$(FillPartialFacadeDependsOn)">
-
-    <ItemGroup>
-      <!-- References used for compilation are automatically included as seed assemblies -->
-      <GenFacadesSeeds Include="@(ReferencePath)" />
-    </ItemGroup>
-
-    <Error Text="No single matching contract found." Condition="'$(IsReferenceAssembly)' != 'true' and '@(ResolvedMatchingContract->Count())' != '1'" />
-
-    <MakeDir Directories="$(GenFacadesInputPath)" />
-
-    <!-- Move the assembly into a subdirectory for GenFacades -->
-    <Move SourceFiles="$(PartialFacadeAssemblyPath)"
-          DestinationFolder="$(GenFacadesInputPath)"
-    />
-
-    <PropertyGroup>
-      <ProducePdb>true</ProducePdb>
-      <!-- Partial facade PDB generation only functions on Windows -->
-      <ProducePdb Condition="'$(DebugSymbols)' == 'false' or '$(OS)' != 'Windows_NT'">false</ProducePdb>
-      <GenFacadesIgnoreMissingTypes Condition="'$(GenFacadesIgnoreMissingTypes)' == ''">false</GenFacadesIgnoreMissingTypes>
-      <GenFacadesIgnoreBuildAndRevisionMismatch Condition="'$(GenFacadesIgnoreBuildAndRevisionMismatch)' == ''">false</GenFacadesIgnoreBuildAndRevisionMismatch>
-    </PropertyGroup>
-
-    <!-- Move the PDB into a subdirectory for GenFacades if we are producing PDBs -->
-    <Move SourceFiles="$(PartialFacadeSymbols)"
-          DestinationFolder="$(GenFacadesInputPath)"
-          Condition="$(ProducePdb)" />
-
-    <PropertyGroup Condition="'$(IsReferenceAssembly)' == 'true'">
-      <GenFacadesContracts>$(GenFacadesInputAssembly)</GenFacadesContracts>
-      <GenFacadesBuildPartialReferenceFacade>true</GenFacadesBuildPartialReferenceFacade>
-    </PropertyGroup>
-
-    <GenFacadesTask
-      PartialFacadeAssemblyPath="$(GenFacadesPartialFacadeAssemblyPath)"
-      Contracts="$(GenFacadesContracts)"
-      Seeds="@(GenFacadesSeeds, ',')"
-      FacadePath="$(GenFacadesOutputPath.TrimEnd('/'))"
-      SeedTypePreferencesUnsplit="@(SeedTypePreference)"
-      ProducePdb="$(ProducePdb)"
-      ClearBuildAndRevision="$(GenFacadesClearBuildAndRevision)"
-      IgnoreMissingTypes="$(GenFacadesIgnoreMissingTypes)"
-      IgnoreBuildAndRevisionMismatch="$(GenFacadesIgnoreBuildAndRevisionMismatch)"
-      BuildDesignTimeFacades="$(GenFacadesBuildDesignTimeFacades)"
-      InclusionContracts="$(GenFacadesInclusionContracts)"
-      SeedLoadErrorTreatment="$(GenFacadesSeedLoadErrorTreatment)"
-      ContractLoadErrorTreatment="$(GenFacadesContractLoadErrorTreatment)"
-      ForceZeroVersionSeeds="$(GenFacadesForceZeroVersionSeeds)"
-      BuildPartialReferenceFacade="$(GenFacadesBuildPartialReferenceFacade)"
-    />
-
-    <ItemGroup>
-      <FileWrites Include="$(GenFacadesInputAssembly)" />
-      <FileWrites Include="$(GenFacadesInputSymbols)" />
-    </ItemGroup>
-  </Target> 
-</Project>
diff --git a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacadesNotSupported.targets b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacadesNotSupported.targets
index 8682b0bcff4..a071dd35b9b 100644
--- a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacadesNotSupported.targets
+++ b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacadesNotSupported.targets
@@ -4,68 +4,61 @@
   <UsingTask TaskName="NotSupportedAssemblyGenerator" AssemblyFile="$(GenFacadesTargetAssemblyPath)" />
 
   <PropertyGroup Condition="'$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
-    <CoreCompileDependsOn>UpdateRefToNonSupportedAssembly;$(CoreCompileDependsOn)</CoreCompileDependsOn>
+    <CoreCompileDependsOn>AddGenFacadeNotSupportedCompileItem;$(CoreCompileDependsOn)</CoreCompileDependsOn>
     <!-- Not supported sources are created from the ref assembly, we currently don't produce finalizers in dummy assemblies, so we disable ApiCompat to not fail. -->
     <RunApiCompat>false</RunApiCompat>
     <!-- The refs contains some unsed private fields and empty finalizers.-->
     <NoWarn>$(NoWarn);CA1823;CA1821;CS0169</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' or '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
-    <AssemblyMetadata Include="NotSupported">
-      <Value>True</Value>
-    </AssemblyMetadata>
+  <ItemGroup>
+    <AssemblyMetadata Include="NotSupported" Value="True" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
     <ProjectReference Include="$(ContractProject)">
-      <Targets>GetCompileItems</Targets>
+      <Targets>SourceFilesProjectOutputGroup</Targets>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>ReferenceSources</OutputItemType>
+      <OutputItemType>_contractSourceFilesGroup</OutputItemType>
       <!-- MSBuild ignores the Target name in these cases and invokes GetTargetPath, avoid that by disabling build -->
       <BuildReference Condition="'$(BuildingInsideVisualStudio)' == 'true' or '$(BuildProjectReferences)' != 'true'">false</BuildReference>
     </ProjectReference>
   </ItemGroup>
 
-  <Target Name="GetCompileItems"
-          Returns="@(CompileItemsWithFullPath)">
-    <ItemGroup>
-      <!-- Filtering out the files in the ref folder. -->
-      <CompileItemsWithRootedPath Include="@(Compile -> '$([System.IO.Path]::GetFullPath('%(Compile.Identity)'))')" IsRooted="$([System.IO.Path]::IsPathRooted('%(Compile.Identity)'))" />
-      <CompileItemsWithFullPath Include="@(CompileItemsWithRootedPath)" Condition="'%(IsRooted)' == 'false'" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="GenerateNotSupportedAssemblySourceFromRef">
+  <Target Name="_GetGenFacadeNotSupportedCompileInputs">
     <!-- Populates the Reference Sources while building in VS-->
     <MSBuild
       Projects="@(ProjectReference)"
-      Targets="GetCompileItems"
+      Targets="SourceFilesProjectOutputGroup"
       Properties="%(ProjectReference.SetTargetFramework)"
-      Condition="'%(ProjectReference.Targets)' == 'GetCompileItems' and ('$(BuildingInsideVisualStudio)' == 'true' or '$(BuildProjectReferences)' != 'true')">
-      <Output TaskParameter="TargetOutputs" ItemName="ReferenceSources" />
+      Condition="'%(ProjectReference.Targets)' == 'SourceFilesProjectOutputGroup' and ('$(BuildingInsideVisualStudio)' == 'true' or '$(BuildProjectReferences)' != 'true')">
+      <Output TaskParameter="TargetOutputs" ItemName="_contractSourceFilesGroup" />
     </MSBuild>
-    
+
     <ItemGroup>
-      <UpdateReferencePaths Include="@(ReferenceSources)" NotSupportedPath="$(IntermediateOutputPath)\%(Filename).notsupported%(Extension)"/>
+      <_contractSourceFilesGroup IsRooted="$([System.IO.Path]::IsPathRooted('%(_contractSourceFilesGroup.OriginalItemSpec)'))" />
+      <!-- Filtering out the files from the ref folder. -->
+      <GenFacadeNotSupportedCompileInput Include="@(_contractSourceFilesGroup->WithMetadataValue('Extension', '.cs')->WithMetadataValue('IsRooted', 'false'))"
+                                         OutputPath="$(IntermediateOutputPath)%(Filename).notsupported%(Extension)" />
     </ItemGroup>
   </Target>
 
-  <Target Name="UpdateRefToNonSupportedAssembly"
-        DependsOnTargets="GenerateNotSupportedAssemblySourceFromRef"
-        AfterTargets="ResolveProjectReferences"
-        Condition="'$(GeneratePlatformNotSupportedAssemblyMessage)' != ''"
-        Inputs="@(UpdateReferencePaths)"
-        Outputs="@(UpdateReferencePaths->'%(NotSupportedPath)')" >
+  <Target Name="AddGenFacadeNotSupportedCompileItem"
+          DependsOnTargets="_GetGenFacadeNotSupportedCompileInputs"
+          AfterTargets="ResolveProjectReferences"
+          Condition="'$(GeneratePlatformNotSupportedAssemblyMessage)' != ''"
+          Inputs="@(GenFacadeNotSupportedCompileInput)"
+          Outputs="@(GenFacadeNotSupportedCompileInput->'%(OutputPath)')" >
 
     <NotSupportedAssemblyGenerator
-      SourceFiles="@(UpdateReferencePaths)"
+      SourceFiles="@(GenFacadeNotSupportedCompileInput)"
       Message="$(GeneratePlatformNotSupportedAssemblyMessage)"
       ApiExclusionListPath="$(ApiExclusionListPath)" />
 
     <ItemGroup>
-      <Compile Include="@(UpdateReferencePaths->'%(NotSupportedPath)')" />
-      <FileWrites Include="@(UpdateReferencePaths->'%(NotSupportedPath)')" />
+      <Compile Include="@(GenFacadeNotSupportedCompileInput->'%(OutputPath)')" />
+      <FileWrites Include="@(GenFacadeNotSupportedCompileInput->'%(OutputPath)')" />
     </ItemGroup>
   </Target>
+
 </Project>
diff --git a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenPartialFacadeSource.targets b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenPartialFacadeSource.targets
index be7ed061db1..615efc86143 100644
--- a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenPartialFacadeSource.targets
+++ b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenPartialFacadeSource.targets
@@ -1,34 +1,32 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
+
+  <UsingTask TaskName="ClearAssemblyReferenceVersions" AssemblyFile="$(GenFacadesTargetAssemblyPath)" />
+  <UsingTask TaskName="GenPartialFacadeSource" AssemblyFile="$(GenFacadesTargetAssemblyPath)" />
+
   <PropertyGroup>
+    <GenFacadesReferencePathItemName Condition="'$(GenFacadesReferencePathItemName)' == ''">ReferencePath</GenFacadesReferencePathItemName>
     <!-- Tell ResolveMatchingContract to run and resolve contract to project reference -->
     <ResolveMatchingContract>true</ResolveMatchingContract>
-    <GeneratePartialFacadeSourceDependsOn>
-      $(GeneratePartialFacadeSourceDependsOn);ResolveMatchingContract
-    </GeneratePartialFacadeSourceDependsOn>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <OutputSourcePath>$(IntermediateOutputPath)\$(AssemblyTitle).Forwards.cs</OutputSourcePath>
-    <CoreCompileDependsOn Condition="'$(DesignTimeBuild)' != 'true'">
-      $(CoreCompileDependsOn);GeneratePartialFacadeSource
-    </CoreCompileDependsOn>
+    <GeneratePartialFacadeSourceDependsOn>$(GeneratePartialFacadeSourceDependsOn);ResolveMatchingContract</GeneratePartialFacadeSourceDependsOn>
+    <CoreCompileDependsOn Condition="'$(DesignTimeBuild)' != 'true'">$(CoreCompileDependsOn);GeneratePartialFacadeSource</CoreCompileDependsOn>
+    <!-- Support zero version seeds by rewriting the output of the compiler. -->
+    <TargetsTriggeredByCompilation Condition="'$(DesignTimeBuild)' != 'true' and '$(GenFacadesForceZeroVersionSeeds)' == 'true'">
+      $(TargetsTriggeredByCompilation);ClearAssemblyReferenceVersions
+    </TargetsTriggeredByCompilation>
+    <OutputSourcePath>$(IntermediateOutputPath)$(AssemblyTitle).Forwards.cs</OutputSourcePath>
   </PropertyGroup>
 
-  <UsingTask TaskName="GenPartialFacadeSource" AssemblyFile="$(GenFacadesTargetAssemblyPath)" />
-
   <Target Name="GeneratePartialFacadeSource"
-          Inputs="$(MSBuildAllProjects);@(ResolvedMatchingContract);@(ReferencePath);@(Compile)"
+          Inputs="$(MSBuildAllProjects);@(ResolvedMatchingContract);@($(GenFacadesReferencePathItemName));@(Compile)"
           Outputs="$(OutputSourcePath)"
           DependsOnTargets="$(GeneratePartialFacadeSourceDependsOn)">
-
     <PropertyGroup>
-      <OutputSourcePath>$(IntermediateOutputPath)\$(AssemblyTitle).Forwards.cs</OutputSourcePath>
       <ReferenceAssembly>%(ResolvedMatchingContract.Identity)</ReferenceAssembly>
     </PropertyGroup>
 
     <GenPartialFacadeSource
-      ReferencePaths="@(ReferencePath)"
+      ReferencePaths="@($(GenFacadesReferencePathItemName))"
       ReferenceAssembly="$(ReferenceAssembly)"
       CompileFiles="@(Compile)"
       DefineConstants="$(DefineConstants)"
@@ -36,27 +34,14 @@
       IgnoreMissingTypesList="@(GenFacadesIgnoreMissingType)"
       OmitTypes="@(GenFacadesOmitType)"
       OutputSourcePath="$(OutputSourcePath)"
-      SeedTypePreferences="@(SeedTypePreference)"
-    />
-
-    <ItemGroup>
-      <FileWrites Condition="Exists('$(OutputSourcePath)')" Include="$(OutputSourcePath)"/>
-    </ItemGroup>
+      SeedTypePreferences="@(SeedTypePreference)" />
 
-    <ItemGroup>
-      <Compile Condition="Exists('$(OutputSourcePath)')" Include="$(OutputSourcePath)"/>
+    <ItemGroup Condition="Exists('$(OutputSourcePath)')">
+      <Compile Include="$(OutputSourcePath)" />
+      <FileWrites Include="$(OutputSourcePath)" />
     </ItemGroup>
   </Target>
 
-  <!-- Support zero version seeds by rewriting the output of the compiler. -->
-  <PropertyGroup>
-    <TargetsTriggeredByCompilation Condition="'$(DesignTimeBuild)' != 'true' AND '$(GenFacadesForceZeroVersionSeeds)' == 'true'">
-      $(TargetsTriggeredByCompilation);ClearAssemblyReferenceVersions
-    </TargetsTriggeredByCompilation>
-  </PropertyGroup>
-
-  <UsingTask TaskName="ClearAssemblyReferenceVersions" AssemblyFile="$(GenFacadesTargetAssemblyPath)" />
-  
   <Target Name="ClearAssemblyReferenceVersions">
     <PropertyGroup>
       <_ClearAssemblyReferenceVersionsAssembly>$(IntermediateOutputPath)$(TargetName)$(TargetExt)</_ClearAssemblyReferenceVersionsAssembly>
@@ -64,10 +49,12 @@
 
     <!-- Copy the original assembly for debugging purposes -->
     <Copy SourceFiles="$(_ClearAssemblyReferenceVersionsAssembly)"
-          DestinationFolder="$(IntermediateOutputPath)ClearRef/">
+          DestinationFolder="$(IntermediateOutputPath)ClearRef"
+          Condition="'$(GenFacadesForceZeroVersionSeedsDebugMode)' == 'true'">
       <Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
     </Copy>
 
     <ClearAssemblyReferenceVersions Assembly="$(_ClearAssemblyReferenceVersionsAssembly)" />
   </Target>
+
 </Project>
diff --git a/src/Microsoft.DotNet.Git.IssueManager/src/Clients/GitHubClient.cs b/src/Microsoft.DotNet.Git.IssueManager/src/Clients/GitHubClient.cs
index a51e587d759..f9b8f747591 100644
--- a/src/Microsoft.DotNet.Git.IssueManager/src/Clients/GitHubClient.cs
+++ b/src/Microsoft.DotNet.Git.IssueManager/src/Clients/GitHubClient.cs
@@ -3,9 +3,11 @@
 
 using Octokit;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Microsoft.DotNet.Git.IssueManager.Helpers;
 
 namespace Microsoft.DotNet.Git.IssueManager.Clients
 {
@@ -38,7 +40,10 @@ public static async Task<int> CreateNewIssueAsync(
             string repositoryUrl,
             string issueTitle,
             string issueDescription,
-            string personalAccessToken)
+            string personalAccessToken,
+            int? milestone = null,
+            IEnumerable<string> labels = null,
+            IEnumerable<string> assignees = null)
         {
             (string owner, string repoName) = ParseRepoUri(repositoryUrl);
 
@@ -48,9 +53,20 @@ public static async Task<int> CreateNewIssueAsync(
 
             NewIssue issueToBeCreated = new NewIssue(issueTitle)
             {
-                Body = issueDescription
+                Body = issueDescription,
+                Milestone = milestone
             };
 
+            if (labels is not null)
+            {
+                issueToBeCreated.Labels.AddRange(labels);
+            }
+
+            if (assignees is not null)
+            {
+                issueToBeCreated.Assignees.AddRange(assignees);
+            }
+
             Issue createdIssue = await client.Issue.Create(owner, repoName, issueToBeCreated);
 
             return createdIssue.Number;
diff --git a/src/Microsoft.DotNet.Git.IssueManager/src/Helpers/CollectionExtensions.cs b/src/Microsoft.DotNet.Git.IssueManager/src/Helpers/CollectionExtensions.cs
new file mode 100644
index 00000000000..dfe6aa27d6e
--- /dev/null
+++ b/src/Microsoft.DotNet.Git.IssueManager/src/Helpers/CollectionExtensions.cs
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Microsoft.DotNet.Git.IssueManager.Helpers
+{
+    internal static class CollectionExtensions
+    {
+        public static void AddRange<T>(this Collection<T> collection, IEnumerable<T> items)
+        {
+            foreach (T item in items)
+            {
+                collection.Add(item);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Git.IssueManager/src/Helpers/RepositoryHelper.cs b/src/Microsoft.DotNet.Git.IssueManager/src/Helpers/RepositoryHelper.cs
index 9d9741efd83..d487396d3a8 100644
--- a/src/Microsoft.DotNet.Git.IssueManager/src/Helpers/RepositoryHelper.cs
+++ b/src/Microsoft.DotNet.Git.IssueManager/src/Helpers/RepositoryHelper.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.DotNet.Git.IssueManager.Clients;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Microsoft.DotNet.Git.IssueManager.Helpers
@@ -42,7 +43,10 @@ public static async Task<int> CreateNewIssueAsync(
             string repositoryUrl,
             string issueTitle,
             string issueDescription,
-            string gitHubPersonalAccessToken)
+            string gitHubPersonalAccessToken,
+            int? milestone = null,
+            IEnumerable<string> labels = null,
+            IEnumerable<string> assignees = null)
         {
             if (Uri.TryCreate(repositoryUrl, UriKind.Absolute, out Uri parsedUri))
             {
@@ -53,7 +57,14 @@ public static async Task<int> CreateNewIssueAsync(
                         throw new ArgumentException("A GitHub personal access token is needed for this operation.");
                     }
 
-                    return await GitHubClient.CreateNewIssueAsync(repositoryUrl, issueTitle, issueDescription, gitHubPersonalAccessToken);
+                    return await GitHubClient.CreateNewIssueAsync(
+                        repositoryUrl,
+                        issueTitle,
+                        issueDescription,
+                        gitHubPersonalAccessToken,
+                        milestone,
+                        labels,
+                        assignees);
                 }
 
                 throw new NotImplementedException("Creating issues is not currently supported for an Azure DevOps repo.");
diff --git a/src/Microsoft.DotNet.Git.IssueManager/src/IssueManager.cs b/src/Microsoft.DotNet.Git.IssueManager/src/IssueManager.cs
index 510eab1797e..3eeac623e76 100644
--- a/src/Microsoft.DotNet.Git.IssueManager/src/IssueManager.cs
+++ b/src/Microsoft.DotNet.Git.IssueManager/src/IssueManager.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.DotNet.Git.IssueManager.Helpers;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Microsoft.DotNet.Git.IssueManager
@@ -53,13 +54,19 @@ public async Task<string> GetCommitAuthorAsync(string repositoryUrl, string comm
         public async Task<int> CreateNewIssueAsync(
             string repositoryUrl,
             string issueTitle,
-            string issueDescription)
+            string issueDescription,
+            int? milestone = null,
+            IEnumerable<string> labels = null,
+            IEnumerable<string> assignees = null)
         {
             return await RepositoryHelper.CreateNewIssueAsync(
                 repositoryUrl,
                 issueTitle,
                 issueDescription,
-                GitHubPersonalAccessToken);
+                GitHubPersonalAccessToken,
+                milestone,
+                labels,
+                assignees);
         }
     }
 }
diff --git a/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj b/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj
index b6208c81f9f..a246fe86a49 100644
--- a/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj
+++ b/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj
@@ -10,5 +10,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="Octokit" Version="$(OctokitVersion)" />
+    <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj b/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj
index 52d184cb8bc..744fa0c8752 100644
--- a/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj
+++ b/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -11,6 +11,8 @@
     <PackageReference Include="CommandLineParser" Version="$(CommandLineParserVersion)" />
     <PackageReference Include="log4net" Version="$(log4netVersion)" />
     <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" />
+    <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
+    <PackageReference Include="Microsoft.Data.OData" Version="$(MicrosoftDataODataVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.DotNet.GitSync/Microsoft.DotNet.GitSync.csproj b/src/Microsoft.DotNet.GitSync/Microsoft.DotNet.GitSync.csproj
index d471bfc554d..b060021b7d8 100644
--- a/src/Microsoft.DotNet.GitSync/Microsoft.DotNet.GitSync.csproj
+++ b/src/Microsoft.DotNet.GitSync/Microsoft.DotNet.GitSync.csproj
@@ -14,6 +14,8 @@
     <PackageReference Include="Microsoft.Azure.DocumentDB" Version="$(MicrosoftAzureDocumentDBVersion)" />
     <PackageReference Include="Microsoft.Azure.CosmosDB.Table" Version="$(MicrosoftAzureCosmosDBTableVersion)" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="$(MicrosoftAzureKeyVaultVersion)" />
+    <PackageReference Include="Microsoft.Data.OData" Version="$(MicrosoftDataODataVersion)" />
+    <PackageReference Include="Microsoft.Data.Services.Client" Version="$(MicrosoftDataServicesClientVersion)" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="$(MicrosoftIdentityModelClientsActiveDirectoryVersion)" />
     <PackageReference Include="Octokit" Version="$(OctokitVersion)" />
   </ItemGroup>
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj b/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj
index 531ba3203fa..a743b31b379 100644
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.5.0" />
+    <PackageReference Include="Azure.Core" Version="$(AzureCoreVersion)" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Aggregate.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Aggregate.cs
new file mode 100644
index 00000000000..7b78fa25798
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Aggregate.cs
@@ -0,0 +1,1306 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Core;
+
+
+
+namespace Microsoft.DotNet.Helix.Client
+{
+    public partial interface IAggregate
+    {
+        Task<Models.AggregateWorkItemSummary> AnalysisSummaryAsync(
+            IImmutableList<string> groupBy,
+            IImmutableList<string> otherProperties,
+            string workitem,
+            string build = default,
+            string creator = default,
+            string name = default,
+            string source = default,
+            string type = default,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<IImmutableList<Models.BuildHistoryItem>> BuildHistoryAsync(
+            IImmutableList<string> source,
+            IImmutableList<string> type,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<Models.BuildAggregation> BuildAsync(
+            string buildNumber,
+            IImmutableList<string> sources,
+            IImmutableList<string> types,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<IImmutableList<Models.AggregatedWorkItemCounts>> JobSummaryAsync(
+            IImmutableList<string> groupBy,
+            int maxResultSets,
+            string build = default,
+            string creator = default,
+            string name = default,
+            string source = default,
+            string type = default,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<IImmutableList<Models.AggregatedWorkItemCounts>> WorkItemSummaryAsync(
+            IImmutableList<string> groupBy,
+            string build = default,
+            string creator = default,
+            string name = default,
+            string source = default,
+            string type = default,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<IImmutableList<Models.AggregateAnalysisDetail>> AnalysisDetailAsync(
+            string analysisName,
+            string analysisType,
+            string build,
+            IImmutableList<string> groupBy,
+            string source,
+            string type,
+            string workitem,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<IImmutableDictionary<string, Newtonsoft.Json.Linq.JToken>> PropertiesAsync(
+            string build = default,
+            string creator = default,
+            string name = default,
+            string source = default,
+            string type = default,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<Models.InvestigationResult> Investigation_ContinueAsync(
+            string id,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<Models.InvestigationResult> InvestigationAsync(
+            IImmutableList<string> groupBy,
+            int maxGroups,
+            int maxResults,
+            string build = default,
+            string creator = default,
+            string name = default,
+            string source = default,
+            string type = default,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<IImmutableList<Models.HistoricalAnalysisItem>> HistoryAsync(
+            string analysisName,
+            string analysisType,
+            int days,
+            string source,
+            string type,
+            string workitem,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<Models.MultiSourceResponse> MultiSourceAsync(
+            Models.MultiSourceRequest body,
+            CancellationToken cancellationToken = default
+        );
+
+    }
+
+    internal partial class Aggregate : IServiceOperations<HelixApi>, IAggregate
+    {
+        public Aggregate(HelixApi client)
+        {
+            Client = client ?? throw new ArgumentNullException(nameof(client));
+        }
+
+        public HelixApi Client { get; }
+
+        partial void HandleFailedRequest(RestApiException ex);
+
+        partial void HandleFailedAnalysisSummaryRequest(RestApiException ex);
+
+        public async Task<Models.AggregateWorkItemSummary> AnalysisSummaryAsync(
+            IImmutableList<string> groupBy,
+            IImmutableList<string> otherProperties,
+            string workitem,
+            string build = default,
+            string creator = default,
+            string name = default,
+            string source = default,
+            string type = default,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (groupBy == default(IImmutableList<string>))
+            {
+                throw new ArgumentNullException(nameof(groupBy));
+            }
+
+            if (otherProperties == default(IImmutableList<string>))
+            {
+                throw new ArgumentNullException(nameof(otherProperties));
+            }
+
+            if (string.IsNullOrEmpty(workitem))
+            {
+                throw new ArgumentNullException(nameof(workitem));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/analysis",
+                false);
+
+            if (!string.IsNullOrEmpty(creator))
+            {
+                _url.AppendQuery("Creator", Client.Serialize(creator));
+            }
+            if (!string.IsNullOrEmpty(source))
+            {
+                _url.AppendQuery("Source", Client.Serialize(source));
+            }
+            if (!string.IsNullOrEmpty(type))
+            {
+                _url.AppendQuery("Type", Client.Serialize(type));
+            }
+            if (!string.IsNullOrEmpty(build))
+            {
+                _url.AppendQuery("Build", Client.Serialize(build));
+            }
+            if (!string.IsNullOrEmpty(name))
+            {
+                _url.AppendQuery("Name", Client.Serialize(name));
+            }
+            if (!string.IsNullOrEmpty(workitem))
+            {
+                _url.AppendQuery("workitem", Client.Serialize(workitem));
+            }
+            if (groupBy != default(IImmutableList<string>))
+            {
+                foreach (var _item in groupBy)
+                {
+                    _url.AppendQuery("groupBy", Client.Serialize(_item));
+                }
+            }
+            if (otherProperties != default(IImmutableList<string>))
+            {
+                foreach (var _item in otherProperties)
+                {
+                    _url.AppendQuery("otherProperties", Client.Serialize(_item));
+                }
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnAnalysisSummaryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnAnalysisSummaryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<Models.AggregateWorkItemSummary>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnAnalysisSummaryFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedAnalysisSummaryRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedBuildHistoryRequest(RestApiException ex);
+
+        public async Task<IImmutableList<Models.BuildHistoryItem>> BuildHistoryAsync(
+            IImmutableList<string> source,
+            IImmutableList<string> type,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (source == default(IImmutableList<string>))
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            if (type == default(IImmutableList<string>))
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/build/history",
+                false);
+
+            if (source != default(IImmutableList<string>))
+            {
+                foreach (var _item in source)
+                {
+                    _url.AppendQuery("source", Client.Serialize(_item));
+                }
+            }
+            if (type != default(IImmutableList<string>))
+            {
+                foreach (var _item in type)
+                {
+                    _url.AppendQuery("type", Client.Serialize(_item));
+                }
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnBuildHistoryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnBuildHistoryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<IImmutableList<Models.BuildHistoryItem>>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnBuildHistoryFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedBuildHistoryRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedBuildRequest(RestApiException ex);
+
+        public async Task<Models.BuildAggregation> BuildAsync(
+            string buildNumber,
+            IImmutableList<string> sources,
+            IImmutableList<string> types,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (string.IsNullOrEmpty(buildNumber))
+            {
+                throw new ArgumentNullException(nameof(buildNumber));
+            }
+
+            if (sources == default(IImmutableList<string>))
+            {
+                throw new ArgumentNullException(nameof(sources));
+            }
+
+            if (types == default(IImmutableList<string>))
+            {
+                throw new ArgumentNullException(nameof(types));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/build",
+                false);
+
+            if (sources != default(IImmutableList<string>))
+            {
+                foreach (var _item in sources)
+                {
+                    _url.AppendQuery("sources", Client.Serialize(_item));
+                }
+            }
+            if (types != default(IImmutableList<string>))
+            {
+                foreach (var _item in types)
+                {
+                    _url.AppendQuery("types", Client.Serialize(_item));
+                }
+            }
+            if (!string.IsNullOrEmpty(buildNumber))
+            {
+                _url.AppendQuery("buildNumber", Client.Serialize(buildNumber));
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnBuildFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnBuildFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<Models.BuildAggregation>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnBuildFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedBuildRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedJobSummaryRequest(RestApiException ex);
+
+        public async Task<IImmutableList<Models.AggregatedWorkItemCounts>> JobSummaryAsync(
+            IImmutableList<string> groupBy,
+            int maxResultSets,
+            string build = default,
+            string creator = default,
+            string name = default,
+            string source = default,
+            string type = default,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (groupBy == default(IImmutableList<string>))
+            {
+                throw new ArgumentNullException(nameof(groupBy));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/jobs",
+                false);
+
+            if (!string.IsNullOrEmpty(creator))
+            {
+                _url.AppendQuery("Creator", Client.Serialize(creator));
+            }
+            if (!string.IsNullOrEmpty(source))
+            {
+                _url.AppendQuery("Source", Client.Serialize(source));
+            }
+            if (!string.IsNullOrEmpty(type))
+            {
+                _url.AppendQuery("Type", Client.Serialize(type));
+            }
+            if (!string.IsNullOrEmpty(build))
+            {
+                _url.AppendQuery("Build", Client.Serialize(build));
+            }
+            if (!string.IsNullOrEmpty(name))
+            {
+                _url.AppendQuery("Name", Client.Serialize(name));
+            }
+            if (groupBy != default(IImmutableList<string>))
+            {
+                foreach (var _item in groupBy)
+                {
+                    _url.AppendQuery("groupBy", Client.Serialize(_item));
+                }
+            }
+            if (maxResultSets != default(int))
+            {
+                _url.AppendQuery("maxResultSets", Client.Serialize(maxResultSets));
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnJobSummaryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnJobSummaryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<IImmutableList<Models.AggregatedWorkItemCounts>>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnJobSummaryFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedJobSummaryRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedWorkItemSummaryRequest(RestApiException ex);
+
+        public async Task<IImmutableList<Models.AggregatedWorkItemCounts>> WorkItemSummaryAsync(
+            IImmutableList<string> groupBy,
+            string build = default,
+            string creator = default,
+            string name = default,
+            string source = default,
+            string type = default,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (groupBy == default(IImmutableList<string>))
+            {
+                throw new ArgumentNullException(nameof(groupBy));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/workitems",
+                false);
+
+            if (!string.IsNullOrEmpty(creator))
+            {
+                _url.AppendQuery("Creator", Client.Serialize(creator));
+            }
+            if (!string.IsNullOrEmpty(source))
+            {
+                _url.AppendQuery("Source", Client.Serialize(source));
+            }
+            if (!string.IsNullOrEmpty(type))
+            {
+                _url.AppendQuery("Type", Client.Serialize(type));
+            }
+            if (!string.IsNullOrEmpty(build))
+            {
+                _url.AppendQuery("Build", Client.Serialize(build));
+            }
+            if (!string.IsNullOrEmpty(name))
+            {
+                _url.AppendQuery("Name", Client.Serialize(name));
+            }
+            if (groupBy != default(IImmutableList<string>))
+            {
+                foreach (var _item in groupBy)
+                {
+                    _url.AppendQuery("groupBy", Client.Serialize(_item));
+                }
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnWorkItemSummaryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnWorkItemSummaryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<IImmutableList<Models.AggregatedWorkItemCounts>>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnWorkItemSummaryFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedWorkItemSummaryRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedAnalysisDetailRequest(RestApiException ex);
+
+        public async Task<IImmutableList<Models.AggregateAnalysisDetail>> AnalysisDetailAsync(
+            string analysisName,
+            string analysisType,
+            string build,
+            IImmutableList<string> groupBy,
+            string source,
+            string type,
+            string workitem,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (string.IsNullOrEmpty(analysisName))
+            {
+                throw new ArgumentNullException(nameof(analysisName));
+            }
+
+            if (string.IsNullOrEmpty(analysisType))
+            {
+                throw new ArgumentNullException(nameof(analysisType));
+            }
+
+            if (string.IsNullOrEmpty(build))
+            {
+                throw new ArgumentNullException(nameof(build));
+            }
+
+            if (groupBy == default(IImmutableList<string>))
+            {
+                throw new ArgumentNullException(nameof(groupBy));
+            }
+
+            if (string.IsNullOrEmpty(source))
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            if (string.IsNullOrEmpty(type))
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (string.IsNullOrEmpty(workitem))
+            {
+                throw new ArgumentNullException(nameof(workitem));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/analysisdetail",
+                false);
+
+            if (!string.IsNullOrEmpty(source))
+            {
+                _url.AppendQuery("source", Client.Serialize(source));
+            }
+            if (!string.IsNullOrEmpty(type))
+            {
+                _url.AppendQuery("type", Client.Serialize(type));
+            }
+            if (!string.IsNullOrEmpty(build))
+            {
+                _url.AppendQuery("build", Client.Serialize(build));
+            }
+            if (!string.IsNullOrEmpty(workitem))
+            {
+                _url.AppendQuery("workitem", Client.Serialize(workitem));
+            }
+            if (!string.IsNullOrEmpty(analysisType))
+            {
+                _url.AppendQuery("analysisType", Client.Serialize(analysisType));
+            }
+            if (!string.IsNullOrEmpty(analysisName))
+            {
+                _url.AppendQuery("analysisName", Client.Serialize(analysisName));
+            }
+            if (groupBy != default(IImmutableList<string>))
+            {
+                foreach (var _item in groupBy)
+                {
+                    _url.AppendQuery("groupBy", Client.Serialize(_item));
+                }
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnAnalysisDetailFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnAnalysisDetailFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<IImmutableList<Models.AggregateAnalysisDetail>>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnAnalysisDetailFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedAnalysisDetailRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedPropertiesRequest(RestApiException ex);
+
+        public async Task<IImmutableDictionary<string, Newtonsoft.Json.Linq.JToken>> PropertiesAsync(
+            string build = default,
+            string creator = default,
+            string name = default,
+            string source = default,
+            string type = default,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/properties",
+                false);
+
+            if (!string.IsNullOrEmpty(creator))
+            {
+                _url.AppendQuery("Creator", Client.Serialize(creator));
+            }
+            if (!string.IsNullOrEmpty(source))
+            {
+                _url.AppendQuery("Source", Client.Serialize(source));
+            }
+            if (!string.IsNullOrEmpty(type))
+            {
+                _url.AppendQuery("Type", Client.Serialize(type));
+            }
+            if (!string.IsNullOrEmpty(build))
+            {
+                _url.AppendQuery("Build", Client.Serialize(build));
+            }
+            if (!string.IsNullOrEmpty(name))
+            {
+                _url.AppendQuery("Name", Client.Serialize(name));
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnPropertiesFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnPropertiesFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<IImmutableDictionary<string, Newtonsoft.Json.Linq.JToken>>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnPropertiesFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedPropertiesRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedInvestigation_ContinueRequest(RestApiException ex);
+
+        public async Task<Models.InvestigationResult> Investigation_ContinueAsync(
+            string id,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (string.IsNullOrEmpty(id))
+            {
+                throw new ArgumentNullException(nameof(id));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/investigation/continue/{id}".Replace("{id}", Uri.EscapeDataString(Client.Serialize(id))),
+                false);
+
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnInvestigation_ContinueFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnInvestigation_ContinueFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<Models.InvestigationResult>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnInvestigation_ContinueFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedInvestigation_ContinueRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedInvestigationRequest(RestApiException ex);
+
+        public async Task<Models.InvestigationResult> InvestigationAsync(
+            IImmutableList<string> groupBy,
+            int maxGroups,
+            int maxResults,
+            string build = default,
+            string creator = default,
+            string name = default,
+            string source = default,
+            string type = default,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (groupBy == default(IImmutableList<string>))
+            {
+                throw new ArgumentNullException(nameof(groupBy));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/investigation",
+                false);
+
+            if (!string.IsNullOrEmpty(creator))
+            {
+                _url.AppendQuery("Creator", Client.Serialize(creator));
+            }
+            if (!string.IsNullOrEmpty(source))
+            {
+                _url.AppendQuery("Source", Client.Serialize(source));
+            }
+            if (!string.IsNullOrEmpty(type))
+            {
+                _url.AppendQuery("Type", Client.Serialize(type));
+            }
+            if (!string.IsNullOrEmpty(build))
+            {
+                _url.AppendQuery("Build", Client.Serialize(build));
+            }
+            if (!string.IsNullOrEmpty(name))
+            {
+                _url.AppendQuery("Name", Client.Serialize(name));
+            }
+            if (groupBy != default(IImmutableList<string>))
+            {
+                foreach (var _item in groupBy)
+                {
+                    _url.AppendQuery("groupBy", Client.Serialize(_item));
+                }
+            }
+            if (maxGroups != default(int))
+            {
+                _url.AppendQuery("maxGroups", Client.Serialize(maxGroups));
+            }
+            if (maxResults != default(int))
+            {
+                _url.AppendQuery("maxResults", Client.Serialize(maxResults));
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnInvestigationFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnInvestigationFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<Models.InvestigationResult>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnInvestigationFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedInvestigationRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedHistoryRequest(RestApiException ex);
+
+        public async Task<IImmutableList<Models.HistoricalAnalysisItem>> HistoryAsync(
+            string analysisName,
+            string analysisType,
+            int days,
+            string source,
+            string type,
+            string workitem,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (string.IsNullOrEmpty(analysisName))
+            {
+                throw new ArgumentNullException(nameof(analysisName));
+            }
+
+            if (string.IsNullOrEmpty(analysisType))
+            {
+                throw new ArgumentNullException(nameof(analysisType));
+            }
+
+            if (string.IsNullOrEmpty(source))
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            if (string.IsNullOrEmpty(type))
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (string.IsNullOrEmpty(workitem))
+            {
+                throw new ArgumentNullException(nameof(workitem));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/history/{analysisType}".Replace("{analysisType}", Uri.EscapeDataString(Client.Serialize(analysisType))),
+                false);
+
+            if (!string.IsNullOrEmpty(source))
+            {
+                _url.AppendQuery("source", Client.Serialize(source));
+            }
+            if (!string.IsNullOrEmpty(type))
+            {
+                _url.AppendQuery("type", Client.Serialize(type));
+            }
+            if (!string.IsNullOrEmpty(workitem))
+            {
+                _url.AppendQuery("workitem", Client.Serialize(workitem));
+            }
+            if (!string.IsNullOrEmpty(analysisName))
+            {
+                _url.AppendQuery("analysisName", Client.Serialize(analysisName));
+            }
+            if (days != default(int))
+            {
+                _url.AppendQuery("days", Client.Serialize(days));
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnHistoryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnHistoryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<IImmutableList<Models.HistoricalAnalysisItem>>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnHistoryFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedHistoryRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedMultiSourceRequest(RestApiException ex);
+
+        public async Task<Models.MultiSourceResponse> MultiSourceAsync(
+            Models.MultiSourceRequest body,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (body == default(Models.MultiSourceRequest))
+            {
+                throw new ArgumentNullException(nameof(body));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/aggregate/multi-source",
+                false);
+
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Post;
+
+                if (body != default(Models.MultiSourceRequest))
+                {
+                    _req.Content = RequestContent.Create(Encoding.UTF8.GetBytes(Client.Serialize(body)));
+                    _req.Headers.Add("Content-Type", "application/json; charset=utf-8");
+                }
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnMultiSourceFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnMultiSourceFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<Models.MultiSourceResponse>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnMultiSourceFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedMultiSourceRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Analysis.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Analysis.cs
new file mode 100644
index 00000000000..7f1329d740e
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Analysis.cs
@@ -0,0 +1,252 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Core;
+
+
+
+namespace Microsoft.DotNet.Helix.Client
+{
+    public partial interface IAnalysis
+    {
+        Task SetReasonAsync(
+            string analysisName,
+            string analysisType,
+            Models.FailureReason body,
+            string job,
+            string workitem,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<Newtonsoft.Json.Linq.JToken> GetDetailsAsync(
+            string analysisName,
+            string analysisType,
+            string job,
+            string workitem,
+            CancellationToken cancellationToken = default
+        );
+
+    }
+
+    internal partial class Analysis : IServiceOperations<HelixApi>, IAnalysis
+    {
+        public Analysis(HelixApi client)
+        {
+            Client = client ?? throw new ArgumentNullException(nameof(client));
+        }
+
+        public HelixApi Client { get; }
+
+        partial void HandleFailedRequest(RestApiException ex);
+
+        partial void HandleFailedSetReasonRequest(RestApiException ex);
+
+        public async Task SetReasonAsync(
+            string analysisName,
+            string analysisType,
+            Models.FailureReason body,
+            string job,
+            string workitem,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (string.IsNullOrEmpty(analysisName))
+            {
+                throw new ArgumentNullException(nameof(analysisName));
+            }
+
+            if (string.IsNullOrEmpty(analysisType))
+            {
+                throw new ArgumentNullException(nameof(analysisType));
+            }
+
+            if (body == default(Models.FailureReason))
+            {
+                throw new ArgumentNullException(nameof(body));
+            }
+
+            if (string.IsNullOrEmpty(job))
+            {
+                throw new ArgumentNullException(nameof(job));
+            }
+
+            if (string.IsNullOrEmpty(workitem))
+            {
+                throw new ArgumentNullException(nameof(workitem));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/analysis/{job}/{analysisType}/reason".Replace("{job}", Uri.EscapeDataString(Client.Serialize(job))).Replace("{analysisType}", Uri.EscapeDataString(Client.Serialize(analysisType))),
+                false);
+
+            if (!string.IsNullOrEmpty(workitem))
+            {
+                _url.AppendQuery("workitem", Client.Serialize(workitem));
+            }
+            if (!string.IsNullOrEmpty(analysisName))
+            {
+                _url.AppendQuery("analysisName", Client.Serialize(analysisName));
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Put;
+
+                if (body != default(Models.FailureReason))
+                {
+                    _req.Content = RequestContent.Create(Encoding.UTF8.GetBytes(Client.Serialize(body)));
+                    _req.Headers.Add("Content-Type", "application/json; charset=utf-8");
+                }
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnSetReasonFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+
+                    return;
+                }
+            }
+        }
+
+        internal async Task OnSetReasonFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedSetReasonRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedGetDetailsRequest(RestApiException ex);
+
+        public async Task<Newtonsoft.Json.Linq.JToken> GetDetailsAsync(
+            string analysisName,
+            string analysisType,
+            string job,
+            string workitem,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            if (string.IsNullOrEmpty(analysisName))
+            {
+                throw new ArgumentNullException(nameof(analysisName));
+            }
+
+            if (string.IsNullOrEmpty(analysisType))
+            {
+                throw new ArgumentNullException(nameof(analysisType));
+            }
+
+            if (string.IsNullOrEmpty(job))
+            {
+                throw new ArgumentNullException(nameof(job));
+            }
+
+            if (string.IsNullOrEmpty(workitem))
+            {
+                throw new ArgumentNullException(nameof(workitem));
+            }
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/analysis/{job}/{analysisType}".Replace("{job}", Uri.EscapeDataString(Client.Serialize(job))).Replace("{analysisType}", Uri.EscapeDataString(Client.Serialize(analysisType))),
+                false);
+
+            if (!string.IsNullOrEmpty(workitem))
+            {
+                _url.AppendQuery("workitem", Client.Serialize(workitem));
+            }
+            if (!string.IsNullOrEmpty(analysisName))
+            {
+                _url.AppendQuery("analysisName", Client.Serialize(analysisName));
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnGetDetailsFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnGetDetailsFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<Newtonsoft.Json.Linq.JToken>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnGetDetailsFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedGetDetailsRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/HelixApi.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/HelixApi.cs
index e2017f366f3..29d69b2657d 100644
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/HelixApi.cs
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/HelixApi.cs
@@ -23,10 +23,12 @@ public partial interface IHelixApi
     {
         HelixApiOptions Options { get; set; }
 
+        IAggregate Aggregate { get; }
+        IAnalysis Analysis { get; }
         IInformation Information { get; }
         IJob Job { get; }
         IMachine Machine { get; }
-        IRepository Repository { get; }
+        IScaleSets ScaleSets { get; }
         IStorage Storage { get; }
         ITelemetry Telemetry { get; }
         IWorkItem WorkItem { get; }
@@ -105,13 +107,17 @@ public HttpPipeline Pipeline
 
         public JsonSerializerSettings SerializerSettings { get; }
 
+        public IAggregate Aggregate { get; }
+
+        public IAnalysis Analysis { get; }
+
         public IInformation Information { get; }
 
         public IJob Job { get; }
 
         public IMachine Machine { get; }
 
-        public IRepository Repository { get; }
+        public IScaleSets ScaleSets { get; }
 
         public IStorage Storage { get; }
 
@@ -128,10 +134,12 @@ public HelixApi()
         public HelixApi(HelixApiOptions options)
         {
             Options = options;
+            Aggregate = new Aggregate(this);
+            Analysis = new Analysis(this);
             Information = new Information(this);
             Job = new Job(this);
             Machine = new Machine(this);
-            Repository = new Repository(this);
+            ScaleSets = new ScaleSets(this);
             Storage = new Storage(this);
             Telemetry = new Telemetry(this);
             WorkItem = new WorkItem(this);
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateAnalysisDetail.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateAnalysisDetail.cs
new file mode 100644
index 00000000000..eb63905292c
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateAnalysisDetail.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class AggregateAnalysisDetail
+    {
+        public AggregateAnalysisDetail(Newtonsoft.Json.Linq.JToken analysis, string job, string workItem, IImmutableDictionary<string, string> key)
+        {
+            Analysis = analysis;
+            Job = job;
+            WorkItem = workItem;
+            Key = key;
+        }
+
+        [JsonProperty("Analysis")]
+        public Newtonsoft.Json.Linq.JToken Analysis { get; set; }
+
+        [JsonProperty("Job")]
+        public string Job { get; set; }
+
+        [JsonProperty("WorkItem")]
+        public string WorkItem { get; set; }
+
+        [JsonProperty("Key")]
+        public IImmutableDictionary<string, string> Key { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (Analysis == default(Newtonsoft.Json.Linq.JToken))
+                {
+                    return false;
+                }
+                if (string.IsNullOrEmpty(Job))
+                {
+                    return false;
+                }
+                if (string.IsNullOrEmpty(WorkItem))
+                {
+                    return false;
+                }
+                if (Key == default(IImmutableDictionary<string, string>))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateAnalysisSummary.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateAnalysisSummary.cs
new file mode 100644
index 00000000000..ca57dfed6e6
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateAnalysisSummary.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class AggregateAnalysisSummary
+    {
+        public AggregateAnalysisSummary(string type, string name, IImmutableDictionary<string, int> status)
+        {
+            Type = type;
+            Name = name;
+            Status = status;
+        }
+
+        [JsonProperty("Type")]
+        public string Type { get; set; }
+
+        [JsonProperty("Name")]
+        public string Name { get; set; }
+
+        [JsonProperty("Status")]
+        public IImmutableDictionary<string, int> Status { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Type))
+                {
+                    return false;
+                }
+                if (string.IsNullOrEmpty(Name))
+                {
+                    return false;
+                }
+                if (Status == default(IImmutableDictionary<string, int>))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateAnalysisSummaryKeyedData.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateAnalysisSummaryKeyedData.cs
new file mode 100644
index 00000000000..bfbecc08424
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateAnalysisSummaryKeyedData.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class AggregateAnalysisSummaryKeyedData
+    {
+        public AggregateAnalysisSummaryKeyedData(IImmutableDictionary<string, string> key, Models.AggregateAnalysisSummary data)
+        {
+            Key = key;
+            Data = data;
+        }
+
+        [JsonProperty("Key")]
+        public IImmutableDictionary<string, string> Key { get; set; }
+
+        [JsonProperty("Data")]
+        public Models.AggregateAnalysisSummary Data { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (Key == default(IImmutableDictionary<string, string>))
+                {
+                    return false;
+                }
+                if (Data == default(Models.AggregateAnalysisSummary))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateWorkItemSummary.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateWorkItemSummary.cs
new file mode 100644
index 00000000000..dc28995cf54
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregateWorkItemSummary.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class AggregateWorkItemSummary
+    {
+        public AggregateWorkItemSummary(IImmutableList<Models.WorkItemAggregateSummary> workItems, IImmutableList<Models.AggregateAnalysisSummaryKeyedData> analyses)
+        {
+            WorkItems = workItems;
+            Analyses = analyses;
+        }
+
+        [JsonProperty("WorkItems")]
+        public IImmutableList<Models.WorkItemAggregateSummary> WorkItems { get; set; }
+
+        [JsonProperty("Analyses")]
+        public IImmutableList<Models.AggregateAnalysisSummaryKeyedData> Analyses { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (WorkItems == default(IImmutableList<Models.WorkItemAggregateSummary>))
+                {
+                    return false;
+                }
+                if (Analyses == default(IImmutableList<Models.AggregateAnalysisSummaryKeyedData>))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregatedVMScalingHistory.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregatedVMScalingHistory.cs
new file mode 100644
index 00000000000..b42c028d870
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregatedVMScalingHistory.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class AggregatedVMScalingHistory
+    {
+        public AggregatedVMScalingHistory(DateTimeOffset timestamp, int totalMessageCount, int totalVMCount)
+        {
+            Timestamp = timestamp;
+            TotalMessageCount = totalMessageCount;
+            TotalVMCount = totalVMCount;
+        }
+
+        [JsonProperty("Timestamp")]
+        public DateTimeOffset Timestamp { get; set; }
+
+        [JsonProperty("TotalMessageCount")]
+        public int TotalMessageCount { get; set; }
+
+        [JsonProperty("TotalVMCount")]
+        public int TotalVMCount { get; set; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregatedWorkItemCounts.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregatedWorkItemCounts.cs
new file mode 100644
index 00000000000..e61c5783ad6
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AggregatedWorkItemCounts.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class AggregatedWorkItemCounts
+    {
+        public AggregatedWorkItemCounts(IImmutableDictionary<string, string> key, Models.WorkItemStatusCounts data)
+        {
+            Key = key;
+            Data = data;
+        }
+
+        [JsonProperty("Key")]
+        public IImmutableDictionary<string, string> Key { get; set; }
+
+        [JsonProperty("Data")]
+        public Models.WorkItemStatusCounts Data { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (Key == default(IImmutableDictionary<string, string>))
+                {
+                    return false;
+                }
+                if (Data == default(Models.WorkItemStatusCounts))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AnalysisCount.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AnalysisCount.cs
new file mode 100644
index 00000000000..f87f6d9bc6d
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/AnalysisCount.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class AnalysisCount
+    {
+        public AnalysisCount(string name, IImmutableDictionary<string, int> status)
+        {
+            Name = name;
+            Status = status;
+        }
+
+        [JsonProperty("Name")]
+        public string Name { get; set; }
+
+        [JsonProperty("Status")]
+        public IImmutableDictionary<string, int> Status { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Name))
+                {
+                    return false;
+                }
+                if (Status == default(IImmutableDictionary<string, int>))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/BuildAggregation.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/BuildAggregation.cs
new file mode 100644
index 00000000000..046d7c4b98e
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/BuildAggregation.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class BuildAggregation
+    {
+        public BuildAggregation(string buildNumber, IImmutableDictionary<string, Models.BuildAggregationSource> sources)
+        {
+            BuildNumber = buildNumber;
+            Sources = sources;
+        }
+
+        [JsonProperty("BuildNumber")]
+        public string BuildNumber { get; set; }
+
+        [JsonProperty("Sources")]
+        public IImmutableDictionary<string, Models.BuildAggregationSource> Sources { get; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(BuildNumber))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/BuildAggregationSource.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/BuildAggregationSource.cs
new file mode 100644
index 00000000000..41908012d24
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/BuildAggregationSource.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class BuildAggregationSource
+    {
+        public BuildAggregationSource(IImmutableDictionary<string, Models.AggregatedWorkItemCounts> types)
+        {
+            Types = types;
+        }
+
+        [JsonProperty("Types")]
+        public IImmutableDictionary<string, Models.AggregatedWorkItemCounts> Types { get; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/BuildHistoryItem.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/BuildHistoryItem.cs
new file mode 100644
index 00000000000..8271d23b6ab
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/BuildHistoryItem.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class BuildHistoryItem
+    {
+        public BuildHistoryItem(string buildNumber, DateTimeOffset timestamp, bool passed)
+        {
+            BuildNumber = buildNumber;
+            Timestamp = timestamp;
+            Passed = passed;
+        }
+
+        [JsonProperty("BuildNumber")]
+        public string BuildNumber { get; set; }
+
+        [JsonProperty("Timestamp")]
+        public DateTimeOffset Timestamp { get; set; }
+
+        [JsonProperty("Passed")]
+        public bool Passed { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(BuildNumber))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/DetailedVMScalingHistory.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/DetailedVMScalingHistory.cs
new file mode 100644
index 00000000000..aaf847dc9c8
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/DetailedVMScalingHistory.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class DetailedVMScalingHistory
+    {
+        public DetailedVMScalingHistory(string scaleSetName, string vMState, int vMCount, DateTimeOffset timestamp)
+        {
+            ScaleSetName = scaleSetName;
+            VMState = vMState;
+            VMCount = vMCount;
+            Timestamp = timestamp;
+        }
+
+        [JsonProperty("ScaleSetName")]
+        public string ScaleSetName { get; set; }
+
+        [JsonProperty("VMState")]
+        public string VMState { get; set; }
+
+        [JsonProperty("VMCount")]
+        public int VMCount { get; set; }
+
+        [JsonProperty("QueueName")]
+        public string QueueName { get; set; }
+
+        [JsonProperty("MessageCount")]
+        public int? MessageCount { get; set; }
+
+        [JsonProperty("Timestamp")]
+        public DateTimeOffset Timestamp { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(ScaleSetName))
+                {
+                    return false;
+                }
+                if (string.IsNullOrEmpty(VMState))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/Displayable.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/Displayable.cs
deleted file mode 100644
index 54163b50813..00000000000
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/Displayable.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using Newtonsoft.Json;
-
-namespace Microsoft.DotNet.Helix.Client.Models
-{
-    public partial class Displayable
-    {
-        public Displayable()
-        {
-        }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("displayName")]
-        public string DisplayName { get; set; }
-    }
-}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/HistoricalAnalysisItem.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/HistoricalAnalysisItem.cs
new file mode 100644
index 00000000000..a14342fd250
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/HistoricalAnalysisItem.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class HistoricalAnalysisItem
+    {
+        public HistoricalAnalysisItem()
+        {
+        }
+
+        [JsonProperty("Queued")]
+        public DateTimeOffset? Queued { get; set; }
+
+        [JsonProperty("Build")]
+        public string Build { get; set; }
+
+        [JsonProperty("Results")]
+        public IImmutableDictionary<string, int> Results { get; set; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/InvestigationAnalysis.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/InvestigationAnalysis.cs
new file mode 100644
index 00000000000..af5998aa9a7
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/InvestigationAnalysis.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class InvestigationAnalysis
+    {
+        public InvestigationAnalysis(string job, string workItem, string name, Newtonsoft.Json.Linq.JToken analysis)
+        {
+            Job = job;
+            WorkItem = workItem;
+            Name = name;
+            Analysis = analysis;
+        }
+
+        [JsonProperty("Job")]
+        public string Job { get; set; }
+
+        [JsonProperty("WorkItem")]
+        public string WorkItem { get; set; }
+
+        [JsonProperty("Name")]
+        public string Name { get; set; }
+
+        [JsonProperty("Analysis")]
+        public Newtonsoft.Json.Linq.JToken Analysis { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Job))
+                {
+                    return false;
+                }
+                if (string.IsNullOrEmpty(WorkItem))
+                {
+                    return false;
+                }
+                if (string.IsNullOrEmpty(Name))
+                {
+                    return false;
+                }
+                if (Analysis == default(Newtonsoft.Json.Linq.JToken))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/InvestigationGroup.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/InvestigationGroup.cs
new file mode 100644
index 00000000000..9de1720faef
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/InvestigationGroup.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class InvestigationGroup
+    {
+        public InvestigationGroup(IImmutableDictionary<string, string> key, IImmutableDictionary<string, IImmutableList<Models.InvestigationAnalysis>> data)
+        {
+            Key = key;
+            Data = data;
+        }
+
+        [JsonProperty("Key")]
+        public IImmutableDictionary<string, string> Key { get; set; }
+
+        [JsonProperty("Data")]
+        public IImmutableDictionary<string, IImmutableList<Models.InvestigationAnalysis>> Data { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (Key == default(IImmutableDictionary<string, string>))
+                {
+                    return false;
+                }
+                if (Data == default(IImmutableDictionary<string, IImmutableList<Models.InvestigationAnalysis>>))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/InvestigationResult.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/InvestigationResult.cs
new file mode 100644
index 00000000000..b5354117f18
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/InvestigationResult.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class InvestigationResult
+    {
+        public InvestigationResult()
+        {
+        }
+
+        [JsonProperty("Result")]
+        public IImmutableList<Models.InvestigationGroup> Result { get; set; }
+
+        [JsonProperty("ContinuationToken")]
+        public string ContinuationToken { get; set; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/MultiSourceRequest.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/MultiSourceRequest.cs
new file mode 100644
index 00000000000..464ea901bcf
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/MultiSourceRequest.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class MultiSourceRequest
+    {
+        public MultiSourceRequest(IImmutableList<Models.SingleSourceRequest> sources, int? buildCount)
+        {
+            Sources = sources;
+            BuildCount = buildCount;
+        }
+
+        [JsonProperty("Sources")]
+        public IImmutableList<Models.SingleSourceRequest> Sources { get; }
+
+        [JsonProperty("BuildCount")]
+        public int? BuildCount { get; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/MultiSourceResponse.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/MultiSourceResponse.cs
new file mode 100644
index 00000000000..c963ad3a3ad
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/MultiSourceResponse.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class MultiSourceResponse
+    {
+        public MultiSourceResponse(IImmutableDictionary<string, Models.MultiSourceResponseSource> sources)
+        {
+            Sources = sources;
+        }
+
+        [JsonProperty("Sources")]
+        public IImmutableDictionary<string, Models.MultiSourceResponseSource> Sources { get; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/MultiSourceResponseSource.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/MultiSourceResponseSource.cs
new file mode 100644
index 00000000000..d9a496b092f
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/MultiSourceResponseSource.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class MultiSourceResponseSource
+    {
+        public MultiSourceResponseSource(IImmutableDictionary<string, IImmutableList<Models.AggregatedWorkItemCounts>> types)
+        {
+            Types = types;
+        }
+
+        [JsonProperty("Types")]
+        public IImmutableDictionary<string, IImmutableList<Models.AggregatedWorkItemCounts>> Types { get; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/QueueInfo.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/QueueInfo.cs
index 5c5d4d1377c..106ba0ae7d4 100644
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/QueueInfo.cs
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/QueueInfo.cs
@@ -60,5 +60,8 @@ public QueueInfo()
 
         [JsonProperty("WorkspacePath")]
         public string WorkspacePath { get; set; }
+
+        [JsonProperty("EstimatedRemovalDate")]
+        public string EstimatedRemovalDate { get; set; }
     }
 }
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/SingleSourceRequest.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/SingleSourceRequest.cs
new file mode 100644
index 00000000000..603978ba372
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/SingleSourceRequest.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class SingleSourceRequest
+    {
+        public SingleSourceRequest(string name, IImmutableList<string> types)
+        {
+            Name = name;
+            Types = types;
+        }
+
+        [JsonProperty("Name")]
+        public string Name { get; }
+
+        [JsonProperty("Types")]
+        public IImmutableList<string> Types { get; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/UnknownWorkItemEvent.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/UnknownWorkItemEvent.cs
new file mode 100644
index 00000000000..0d0c4281c00
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/UnknownWorkItemEvent.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class UnknownWorkItemEvent
+    {
+        public UnknownWorkItemEvent()
+        {
+        }
+
+        [JsonProperty("Type")]
+        public string Type { get; set; }
+
+        [JsonProperty("Timestamp")]
+        public DateTimeOffset? Timestamp { get; set; }
+
+        [JsonProperty("Values")]
+        public IImmutableDictionary<string, string> Values { get; set; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfiguration.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfiguration.cs
deleted file mode 100644
index a19fdb15c70..00000000000
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfiguration.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using Newtonsoft.Json;
-
-namespace Microsoft.DotNet.Helix.Client.Models
-{
-    public partial class ViewConfiguration
-    {
-        public ViewConfiguration()
-        {
-        }
-
-        [JsonProperty("products")]
-        public IImmutableList<Models.ViewConfigurationProduct> Products { get; set; }
-
-        [JsonProperty("repositories")]
-        public IImmutableList<Models.ViewConfigurationRepositories> Repositories { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("displayName")]
-        public string DisplayName { get; set; }
-    }
-}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationExternalTelemetry.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationExternalTelemetry.cs
deleted file mode 100644
index 4a9f4e420f7..00000000000
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationExternalTelemetry.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using Newtonsoft.Json;
-
-namespace Microsoft.DotNet.Helix.Client.Models
-{
-    public partial class ViewConfigurationExternalTelemetry
-    {
-        public ViewConfigurationExternalTelemetry()
-        {
-        }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("value")]
-        public string Value { get; set; }
-    }
-}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationFlavor.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationFlavor.cs
deleted file mode 100644
index 2ff87cc9b91..00000000000
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationFlavor.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using Newtonsoft.Json;
-
-namespace Microsoft.DotNet.Helix.Client.Models
-{
-    public partial class ViewConfigurationFlavor
-    {
-        public ViewConfigurationFlavor()
-        {
-        }
-
-        [JsonProperty("sources")]
-        public IImmutableList<Models.ViewConfigurationSource> Sources { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("displayName")]
-        public string DisplayName { get; set; }
-    }
-}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationProduct.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationProduct.cs
deleted file mode 100644
index 8c9cdff5fca..00000000000
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationProduct.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using Newtonsoft.Json;
-
-namespace Microsoft.DotNet.Helix.Client.Models
-{
-    public partial class ViewConfigurationProduct
-    {
-        public ViewConfigurationProduct()
-        {
-        }
-
-        [JsonProperty("flavors")]
-        public IImmutableList<Models.ViewConfigurationFlavor> Flavors { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("displayName")]
-        public string DisplayName { get; set; }
-    }
-}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationRepositories.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationRepositories.cs
deleted file mode 100644
index 0a851a8c9ab..00000000000
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationRepositories.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using Newtonsoft.Json;
-
-namespace Microsoft.DotNet.Helix.Client.Models
-{
-    public partial class ViewConfigurationRepositories
-    {
-        public ViewConfigurationRepositories()
-        {
-        }
-
-        [JsonProperty("repository")]
-        public string Repository { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("displayName")]
-        public string DisplayName { get; set; }
-    }
-}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationSource.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationSource.cs
deleted file mode 100644
index a6652ef2eb1..00000000000
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationSource.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using Newtonsoft.Json;
-
-namespace Microsoft.DotNet.Helix.Client.Models
-{
-    public partial class ViewConfigurationSource
-    {
-        public ViewConfigurationSource()
-        {
-        }
-
-        [JsonProperty("repository")]
-        public string Repository { get; set; }
-
-        [JsonProperty("branch")]
-        public string Branch { get; set; }
-
-        [JsonProperty("milestone")]
-        public string Milestone { get; set; }
-
-        [JsonProperty("sortByBuild")]
-        public bool? SortByBuild { get; set; }
-
-        [JsonProperty("releaseLinks")]
-        public IImmutableList<Models.ViewConfigurationExternalTelemetry> ReleaseLinks { get; set; }
-
-        [JsonProperty("types")]
-        public IImmutableList<Models.ViewConfigurationType> Types { get; set; }
-
-        [JsonProperty("externalLinks")]
-        public IImmutableList<Models.ViewConfigurationExternalTelemetry> ExternalLinks { get; set; }
-
-        [JsonProperty("buildProperties")]
-        public IImmutableDictionary<string, string> BuildProperties { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("displayName")]
-        public string DisplayName { get; set; }
-    }
-}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationType.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationType.cs
deleted file mode 100644
index 291e5fe0bdf..00000000000
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/ViewConfigurationType.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using Newtonsoft.Json;
-
-namespace Microsoft.DotNet.Helix.Client.Models
-{
-    public partial class ViewConfigurationType
-    {
-        public ViewConfigurationType()
-        {
-        }
-
-        [JsonProperty("columns")]
-        public IImmutableList<Models.Displayable> Columns { get; set; }
-
-        [JsonProperty("otherProperties")]
-        public IImmutableList<Models.Displayable> OtherProperties { get; set; }
-
-        [JsonProperty("noWorkitems")]
-        public bool? NoWorkitems { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("displayName")]
-        public string DisplayName { get; set; }
-    }
-}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/WorkItemAggregateSummary.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/WorkItemAggregateSummary.cs
new file mode 100644
index 00000000000..410ca356f7e
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/WorkItemAggregateSummary.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class WorkItemAggregateSummary
+    {
+        public WorkItemAggregateSummary()
+        {
+        }
+
+        [JsonProperty("JobId")]
+        public int? JobId { get; set; }
+
+        [JsonProperty("WorkItemId")]
+        public int? WorkItemId { get; set; }
+
+        [JsonProperty("MachineName")]
+        public string MachineName { get; set; }
+
+        [JsonProperty("Job")]
+        public string Job { get; set; }
+
+        [JsonProperty("Name")]
+        public string Name { get; set; }
+
+        [JsonProperty("Guid")]
+        public Guid? Guid { get; set; }
+
+        [JsonProperty("QueueTime")]
+        public DateTimeOffset? QueueTime { get; set; }
+
+        [JsonProperty("StartTime")]
+        public DateTimeOffset? StartTime { get; set; }
+
+        [JsonProperty("FinishedTime")]
+        public DateTimeOffset? FinishedTime { get; set; }
+
+        [JsonProperty("ExitCode")]
+        public int? ExitCode { get; set; }
+
+        [JsonProperty("ConsoleOutputUri")]
+        public string ConsoleOutputUri { get; set; }
+
+        [JsonProperty("Logs")]
+        public IImmutableList<Models.WorkItemLog> Logs { get; set; }
+
+        [JsonProperty("Errors")]
+        public IImmutableList<Models.WorkItemError> Errors { get; set; }
+
+        [JsonProperty("Warnings")]
+        public IImmutableList<Models.WorkItemError> Warnings { get; set; }
+
+        [JsonProperty("OtherEvents")]
+        public IImmutableList<Models.UnknownWorkItemEvent> OtherEvents { get; set; }
+
+        [JsonProperty("Passed")]
+        public bool? Passed { get; set; }
+
+        [JsonProperty("Attempt")]
+        public int? Attempt { get; set; }
+
+        [JsonProperty("State")]
+        public string State { get; set; }
+
+        [JsonProperty("Key")]
+        public IImmutableDictionary<string, string> Key { get; set; }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/WorkItemDetails.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/WorkItemDetails.cs
index ec5965534f1..7f351058eff 100644
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/WorkItemDetails.cs
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/WorkItemDetails.cs
@@ -18,6 +18,21 @@ public WorkItemDetails(string id, string machineName, string job, string name, s
         [JsonProperty("FailureReason")]
         public Models.FailureReason FailureReason { get; set; }
 
+        [JsonProperty("Queued")]
+        public DateTimeOffset? Queued { get; set; }
+
+        [JsonProperty("Started")]
+        public DateTimeOffset? Started { get; set; }
+
+        [JsonProperty("Finished")]
+        public DateTimeOffset? Finished { get; set; }
+
+        [JsonProperty("Delay")]
+        public string Delay { get; set; }
+
+        [JsonProperty("Duration")]
+        public string Duration { get; set; }
+
         [JsonProperty("Id")]
         public string Id { get; set; }
 
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/WorkItemStatusCounts.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/WorkItemStatusCounts.cs
new file mode 100644
index 00000000000..288ac0e0cfc
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Models/WorkItemStatusCounts.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Immutable;
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Helix.Client.Models
+{
+    public partial class WorkItemStatusCounts
+    {
+        public WorkItemStatusCounts(IImmutableList<Models.AnalysisCount> analysis, IImmutableDictionary<string, int> workItemStatus)
+        {
+            Analysis = analysis;
+            WorkItemStatus = workItemStatus;
+        }
+
+        [JsonProperty("Analysis")]
+        public IImmutableList<Models.AnalysisCount> Analysis { get; set; }
+
+        [JsonProperty("WorkItemStatus")]
+        public IImmutableDictionary<string, int> WorkItemStatus { get; set; }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (Analysis == default(IImmutableList<Models.AnalysisCount>))
+                {
+                    return false;
+                }
+                if (WorkItemStatus == default(IImmutableDictionary<string, int>))
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Repository.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Repository.cs
deleted file mode 100644
index 06996a6acd9..00000000000
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Repository.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure;
-using Azure.Core;
-
-
-
-namespace Microsoft.DotNet.Helix.Client
-{
-    public partial interface IRepository
-    {
-        Task<Models.ViewConfiguration> GetRepositoriesAsync(
-            string vcb = default,
-            CancellationToken cancellationToken = default
-        );
-
-    }
-
-    internal partial class Repository : IServiceOperations<HelixApi>, IRepository
-    {
-        public Repository(HelixApi client)
-        {
-            Client = client ?? throw new ArgumentNullException(nameof(client));
-        }
-
-        public HelixApi Client { get; }
-
-        partial void HandleFailedRequest(RestApiException ex);
-
-        partial void HandleFailedGetRepositoriesRequest(RestApiException ex);
-
-        public async Task<Models.ViewConfiguration> GetRepositoriesAsync(
-            string vcb = default,
-            CancellationToken cancellationToken = default
-        )
-        {
-
-            const string apiVersion = "2019-06-17";
-
-            var _baseUri = Client.Options.BaseUri;
-            var _url = new RequestUriBuilder();
-            _url.Reset(_baseUri);
-            _url.AppendPath(
-                "/api/repo",
-                false);
-
-            if (!string.IsNullOrEmpty(vcb))
-            {
-                _url.AppendQuery("_vcb", Client.Serialize(vcb));
-            }
-            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
-
-
-            using (var _req = Client.Pipeline.CreateRequest())
-            {
-                _req.Uri = _url;
-                _req.Method = RequestMethod.Get;
-
-                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
-                {
-                    if (_res.Status < 200 || _res.Status >= 300)
-                    {
-                        await OnGetRepositoriesFailed(_req, _res).ConfigureAwait(false);
-                    }
-
-                    if (_res.ContentStream == null)
-                    {
-                        await OnGetRepositoriesFailed(_req, _res).ConfigureAwait(false);
-                    }
-
-                    using (var _reader = new StreamReader(_res.ContentStream))
-                    {
-                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
-                        var _body = Client.Deserialize<Models.ViewConfiguration>(_content);
-                        return _body;
-                    }
-                }
-            }
-        }
-
-        internal async Task OnGetRepositoriesFailed(Request req, Response res)
-        {
-            string content = null;
-            if (res.ContentStream != null)
-            {
-                using (var reader = new StreamReader(res.ContentStream))
-                {
-                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
-                }
-            }
-
-            var ex = new RestApiException<Models.ApiError>(
-                req,
-                res,
-                content,
-                Client.Deserialize<Models.ApiError>(content)
-                );
-            HandleFailedGetRepositoriesRequest(ex);
-            HandleFailedRequest(ex);
-            Client.OnFailedRequest(ex);
-            throw ex;
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/ScaleSets.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/ScaleSets.cs
new file mode 100644
index 00000000000..22c73fbb5f9
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/ScaleSets.cs
@@ -0,0 +1,194 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Core;
+
+
+
+namespace Microsoft.DotNet.Helix.Client
+{
+    public partial interface IScaleSets
+    {
+        Task<IImmutableList<Models.DetailedVMScalingHistory>> GetDetailedVMScalingHistoryAsync(
+            DateTimeOffset date,
+            string scaleSet = default,
+            CancellationToken cancellationToken = default
+        );
+
+        Task<IImmutableList<Models.AggregatedVMScalingHistory>> GetAggregatedVMScalingHistoryAsync(
+            DateTimeOffset date,
+            CancellationToken cancellationToken = default
+        );
+
+    }
+
+    internal partial class ScaleSets : IServiceOperations<HelixApi>, IScaleSets
+    {
+        public ScaleSets(HelixApi client)
+        {
+            Client = client ?? throw new ArgumentNullException(nameof(client));
+        }
+
+        public HelixApi Client { get; }
+
+        partial void HandleFailedRequest(RestApiException ex);
+
+        partial void HandleFailedGetDetailedVMScalingHistoryRequest(RestApiException ex);
+
+        public async Task<IImmutableList<Models.DetailedVMScalingHistory>> GetDetailedVMScalingHistoryAsync(
+            DateTimeOffset date,
+            string scaleSet = default,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/scalesets/detailedHistory",
+                false);
+
+            if (date != default(DateTimeOffset))
+            {
+                _url.AppendQuery("date", Client.Serialize(date));
+            }
+            if (!string.IsNullOrEmpty(scaleSet))
+            {
+                _url.AppendQuery("scaleSet", Client.Serialize(scaleSet));
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnGetDetailedVMScalingHistoryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnGetDetailedVMScalingHistoryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<IImmutableList<Models.DetailedVMScalingHistory>>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnGetDetailedVMScalingHistoryFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedGetDetailedVMScalingHistoryRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+
+        partial void HandleFailedGetAggregatedVMScalingHistoryRequest(RestApiException ex);
+
+        public async Task<IImmutableList<Models.AggregatedVMScalingHistory>> GetAggregatedVMScalingHistoryAsync(
+            DateTimeOffset date,
+            CancellationToken cancellationToken = default
+        )
+        {
+
+            const string apiVersion = "2019-06-17";
+
+            var _baseUri = Client.Options.BaseUri;
+            var _url = new RequestUriBuilder();
+            _url.Reset(_baseUri);
+            _url.AppendPath(
+                "/api/scalesets/aggregatedHistory",
+                false);
+
+            if (date != default(DateTimeOffset))
+            {
+                _url.AppendQuery("date", Client.Serialize(date));
+            }
+            _url.AppendQuery("api-version", Client.Serialize(apiVersion));
+
+
+            using (var _req = Client.Pipeline.CreateRequest())
+            {
+                _req.Uri = _url;
+                _req.Method = RequestMethod.Get;
+
+                using (var _res = await Client.SendAsync(_req, cancellationToken).ConfigureAwait(false))
+                {
+                    if (_res.Status < 200 || _res.Status >= 300)
+                    {
+                        await OnGetAggregatedVMScalingHistoryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    if (_res.ContentStream == null)
+                    {
+                        await OnGetAggregatedVMScalingHistoryFailed(_req, _res).ConfigureAwait(false);
+                    }
+
+                    using (var _reader = new StreamReader(_res.ContentStream))
+                    {
+                        var _content = await _reader.ReadToEndAsync().ConfigureAwait(false);
+                        var _body = Client.Deserialize<IImmutableList<Models.AggregatedVMScalingHistory>>(_content);
+                        return _body;
+                    }
+                }
+            }
+        }
+
+        internal async Task OnGetAggregatedVMScalingHistoryFailed(Request req, Response res)
+        {
+            string content = null;
+            if (res.ContentStream != null)
+            {
+                using (var reader = new StreamReader(res.ContentStream))
+                {
+                    content = await reader.ReadToEndAsync().ConfigureAwait(false);
+                }
+            }
+
+            var ex = new RestApiException<Models.ApiError>(
+                req,
+                res,
+                content,
+                Client.Deserialize<Models.ApiError>(content)
+                );
+            HandleFailedGetAggregatedVMScalingHistoryRequest(ex);
+            HandleFailedRequest(ex);
+            Client.OnFailedRequest(ex);
+            throw ex;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/JobSender/JobDefinition.cs b/src/Microsoft.DotNet.Helix/JobSender/JobDefinition.cs
index b5b782beec6..b5e4bee42c4 100644
--- a/src/Microsoft.DotNet.Helix/JobSender/JobDefinition.cs
+++ b/src/Microsoft.DotNet.Helix/JobSender/JobDefinition.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Collections.ObjectModel;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -154,6 +155,18 @@ public async Task<ISentJob> SendAsync(Action<string> log, CancellationToken canc
 
             var (queueId, dockerTag, queueAlias) = ParseQueueId(TargetQueueId);
 
+            // Save time / resources by checking that the queue isn't missing before doing any potentially expensive storage operations
+            try
+            {
+                QueueInfo queueInfo = await HelixApi.Information.QueueInfoAsync(queueId, false, cancellationToken);
+                WarnForImpendingRemoval(log, queueInfo);
+            }
+            // 404 = this queue does not exist, or did and was removed.
+            catch (RestApiException ex) when (ex.Response?.Status == 404)
+            {
+                throw new ArgumentException($"Helix API does not contain an entry for {queueId}");
+            }
+
             IBlobContainer storageContainer = await storage.GetContainerAsync(TargetContainerName, queueId, cancellationToken);
             var jobList = new List<JobListEntry>();
 
@@ -223,6 +236,28 @@ public async Task<ISentJob> SendAsync(Action<string> log, CancellationToken canc
             return new SentJob(JobApi, newJob, newJob.ResultsUri, newJob.ResultsUriRSAS);
         }
 
+        private void WarnForImpendingRemoval(Action<string> log, QueueInfo queueInfo) 
+        {
+            DateTime whenItExpires = DateTime.MaxValue;
+
+            if (DateTime.TryParseExact(queueInfo.EstimatedRemovalDate, "yyyy-MM-dd", null, DateTimeStyles.AssumeUniversal, out DateTime dtIso))
+            {
+                whenItExpires = dtIso;
+            }
+            if (whenItExpires != DateTime.MaxValue) // We recognized a date from the string
+            {
+                TimeSpan untilRemoved = whenItExpires.ToUniversalTime().Subtract(DateTime.UtcNow);
+                if (untilRemoved.TotalDays <= 21)
+                {
+                    log?.Invoke($"warning : Helix queue {queueInfo.QueueId} {(untilRemoved.TotalDays < 0 ? "was" : "is")} slated for removal on {queueInfo.EstimatedRemovalDate}. Please discontinue usage.  Contact dnceng for questions / concerns ");
+                }
+            }
+            else
+            {
+                log?.Invoke($"error : Unable to parse estimated removal date '{queueInfo.EstimatedRemovalDate}' for queue '{queueInfo.QueueId}' (please contact dnceng with this information)");
+            }
+        }
+
         private (string queueId, string dockerTag, string queueAlias) ParseQueueId(string value)
         {
             var @index = value.IndexOf('@');
diff --git a/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj b/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj
index 15e40f99a0b..5a77604e1aa 100644
--- a/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj
+++ b/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj
@@ -9,9 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.Storage.Blobs" Version="$(AzureStorageBlobsVersion)" /> 
+    <PackageReference Include="Microsoft.Data.OData" Version="$(MicrosoftDataODataVersion)" />
     <PackageReference Include="System.IO.Compression" Version="$(SystemIOCompressionVersion)" />
     <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
-    <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Helix/JobSender/Readme.md b/src/Microsoft.DotNet.Helix/JobSender/Readme.md
index e3a131361c7..ebdb05dd25e 100644
--- a/src/Microsoft.DotNet.Helix/JobSender/Readme.md
+++ b/src/Microsoft.DotNet.Helix/JobSender/Readme.md
@@ -33,6 +33,7 @@ namespace Sample
 
 ### Hello World
 This will print out `'Hai Wurld!'` in the work item's console log.
+Please note the command supplied is executing as a Windows command line command on Windows queues and as a shell command on Linux and OSX queues.
 
 ```csharp
 var job = await api.Job.Define()
diff --git a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ApiBlobHelper.cs b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ApiBlobHelper.cs
index 64c57c2fc79..a8fe9d2608d 100644
--- a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ApiBlobHelper.cs
+++ b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ApiBlobHelper.cs
@@ -1,9 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
+using Azure.Storage.Blobs;
 using Microsoft.DotNet.Helix.Client.Models;
-using Microsoft.WindowsAzure.Storage.Auth;
-using Microsoft.WindowsAzure.Storage.Blob;
 
 namespace Microsoft.DotNet.Helix.Client
 {
@@ -20,17 +23,18 @@ public ApiBlobHelper(IStorage helixApiStorage)
         public async Task<IBlobContainer> GetContainerAsync(string requestedName, string targetQueue, CancellationToken cancellationToken)
         {
             ContainerInformation info = await _helixApiStorage.NewAsync(new ContainerCreationRequest(30, requestedName, targetQueue), cancellationToken).ConfigureAwait(false);
-            var client = new CloudBlobClient(new Uri($"https://{info.StorageAccountName}.blob.core.windows.net/"), new StorageCredentials(info.WriteToken));
-            CloudBlobContainer container = client.GetContainerReference(info.ContainerName);
+            Uri containerUri = new Uri($"https://{info.StorageAccountName}.blob.core.windows.net/{info.ContainerName}");
+            AzureSasCredential creds = new AzureSasCredential(info.WriteToken);
+            var container = new BlobContainerClient(containerUri, creds, StorageRetryPolicy.GetBlobClientOptionsRetrySettings());
             return new Container(container, info);
         }
 
         private class Container : ContainerBase
         {
-            private readonly CloudBlobContainer _container;
+            private readonly BlobContainerClient _container;
             private readonly ContainerInformation _info;
 
-            public Container(CloudBlobContainer container, ContainerInformation info)
+            public Container(BlobContainerClient container, ContainerInformation info)
             {
                 _container = container;
                 _info = info;
@@ -40,7 +44,7 @@ public Container(CloudBlobContainer container, ContainerInformation info)
             public override string ReadSas => _info.ReadToken;
             public override string WriteSas => _info.WriteToken;
 
-            protected override (CloudBlockBlob blob, string sasToken) GetBlob(string blobName)
+            protected override (BlobClient blob, string sasToken) GetBlob(string blobName)
             {
                 string sasToken = _info.ReadToken;
                 if (sasToken.StartsWith("?"))
@@ -48,7 +52,7 @@ protected override (CloudBlockBlob blob, string sasToken) GetBlob(string blobNam
                     sasToken = sasToken.Substring(1);
                 }
 
-                CloudBlockBlob blob = _container.GetBlockBlobReference(blobName);
+                BlobClient blob = _container.GetBlobClient(blobName);
                 return (blob, sasToken);
             }
         }
diff --git a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ConnectionStringBlobHelper.cs b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ConnectionStringBlobHelper.cs
index bfb6901cfd0..39078975bbc 100644
--- a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ConnectionStringBlobHelper.cs
+++ b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ConnectionStringBlobHelper.cs
@@ -1,13 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
 using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.DotNet.Helix.Client.Models;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Auth;
-using Microsoft.WindowsAzure.Storage.Blob;
+using Azure.Storage.Blobs;
+using Azure.Storage.Sas;
 
 namespace Microsoft.DotNet.Helix.Client
 {
@@ -23,60 +21,43 @@ public ConnectionStringBlobHelper(string connectionString)
 
         public async Task<IBlobContainer> GetContainerAsync(string requestedName, string targetQueue, CancellationToken cancellationToken)
         {
-            CloudStorageAccount account = CloudStorageAccount.Parse(_connectionString);
-            CloudBlobClient client = account.CreateCloudBlobClient();
-            CloudBlobContainer container = client.GetContainerReference(requestedName);
+            BlobServiceClient account = new BlobServiceClient(_connectionString, StorageRetryPolicy.GetBlobClientOptionsRetrySettings());
+
+            BlobContainerClient container = account.GetBlobContainerClient(requestedName);
             await container.CreateIfNotExistsAsync();
             return new Container(container);
         }
 
         private class Container : ContainerBase
         {
-            private readonly CloudBlobContainer _container;
+            private readonly BlobContainerClient _container;
 
-            public Container(CloudBlobContainer container)
+            public Container(BlobContainerClient container)
             {
                 _container = container;
             }
 
             public override string Uri => _container.Uri.ToString();
-            public override string ReadSas => _container.GetSharedAccessSignature(SasReadOnly);
-            public override string WriteSas => _container.GetSharedAccessSignature(SasReadWrite);
-
-
-            private SharedAccessBlobPolicy SasReadOnly
-            {
-                get
-                {
-                    return new SharedAccessBlobPolicy
-                    {
-                        SharedAccessExpiryTime = DateTime.UtcNow.AddDays(30),
-                        Permissions = SharedAccessBlobPermissions.Read
-                    };
-                }
-            }
+            public override string ReadSas => GetSasTokenForPermissions(BlobContainerSasPermissions.Read, DateTime.UtcNow.AddDays(30));
+            public override string WriteSas => GetSasTokenForPermissions(BlobContainerSasPermissions.Write | 
+                                                                         BlobContainerSasPermissions.Read,
+                                                                         DateTime.UtcNow.AddDays(30));
 
-            private SharedAccessBlobPolicy SasReadWrite
+            private string GetSasTokenForPermissions(BlobContainerSasPermissions permissions, DateTime expiration)
             {
-                get
-                {
-                    return new SharedAccessBlobPolicy
-                    {
-                        SharedAccessExpiryTime = DateTime.UtcNow.AddDays(30),
-                        Permissions = SharedAccessBlobPermissions.Write | SharedAccessBlobPermissions.Read
-                    };
-                }
+                string sas = _container.GenerateSasUri(permissions, expiration).ToString();
+                return sas.Substring(sas.IndexOf('?'));
             }
 
-            protected override (CloudBlockBlob blob, string sasToken) GetBlob(string blobName)
+            protected override (BlobClient blob, string sasToken) GetBlob(string blobName)
             {
-                string sasToken = _container.GetSharedAccessSignature(SasReadOnly);
+                string sasToken = GetSasTokenForPermissions(BlobContainerSasPermissions.Read, DateTime.UtcNow.AddDays(30));
                 if (sasToken.StartsWith("?"))
                 {
                     sasToken = sasToken.Substring(1);
                 }
 
-                CloudBlockBlob blob = _container.GetBlockBlobReference(blobName);
+                BlobClient blob = _container.GetBlobClient(blobName);
                 return (blob, sasToken);
             }
         }
diff --git a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ContainerBase.cs b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ContainerBase.cs
index eed45d6a851..eca23eb5302 100644
--- a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ContainerBase.cs
+++ b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/ContainerBase.cs
@@ -1,26 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.DotNet.Helix.Client.Models;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Auth;
-using Microsoft.WindowsAzure.Storage.Blob;
+using Azure.Storage.Blobs;
 
 namespace Microsoft.DotNet.Helix.Client
 {
 
     internal abstract class ContainerBase : IBlobContainer
     {
-        protected abstract (CloudBlockBlob blob, string sasToken) GetBlob(string blobName);
+        protected abstract (BlobClient blob, string sasToken) GetBlob(string blobName);
 
         public async Task<Uri> UploadFileAsync(Stream stream, string blobName, CancellationToken cancellationToken)
         {
             var (pageBlob, sasToken) = GetBlob(blobName);
-
-            await pageBlob.UploadFromStreamAsync(stream, default(AccessCondition), default(BlobRequestOptions), default(OperationContext), cancellationToken);
+            await pageBlob.UploadAsync(stream, cancellationToken);
 
             return new UriBuilder(pageBlob.Uri) { Query = sasToken }.Uri;
         }
@@ -29,9 +27,8 @@ public async Task<Uri> UploadTextAsync(string text, string blobName, Cancellatio
         {
             var (pageBlob, sasToken) = GetBlob(blobName);
             byte[] bytes = Encoding.UTF8.GetBytes(text);
-            await pageBlob.UploadFromByteArrayAsync(bytes, 0, bytes.Length, default(AccessCondition), default(BlobRequestOptions), default(OperationContext), cancellationToken);
 
-            return new UriBuilder(pageBlob.Uri) { Query = sasToken }.Uri;
+            return await UploadFileAsync(new MemoryStream(bytes), blobName, cancellationToken);
         }
 
         public abstract string Uri { get; }
diff --git a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/IBlobContainer.cs b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/IBlobContainer.cs
index 09b9985a2f0..596ed2b18a4 100644
--- a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/IBlobContainer.cs
+++ b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/IBlobContainer.cs
@@ -1,13 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
 using System;
-using System.Diagnostics;
 using System.IO;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.DotNet.Helix.Client.Models;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Auth;
-using Microsoft.WindowsAzure.Storage.Blob;
 
 namespace Microsoft.DotNet.Helix.Client
 {
diff --git a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/IBlobHelper.cs b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/IBlobHelper.cs
index 994cad9ee62..833e0ff596f 100644
--- a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/IBlobHelper.cs
+++ b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/IBlobHelper.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.DotNet.Helix.Client.Models;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Auth;
-using Microsoft.WindowsAzure.Storage.Blob;
+
 
 namespace Microsoft.DotNet.Helix.Client
 {
diff --git a/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/StorageRetryPolicy.cs b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/StorageRetryPolicy.cs
new file mode 100644
index 00000000000..0add98b4c88
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/JobSender/StorageHelpers/StorageRetryPolicy.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Azure.Core;
+using Azure.Storage.Blobs;
+
+namespace Microsoft.DotNet.Helix.Client
+{
+    class StorageRetryPolicy
+    {
+        internal static BlobClientOptions GetBlobClientOptionsRetrySettings()
+        {
+            // If this takes way too long in failure mode, or doesn't retry enough, change the settings here to impact all *BlobHelper classes
+
+            BlobClientOptions options = new BlobClientOptions();
+            options.Retry.Delay = TimeSpan.FromSeconds(5);
+            options.Retry.MaxDelay = TimeSpan.FromSeconds(30);
+            options.Retry.MaxRetries = 10;
+            options.Retry.Mode = RetryMode.Exponential;
+
+            return options;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/CreateXHarnessAndroidWorkItemsTests.cs b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/CreateXHarnessAndroidWorkItemsTests.cs
new file mode 100644
index 00000000000..95309c9fe40
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/CreateXHarnessAndroidWorkItemsTests.cs
@@ -0,0 +1,261 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Microsoft.Arcade.Common;
+using Microsoft.Arcade.Test.Common;
+using Microsoft.Build.Framework;
+using Microsoft.DotNet.Internal.DependencyInjection.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+#nullable enable
+namespace Microsoft.DotNet.Helix.Sdk.Tests
+{
+    public class CreateXHarnessAndroidWorkItemsTests
+    {
+        private readonly MockFileSystem _fileSystem;
+        private readonly Mock<IZipArchiveManager> _zipArchiveManager;
+        private readonly CreateXHarnessAndroidWorkItems _task;
+
+        public CreateXHarnessAndroidWorkItemsTests()
+        {
+            _fileSystem = new MockFileSystem();
+            _zipArchiveManager = new();
+            _zipArchiveManager.SetReturnsDefault(Task.CompletedTask);
+            _zipArchiveManager
+                .Setup(x => x.ArchiveFile(It.IsAny<string>(), It.IsAny<string>()))
+                .Callback<string, string>((folder, zipPath) =>
+                {
+                    _fileSystem.Files.Add(zipPath, "zip of " + folder);
+                });
+
+            _task = new CreateXHarnessAndroidWorkItems()
+            {                
+                BuildEngine = new MockBuildEngine(),
+            };
+        }
+
+        [Fact]
+        public void MissingApkNamePropertyIsCaught()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.Apks = new[]
+            {
+                CreateApk("/apks/System.Foo.app", null!)
+            };
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeFalse();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(0);
+        }
+
+        [Fact]
+        public void AndroidXHarnessWorkItemIsCreated()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.Apks = new[]
+            {
+                CreateApk("/apks/System.Foo.apk", "System.Foo", "00:15:42", "00:08:55")
+            };
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeTrue();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(1);
+
+            var workItem = _task.WorkItems.First();
+            workItem.GetMetadata("Identity").Should().Be("System.Foo");
+            workItem.GetMetadata("Timeout").Should().Be("00:16:02");
+
+            var payloadArchive = workItem.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+
+            var command = workItem.GetMetadata("Command");
+            command.Should().Contain("-timeout \"00:08:55\"");
+
+            _zipArchiveManager
+                .Verify(x => x.ArchiveFile("/apks/System.Foo.apk", payloadArchive), Times.Once);
+            _zipArchiveManager
+                .Verify(x => x.AddResourceFileToArchive<XHarnessTaskBase>(payloadArchive, It.Is<string>(s => s.Contains("xharness-helix-job.android.sh")), "xharness-helix-job.android.sh"), Times.AtLeastOnce);
+            _zipArchiveManager
+                .Verify(x => x.AddResourceFileToArchive<XHarnessTaskBase>(payloadArchive, It.Is<string>(s => s.Contains("xharness-helix-job.android.ps1")), "xharness-helix-job.android.ps1"), Times.AtLeastOnce);
+        }
+
+        [Fact]
+        public void ArchivePayloadIsOverwritten()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.Apks = new[]
+            {
+                CreateApk("apks/System.Foo.apk", "System.Foo"),
+                CreateApk("apks/System.Bar.apk", "System.Bar"),
+            };
+
+            _fileSystem.Files.Add("apks/xharness-payload-system.foo.zip", "archive");
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeTrue();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(2);
+
+            var workItem = _task.WorkItems.Last();
+            workItem.GetMetadata("Identity").Should().Be("System.Bar");
+            
+            workItem = _task.WorkItems.First();
+            workItem.GetMetadata("Identity").Should().Be("System.Foo");
+
+            var payloadArchive = workItem.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+            _fileSystem.RemovedFiles.Should().Contain(payloadArchive);
+        }
+
+        [Fact]
+        public void ApkIsReused()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.Apks = new[]
+            {
+                CreateApk("item-1", "System.Foo", apkPath: "apks/System.Foo.apk"),
+                CreateApk("item-2", "System.Foo", apkPath: "apks/System.Foo.apk"),
+            };
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeTrue();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(2);
+            _fileSystem.RemovedFiles.Should().BeEmpty();
+
+            var workItem1 = _task.WorkItems.Last();
+            workItem1.GetMetadata("Identity").Should().Be("item-2");
+
+            var payloadArchive = workItem1.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+
+            var workItem2 = _task.WorkItems.First();
+            workItem2.GetMetadata("Identity").Should().Be("item-1");
+
+            payloadArchive = workItem2.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+        }
+
+        [Fact]
+        public void ZippedApkIsProvided()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.Apks = new[]
+            {
+                CreateApk("/apks/System.Foo.zip", "System.Foo", "00:15:42", "00:08:55")
+            };
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeTrue();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(1);
+
+            var workItem = _task.WorkItems.First();
+            workItem.GetMetadata("Identity").Should().Be("System.Foo");
+            workItem.GetMetadata("Timeout").Should().Be("00:16:02");
+
+            var payloadArchive = workItem.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+
+            var command = workItem.GetMetadata("Command");
+            command.Should().Contain("-timeout \"00:08:55\"");
+
+            _zipArchiveManager
+                .Verify(x => x.ArchiveFile(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+            _zipArchiveManager
+                .Verify(x => x.AddResourceFileToArchive<XHarnessTaskBase>(payloadArchive, It.Is<string>(s => s.Contains("xharness-helix-job.android.sh")), "xharness-helix-job.android.sh"), Times.AtLeastOnce);
+            _zipArchiveManager
+                .Verify(x => x.AddResourceFileToArchive<XHarnessTaskBase>(payloadArchive, It.Is<string>(s => s.Contains("xharness-helix-job.android.ps1")), "xharness-helix-job.android.ps1"), Times.AtLeastOnce);
+        }
+
+        [Fact]
+        public void AreDependenciesRegistered()
+        {
+            var task = new CreateXHarnessAndroidWorkItems();
+
+            var collection = new ServiceCollection();
+            task.ConfigureServices(collection);
+            var provider = collection.BuildServiceProvider();
+
+            DependencyInjectionValidation.IsDependencyResolutionCoherent(
+                s => task.ConfigureServices(s),
+                out string message,
+                additionalSingletonTypes: task.GetExecuteParameterTypes()
+            )
+            .Should()
+            .BeTrue(message);
+        }
+
+        private ITaskItem CreateApk(
+            string itemSpec,
+            string apkName,
+            string? workItemTimeout = null,
+            string? testTimeout = null,
+            int expectedExitCode = 0,
+            string? apkPath = null)
+        {
+            var mockBundle = new Mock<ITaskItem>();
+            mockBundle.SetupGet(x => x.ItemSpec).Returns(itemSpec);
+            mockBundle.Setup(x => x.GetMetadata(CreateXHarnessAndroidWorkItems.MetadataNames.AndroidPackageName)).Returns(apkName);
+
+            if (workItemTimeout != null)
+            {
+                mockBundle.Setup(x => x.GetMetadata(XHarnessTaskBase.MetadataName.WorkItemTimeout)).Returns(workItemTimeout);
+            }
+
+            if (testTimeout != null)
+            {
+                mockBundle.Setup(x => x.GetMetadata(XHarnessTaskBase.MetadataName.TestTimeout)).Returns(testTimeout);
+            }
+
+            if (expectedExitCode != 0)
+            {
+                mockBundle.Setup(x => x.GetMetadata(XHarnessTaskBase.MetadataName.ExpectedExitCode)).Returns(expectedExitCode.ToString());
+            }
+
+            if (apkPath != null)
+            {
+                mockBundle.Setup(x => x.GetMetadata(CreateXHarnessAndroidWorkItems.MetadataNames.ApkPath)).Returns(apkPath);
+            }
+
+            _fileSystem.WriteToFile(apkPath ?? itemSpec, "apk");
+
+            return mockBundle.Object;
+        }
+
+        private IServiceCollection CreateMockServiceCollection()
+        {
+            var collection = new ServiceCollection();
+            collection.AddSingleton<IFileSystem>(_fileSystem);
+            collection.AddSingleton(_zipArchiveManager.Object);
+            return collection;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/CreateXHarnessAppleWorkItemsTests.cs b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/CreateXHarnessAppleWorkItemsTests.cs
new file mode 100644
index 00000000000..1f99b3e60a5
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/CreateXHarnessAppleWorkItemsTests.cs
@@ -0,0 +1,335 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Microsoft.Arcade.Common;
+using Microsoft.Arcade.Test.Common;
+using Microsoft.Build.Framework;
+using Microsoft.DotNet.Internal.DependencyInjection.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+#nullable enable
+namespace Microsoft.DotNet.Helix.Sdk.Tests
+{
+    public class CreateXHarnessAppleWorkItemsTests
+    {
+        private readonly MockFileSystem _fileSystem;
+        private readonly Mock<IProvisioningProfileProvider> _profileProvider;
+        private readonly Mock<IZipArchiveManager> _zipArchiveManager;
+        private readonly CreateXHarnessAppleWorkItems _task;
+
+        public CreateXHarnessAppleWorkItemsTests()
+        {
+            _fileSystem = new MockFileSystem();
+            _profileProvider = new();
+            _zipArchiveManager = new();
+            _zipArchiveManager.SetReturnsDefault(Task.CompletedTask);
+            _zipArchiveManager
+                .Setup(x => x.ArchiveDirectory(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
+                .Callback<string, string, bool>((folder, zipPath, _) =>
+                {
+                    _fileSystem.Files.Add(zipPath, "zip of " + folder);
+                });
+
+            _task = new CreateXHarnessAppleWorkItems()
+            {                
+                BuildEngine = new MockBuildEngine(),
+            };
+        }
+
+        [Fact]
+        public void MissingTargetsPropertyIsCaught()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.AppBundles = new[]
+            {
+                CreateAppBundle("/apps/System.Foo.app", null!)
+            };
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeFalse();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(0);
+        }
+
+        [Fact]
+        public void AppleXHarnessWorkItemIsCreated()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.AppBundles = new[]
+            {
+                CreateAppBundle("/apps/System.Foo.app", "ios-device_13.5", "00:15:42", "00:08:55", "00:02:33")
+            };
+            _task.TmpDir = "/tmp";
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeTrue();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(1);
+
+            var workItem = _task.WorkItems.First();
+            workItem.GetMetadata("Identity").Should().Be("System.Foo");
+            workItem.GetMetadata("Timeout").Should().Be("00:16:02");
+
+            var payloadArchive = workItem.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+
+            var command = workItem.GetMetadata("Command");
+            command.Should().Contain("System.Foo.app");
+            command.Should().Contain("--target \"ios-device_13.5\"");
+            command.Should().Contain("--timeout \"00:08:55\"");
+            command.Should().Contain("--launch-timeout \"00:02:33\"");
+
+            _profileProvider
+                .Verify(x => x.AddProfileToPayload(payloadArchive, "ios-device_13.5"), Times.Once);
+            _zipArchiveManager
+                .Verify(x => x.ArchiveDirectory("/apps/System.Foo.app", payloadArchive, true), Times.Once);
+            _zipArchiveManager
+                .Verify(x => x.AddResourceFileToArchive<XHarnessTaskBase>(payloadArchive, It.Is<string>(s => s.Contains("xharness-helix-job.apple.sh")), "xharness-helix-job.apple.sh"), Times.Once);
+            _zipArchiveManager
+                .Verify(x => x.AddResourceFileToArchive<XHarnessTaskBase>(payloadArchive, It.Is<string>(s => s.Contains("xharness-runner.apple.sh")), "xharness-runner.apple.sh"), Times.Once);
+            _zipArchiveManager
+                .Verify(x => x.AddContentToArchive(payloadArchive, "command.sh", It.Is<string>(s => s.Contains("xharness apple test"))), Times.Once);
+        }
+
+        [Fact]
+        public void ArchivePayloadIsOverwritten()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.AppBundles = new[]
+            {
+                CreateAppBundle("apps/System.Foo.app", "ios-simulator-64_13.5"),
+                CreateAppBundle("apps/System.Bar.app", "ios-simulator-64_13.5"),
+            };
+
+            _fileSystem.Files.Add("apps/xharness-payload-system.foo.zip", "archive");
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeTrue();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(2);
+
+            var workItem = _task.WorkItems.Last();
+            workItem.GetMetadata("Identity").Should().Be("System.Bar");
+            
+            workItem = _task.WorkItems.First();
+            workItem.GetMetadata("Identity").Should().Be("System.Foo");
+
+            var payloadArchive = workItem.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+            _fileSystem.RemovedFiles.Should().Contain(payloadArchive);
+
+            var command = workItem.GetMetadata("Command");
+            command.Should().Contain("--launch-timeout \"00:03:00\"");
+        }
+
+        [Fact]
+        public void CustomCommandsAreExecuted()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.AppBundles = new[]
+            {
+                CreateAppBundle("apps/System.Foo.app", "ios-simulator-64_13.5", customCommands: "echo foo"),
+            };
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeTrue();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(1);
+
+            var workItem = _task.WorkItems.First();
+            workItem.GetMetadata("Identity").Should().Be("System.Foo");
+
+            var payloadArchive = workItem.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+
+            _zipArchiveManager
+                .Verify(x => x.AddContentToArchive(payloadArchive, "command.sh", "echo foo"), Times.Once);
+        }
+
+        [Fact]
+        public void AppBundleIsReused()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.AppBundles = new[]
+            {
+                CreateAppBundle("item-1", "ios-device_13.5", appBundlePath: "apps/System.Foo.app"),
+                CreateAppBundle("item-2", "ios-simulator-64_13.6", appBundlePath: "apps/System.Foo.app"),
+            };
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeTrue();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(2);
+            _fileSystem.RemovedFiles.Should().BeEmpty();
+
+            var workItem1 = _task.WorkItems.First();
+            workItem1.GetMetadata("Identity").Should().Be("item-1");
+
+            var payloadArchive = workItem1.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+
+            var command = workItem1.GetMetadata("Command");
+            command.Should().Contain("--target \"ios-device_13.5\"");
+            command.Should().Contain("--launch-timeout \"00:05:00\"");
+
+            var workItem2 = _task.WorkItems.Last();
+            workItem2.GetMetadata("Identity").Should().Be("item-2");
+
+            payloadArchive = workItem2.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+
+            command = workItem2.GetMetadata("Command");
+            command.Should().Contain("--target \"ios-simulator-64_13.6\"");
+            command.Should().Contain("--launch-timeout \"00:03:00\"");
+        }
+
+        [Fact]
+        public void ZippedAppIsProvided()
+        {
+            var collection = CreateMockServiceCollection();
+            _task.ConfigureServices(collection);
+            _task.AppBundles = new[]
+            {
+                CreateAppBundle("/apps/System.Foo.zip", "ios-device_13.5", "00:15:42", "00:08:55", "00:02:33")
+            };
+            _task.TmpDir = "/tmp";
+            _fileSystem.Files.Add("/apps/System.Foo.zip", "zipped payload");
+            _fileSystem.Directories.Remove("/apps/System.Foo.zip");
+
+            // Act
+            using var provider = collection.BuildServiceProvider();
+            _task.InvokeExecute(provider).Should().BeTrue();
+
+            // Verify
+            _task.WorkItems.Length.Should().Be(1);
+
+            var workItem = _task.WorkItems.First();
+            workItem.GetMetadata("Identity").Should().Be("System.Foo");
+            workItem.GetMetadata("Timeout").Should().Be("00:16:02");
+
+            var payloadArchive = workItem.GetMetadata("PayloadArchive");
+            payloadArchive.Should().NotBeNullOrEmpty();
+            _fileSystem.FileExists(payloadArchive).Should().BeTrue();
+
+            var command = workItem.GetMetadata("Command");
+            command.Should().Contain("System.Foo.app");
+            command.Should().Contain("--target \"ios-device_13.5\"");
+            command.Should().Contain("--timeout \"00:08:55\"");
+            command.Should().Contain("--launch-timeout \"00:02:33\"");
+
+            _profileProvider
+                .Verify(x => x.AddProfileToPayload(payloadArchive, "ios-device_13.5"), Times.Once);
+            _zipArchiveManager
+                .Verify(x => x.ArchiveDirectory("/apps/System.Foo.app", payloadArchive, true), Times.Never);
+            _zipArchiveManager
+                .Verify(x => x.AddResourceFileToArchive<XHarnessTaskBase>(payloadArchive, It.Is<string>(s => s.Contains("xharness-helix-job.apple.sh")), "xharness-helix-job.apple.sh"), Times.Once);
+            _zipArchiveManager
+                .Verify(x => x.AddResourceFileToArchive<XHarnessTaskBase>(payloadArchive, It.Is<string>(s => s.Contains("xharness-runner.apple.sh")), "xharness-runner.apple.sh"), Times.Once);
+            _zipArchiveManager
+                .Verify(x => x.AddContentToArchive(payloadArchive, "command.sh", It.Is<string>(s => s.Contains("xharness apple test"))), Times.Once);
+        }
+
+        [Fact]
+        public void AreDependenciesRegistered()
+        {
+            var task = new CreateXHarnessAppleWorkItems();
+
+            var collection = new ServiceCollection();
+            task.ConfigureServices(collection);
+            var provider = collection.BuildServiceProvider();
+
+            DependencyInjectionValidation.IsDependencyResolutionCoherent(
+                s => task.ConfigureServices(s),
+                out string message,
+                additionalSingletonTypes: task.GetExecuteParameterTypes()
+            )
+            .Should()
+            .BeTrue(message);
+        }
+
+        private ITaskItem CreateAppBundle(
+            string itemSpec,
+            string target,
+            string? workItemTimeout = null,
+            string? testTimeout = null,
+            string? launchTimeout = null,
+            int expectedExitCode = 0,
+            bool includesTestRunner = true,
+            string? customCommands = null,
+            string? appBundlePath = null)
+        {
+            var mockBundle = new Mock<ITaskItem>();
+            mockBundle.SetupGet(x => x.ItemSpec).Returns(itemSpec);
+            mockBundle.Setup(x => x.GetMetadata(CreateXHarnessAppleWorkItems.MetadataNames.Target)).Returns(target);
+            mockBundle.Setup(x => x.GetMetadata(CreateXHarnessAppleWorkItems.MetadataNames.IncludesTestRunner)).Returns(includesTestRunner.ToString());
+
+            if (workItemTimeout != null)
+            {
+                mockBundle.Setup(x => x.GetMetadata(XHarnessTaskBase.MetadataName.WorkItemTimeout)).Returns(workItemTimeout);
+            }
+
+            if (testTimeout != null)
+            {
+                mockBundle.Setup(x => x.GetMetadata(XHarnessTaskBase.MetadataName.TestTimeout)).Returns(testTimeout);
+            }
+
+            if (launchTimeout != null)
+            {
+                mockBundle.Setup(x => x.GetMetadata(CreateXHarnessAppleWorkItems.MetadataNames.LaunchTimeout)).Returns(launchTimeout);
+            }
+
+            if (expectedExitCode != 0)
+            {
+                mockBundle.Setup(x => x.GetMetadata(XHarnessTaskBase.MetadataName.ExpectedExitCode)).Returns(expectedExitCode.ToString());
+            }
+
+            if (customCommands != null)
+            {
+                mockBundle.Setup(x => x.GetMetadata(XHarnessTaskBase.MetadataName.CustomCommands)).Returns(customCommands);
+            }
+
+            if (appBundlePath != null)
+            {
+                mockBundle.Setup(x => x.GetMetadata(CreateXHarnessAppleWorkItems.MetadataNames.AppBundlePath)).Returns(appBundlePath);
+            }
+
+            _fileSystem.CreateDirectory(appBundlePath ?? itemSpec);
+
+            return mockBundle.Object;
+        }
+
+        private IServiceCollection CreateMockServiceCollection()
+        {
+            var collection = new ServiceCollection();
+            collection.AddSingleton<IFileSystem>(_fileSystem);
+            collection.AddSingleton(_profileProvider.Object);
+            collection.AddSingleton(_zipArchiveManager.Object);
+            return collection;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/HelpersTests.cs b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/HelpersTests.cs
index a971acd4da5..11bd6c6921b 100644
--- a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/HelpersTests.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/HelpersTests.cs
@@ -1,5 +1,8 @@
+using System;
+using System.IO;
 using Xunit;
 using System.Net;
+using Newtonsoft.Json;
 
 namespace Microsoft.DotNet.Helix.Sdk.Tests
 {
@@ -35,5 +38,26 @@ public void VerifyNonEncodedFowardSlashIsConverted()
 
             Assert.Equal(workItemNameExpected, actual);
         }
+
+        [Fact]
+        public void FailOnceThenPass()
+        {
+            string target = Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") ?? Environment.GetEnvironmentVariable("TEMP"), "my-test-file-123456.snt");
+
+            // If we're inside a Helix Docker work item, GetTempPath() is cleaned every execution, 
+            // but the work item's own directory is not (and is writeable from inside Docker), so use it.
+            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("HELIX_DOCKER_ENTRYPOINT")))
+            {
+                target = Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_PAYLOAD"), "my-test-file-123456.snt");
+            }
+
+            bool exists = File.Exists(target);
+            if (!exists)
+            {
+                File.WriteAllText(target, "Test failed once");
+            }
+            
+            Assert.True(exists, $"File should exist: {target}");
+        }
     }
 }
diff --git a/src/Microsoft.DotNet.Arcade.Sdk.Tests/InstallDotNetToolTests.cs b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/InstallDotNetToolTests.cs
similarity index 94%
rename from src/Microsoft.DotNet.Arcade.Sdk.Tests/InstallDotNetToolTests.cs
rename to src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/InstallDotNetToolTests.cs
index b5aceb157a3..9d07f88f2ca 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk.Tests/InstallDotNetToolTests.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/InstallDotNetToolTests.cs
@@ -15,7 +15,7 @@
 using Moq;
 using Xunit;
 
-namespace Microsoft.DotNet.Arcade.Sdk.Tests
+namespace Microsoft.DotNet.Helix.Sdk.Tests
 {
     public class InstallDotNetToolTests
     {
@@ -62,7 +62,7 @@ public InstallDotNetToolTests()
             _commandFactoryMock
                 .Setup(x => x.Create(
                     It.Is<string>(s => s == _dotnetPath),
-                    It.Is<IEnumerable<string>>(args => args.All(y => _expectedArgs.Contains(y)))))
+                    It.IsAny<IEnumerable<string>>()))
                 .Returns(_commandMock.Object)
                 .Verifiable();
 
@@ -95,7 +95,7 @@ public void SkipsInstallation()
                 .Verify(
                     x => x.Create(
                         It.Is<string>(dotnet => dotnet == _dotnetPath),
-                        It.Is<IEnumerable<string>>(args => args.Count() == _expectedArgs.Count() && args.All(y => _expectedArgs.Contains(y)))),
+                        It.IsAny<IEnumerable<string>>()),
                     Times.Never);
 
             _commandMock.Verify(x => x.Execute(), Times.Never);
@@ -170,6 +170,10 @@ public void InstallsToolWithExtraParamsSuccessfully()
                 ToolVersion,
                 "--tool-path",
                 Path.Combine(InstallPath, ToolName, ToolVersion),
+                "--framework",
+                "net6.0",
+                "--arch",
+                "arm64",
                 "--add-source",
                 "https://dev.azure.com/some/feed",
                 ToolName,
@@ -179,6 +183,8 @@ public void InstallsToolWithExtraParamsSuccessfully()
             _task.ConfigureServices(collection);
             _task.Source = "https://dev.azure.com/some/feed";
             _task.DotnetPath = _dotnetPath = @"D:\dotnet\dotnet.exe";
+            _task.TargetArchitecture = "arm64";
+            _task.TargetFramework = "net6.0";
 
             // Act
             using var provider = collection.BuildServiceProvider();
@@ -209,7 +215,7 @@ public async Task InstallsInParallelWithRealMutex()
                 .Setup(x => x.DirectoryExists(It.IsAny<string>()))
                 .Returns(true);
 
-            var helpers = new Helpers();
+            var helpers = new Microsoft.Arcade.Common.Helpers();
             var hangingCommandCalled = new TaskCompletionSource<bool>();
             var dotnetToolInstalled = new TaskCompletionSource<bool>();
 
@@ -219,7 +225,7 @@ public async Task InstallsInParallelWithRealMutex()
                 .Callback(() =>
                 {
                     hangingCommandCalled.SetResult(true);
-                    dotnetToolInstalled.Task.GetAwaiter().GetResult();
+                    dotnetToolInstalled.Task.GetAwaiter().GetResult(); // stop here
                 })
                 .Returns(new CommandResult(new ProcessStartInfo(), 0, "Tool installed", null));
 
@@ -234,12 +240,12 @@ public async Task InstallsInParallelWithRealMutex()
             var collection1 = new ServiceCollection();
             collection1.AddSingleton(hangingCommandFactoryMock.Object);
             collection1.AddSingleton(fileSystemMock1.Object);
-            collection1.AddTransient<IHelpers, Helpers>();
+            collection1.AddTransient<IHelpers, Microsoft.Arcade.Common.Helpers>();
 
             var collection2 = new ServiceCollection();
             collection2.AddSingleton(_commandFactoryMock.Object);
             collection2.AddSingleton(fileSystemMock2.Object);
-            collection2.AddTransient<IHelpers, Helpers>();
+            collection2.AddTransient<IHelpers, Microsoft.Arcade.Common.Helpers>();
 
             var task1 = new InstallDotNetTool()
             {
@@ -273,7 +279,7 @@ public async Task InstallsInParallelWithRealMutex()
                 .Verify(
                     x => x.Create(
                         It.Is<string>(dotnet => dotnet == _dotnetPath),
-                        It.Is<IEnumerable<string>>(args => args.Count() == _expectedArgs.Count() && args.All(y => _expectedArgs.Contains(y)))),
+                        It.IsAny<IEnumerable<string>>()),
                     Times.Once);
 
             // The other command is waiting on the Mutex now
@@ -283,7 +289,7 @@ public async Task InstallsInParallelWithRealMutex()
                 .Verify(
                     x => x.Create(
                         It.Is<string>(dotnet => dotnet == _dotnetPath),
-                        It.Is<IEnumerable<string>>(args => args.Count() == _expectedArgs.Count() && args.All(y => _expectedArgs.Contains(y)))),
+                        It.IsAny<IEnumerable<string>>()),
                     Times.Never);
 
             // We now let `dotnet tool install` run to completion
diff --git a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj
index c5b485723a3..8234c24fa7e 100644
--- a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj
+++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj
@@ -6,12 +6,20 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
     <PackageReference Include="coverlet.collector" Version="1.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
+    <PackageReference Include="Moq" Version="4.8.3" />
+    <!-- This is here so that we agree with the project's transitive references to NewtonSoft.Json -->
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\Microsoft.Arcade.Common\Microsoft.Arcade.Common.csproj" />
+    <ProjectReference Include="..\..\..\Common\Microsoft.Arcade.Test.Common\Microsoft.Arcade.Test.Common.csproj" />
+    <ProjectReference Include="..\..\..\Microsoft.DotNet.Internal.DependencyInjection.Testing\Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj" />
     <ProjectReference Include="..\..\Sdk\Microsoft.DotNet.Helix.Sdk.csproj" />
   </ItemGroup>
 
diff --git a/src/Microsoft.DotNet.Helix/Sdk/BaseTask.cs b/src/Microsoft.DotNet.Helix/Sdk/BaseTask.cs
index 333047b7ae0..cc63c88b124 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/BaseTask.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk/BaseTask.cs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.DotNet.Helix
 {
-    public abstract partial class BaseTask : Task
+    public abstract partial class BaseTask : Microsoft.Build.Utilities.Task
     {
     }
 }
diff --git a/src/Microsoft.DotNet.Helix/Sdk/CreateFailedTestsForFailedWorkItems.cs b/src/Microsoft.DotNet.Helix/Sdk/CreateFailedTestsForFailedWorkItems.cs
index 18f7e01736c..25b1ea3a08a 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/CreateFailedTestsForFailedWorkItems.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk/CreateFailedTestsForFailedWorkItems.cs
@@ -26,56 +26,10 @@ protected override async Task ExecuteCoreAsync(HttpClient client)
                 var testRunId = workItem.GetMetadata("TestRunId");
                 var failed = workItem.GetMetadata("Failed") == "true";
 
-                var testResultId = await CreateFakeTestResultAsync(client, testRunId, jobName, workItemName, failed);
-
-                if (failed)
-                {
-                    try
-                    {
-                        var uploadedFiles = JsonConvert.DeserializeObject<List<UploadedFile>>(workItem.GetMetadata("UploadedFiles"));
-                        var text = string.Join(Environment.NewLine, uploadedFiles.Select(f => $"{f.Name}:{Environment.NewLine}  {f.Link}{Environment.NewLine}"));
-                        await AttachResultFileToTestResultAsync(client, testRunId, testResultId, text);
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.LogWarningFromException(ex);
-                    }
-                }
+                await CreateFakeTestResultAsync(client, testRunId, jobName, workItemName, failed);
             }
         }
 
-        private async Task AttachResultFileToTestResultAsync(HttpClient client, string testRunId, int testResultId, string text)
-        {
-            var b64Stream = Convert.ToBase64String(Encoding.UTF8.GetBytes(text));
-            await RetryAsync(
-                async () =>
-                {
-                    var req =
-                        new HttpRequestMessage(
-                            HttpMethod.Post,
-                            $"{CollectionUri}{TeamProject}/_apis/test/Runs/{testRunId}/Results/{testResultId}/attachments?api-version=5.1-preview.1")
-                        {
-                            Content = new StringContent(
-                                JsonConvert.SerializeObject(
-                                    new JObject
-                                    {
-                                        ["attachmentType"] = "GeneralAttachment",
-                                        ["fileName"] = "UploadFileResults.txt",
-                                        ["stream"] = b64Stream,
-                                    }),
-                                Encoding.UTF8,
-                                "application/json"),
-                        };
-                    using (req)
-                    {
-                        using (var res = await client.SendAsync(req))
-                        {
-                            res.EnsureSuccessStatusCode();
-                        }
-                    }
-                });
-        }
-
         private async Task<int> CreateFakeTestResultAsync(HttpClient client, string testRunId, string jobName, string workItemFriendlyName, bool failed)
         {
             var testResultData = await RetryAsync(
@@ -97,7 +51,7 @@ private async Task<int> CreateFakeTestResultAsync(HttpClient client, string test
                                             ["testCaseTitle"] = $"{workItemFriendlyName} Work Item",
                                             ["outcome"] = failed ? "Failed" : "Passed",
                                             ["state"] = "Completed",
-                                            ["errorMessage"] = failed ? "The Helix Work Item failed. Often this is due to a test crash or infrastructure failure. See the Helix Test Logs tab in the Results page of Azure DevOps." : null,
+                                            ["errorMessage"] = failed ? "The Helix Work Item failed. Often this is due to a test crash. Please see the 'Artifacts' tab above for additional logs." : null,
                                             ["durationInMs"] = 60 * 1000, // Use a non-zero duration so that the graphs look better.
                                             ["comment"] = new JObject
                                             {
diff --git a/src/Microsoft.DotNet.Helix/Sdk/CreateXHarnessAndroidWorkItems.cs b/src/Microsoft.DotNet.Helix/Sdk/CreateXHarnessAndroidWorkItems.cs
index 135d7ea7b3b..f4c636aec9d 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/CreateXHarnessAndroidWorkItems.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk/CreateXHarnessAndroidWorkItems.cs
@@ -1,10 +1,11 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Arcade.Common;
 using Microsoft.Build.Framework;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.DotNet.Helix.Sdk
 {
@@ -13,8 +14,25 @@ namespace Microsoft.DotNet.Helix.Sdk
     /// </summary>
     public class CreateXHarnessAndroidWorkItems : XHarnessTaskBase
     {
-        private const string PosixAndroidWrapperScript = "xharness-helix-job.android.sh";
-        private const string NonPosixAndroidWrapperScript = "xharness-helix-job.android.bat";
+        public static class MetadataNames
+        {
+            public const string Arguments = "Arguments";
+            public const string AndroidInstrumentationName = "AndroidInstrumentationName";
+            public const string DeviceOutputPath = "DeviceOutputPath";
+            public const string AndroidPackageName = "AndroidPackageName";
+            public const string ApkPath = "ApkPath";
+        }
+
+        private const string PosixAndroidScript = "xharness-helix-job.android.sh";
+        private const string NonPosixAndroidScript = "xharness-helix-job.android.ps1";
+        private const string NonPosixAndroidWrapperScript = "xharness-runner.android.ps1";
+
+        /// <summary>
+        /// Boolean true if this is a posix shell, false if not.
+        /// This does not need to be set by a user; it is automatically determined in Microsoft.DotNet.Helix.Sdk.MonoQueue.targets
+        /// </summary>
+        [Required]
+        public bool IsPosixShell { get; set; }
 
         /// <summary>
         /// An array of one or more paths to application packages (.apk for Android)
@@ -22,24 +40,25 @@ public class CreateXHarnessAndroidWorkItems : XHarnessTaskBase
         /// </summary>
         public ITaskItem[] Apks { get; set; }
 
+        public override void ConfigureServices(IServiceCollection collection)
+        {
+            collection.TryAddTransient<IZipArchiveManager, ZipArchiveManager>();
+            collection.TryAddTransient<IFileSystem, FileSystem>();
+            collection.TryAddSingleton(Log);
+        }
+
         /// <summary>
         /// The main method of this MSBuild task which calls the asynchronous execution method and
         /// collates logged errors in order to determine the success of HelixWorkItems
         /// </summary>
         /// <returns>A boolean value indicating the success of HelixWorkItem creation</returns>
-        public override bool Execute()
+        public bool ExecuteTask(IZipArchiveManager zipArchiveManager, IFileSystem fileSystem)
         {
-            ExecuteAsync().GetAwaiter().GetResult();
-            return !Log.HasLoggedErrors;
-        }
+            var tasks = Apks.Select(apk => PrepareWorkItem(zipArchiveManager, fileSystem, apk));
 
-        /// <summary>
-        /// Create work items for XHarness test execution
-        /// </summary>
-        /// <returns></returns>
-        private async Task ExecuteAsync()
-        {
-            WorkItems = (await Task.WhenAll(Apks.Select(PrepareWorkItem))).Where(wi => wi != null).ToArray();
+            WorkItems = Task.WhenAll(tasks).GetAwaiter().GetResult().Where(wi => wi != null).ToArray();
+
+            return !Log.HasLoggedErrors;
         }
 
         /// <summary>
@@ -47,92 +66,134 @@ private async Task ExecuteAsync()
         /// </summary>
         /// <param name="appPackage">Path to application package</param>
         /// <returns>An ITaskItem instance representing the prepared HelixWorkItem.</returns>
-        private async Task<ITaskItem> PrepareWorkItem(ITaskItem appPackage)
+        private async Task<ITaskItem> PrepareWorkItem(IZipArchiveManager zipArchiveManager, IFileSystem fileSystem, ITaskItem appPackage)
         {
-            // Forces this task to run asynchronously
-            await Task.Yield();
-            string workItemName = Path.GetFileNameWithoutExtension(appPackage.ItemSpec);
-
-            var (testTimeout, workItemTimeout, expectedExitCode) = ParseMetadata(appPackage);
-
-            string command = ValidateMetadataAndGetXHarnessAndroidCommand(appPackage, testTimeout, expectedExitCode);
+            var (workItemName, apkPath) = GetNameAndPath(appPackage, MetadataNames.ApkPath, fileSystem);
 
-            if (!Path.GetExtension(appPackage.ItemSpec).Equals(".apk", StringComparison.OrdinalIgnoreCase))
+            if (!fileSystem.FileExists(apkPath))
             {
-                Log.LogError($"Unsupported app package type: {Path.GetFileName(appPackage.ItemSpec)}");
+                Log.LogError($"App package not found in {apkPath}");
                 return null;
             }
 
-            Log.LogMessage($"Creating work item with properties Identity: {workItemName}, Payload: {appPackage.ItemSpec}, Command: {command}");
+            string extension = fileSystem.GetExtension(apkPath).ToLowerInvariant();
+            bool isAlreadyArchived = (extension == ".zip");
 
-            string workItemZip = await CreateZipArchiveOfPackageAsync(appPackage.ItemSpec);
-
-            return new Build.Utilities.TaskItem(workItemName, new Dictionary<string, string>()
+            if (!isAlreadyArchived && extension != ".apk")
             {
-                { "Identity", workItemName },
-                { "PayloadArchive", workItemZip},
-                { "Command", command },
-                { "Timeout", workItemTimeout.ToString() },
-            });
-        }
+                Log.LogError($"Unsupported payload file `{fileSystem.GetFileName(apkPath)}`; expecting .apk or .zip");
+                return null;
+            }
 
-        private async Task<string> CreateZipArchiveOfPackageAsync(string fileToZip)
-        {
-            string directoryOfPackage = Path.GetDirectoryName(fileToZip);
-            string fileName = $"xharness-apk-payload-{Path.GetFileNameWithoutExtension(fileToZip).ToLowerInvariant()}.zip";
-            string outputZipAbsolutePath = Path.Combine(directoryOfPackage, fileName);
-            using (FileStream fs = File.OpenWrite(outputZipAbsolutePath))
-            using (var zip = new ZipArchive(fs, ZipArchiveMode.Create, false))
+            var (testTimeout, workItemTimeout, expectedExitCode, customCommands) = ParseMetadata(appPackage);
+            appPackage.TryGetMetadata(MetadataNames.AndroidPackageName, out string androidPackageName);
+
+            if (customCommands == null)
             {
-                zip.CreateEntryFromFile(fileToZip, Path.GetFileName(fileToZip));
+                // When no user commands are specified, we add the default `android test ...` command
+                customCommands = GetDefaultCommand(appPackage, expectedExitCode);
+
+                // Validation of any metadata specific to Android stuff goes here
+                if (string.IsNullOrEmpty(androidPackageName))
+                {
+                    Log.LogError($"{MetadataNames.AndroidPackageName} metadata must be specified when not supplying custom commands");
+                    return null;
+                }
             }
 
-            // WorkItem payloads of APKs can be reused if sent to multiple queues at once,
-            // so we'll always include both scripts (very small)
-            await AddResourceFileToPayload(outputZipAbsolutePath, PosixAndroidWrapperScript);
-            await AddResourceFileToPayload(outputZipAbsolutePath, NonPosixAndroidWrapperScript);
+            string apkName = Path.GetFileName(apkPath);
+            if (isAlreadyArchived) {
+                apkName = apkName.Replace(".zip", ".apk");
+            }
 
-            return outputZipAbsolutePath;
-        }
+            string command = GetHelixCommand(appPackage, apkName, androidPackageName, workItemTimeout, testTimeout, expectedExitCode);
 
-        private string ValidateMetadataAndGetXHarnessAndroidCommand(ITaskItem appPackage, TimeSpan xHarnessTimeout, int expectedExitCode)
-        {
-            // Validation of any metadata specific to Android stuff goes here
-            if (!appPackage.GetRequiredMetadata(Log, "AndroidPackageName", out string androidPackageName))
+            if (!IsPosixShell)
             {
-                Log.LogError("AndroidPackageName metadata must be specified; this may match, but can vary from file name");
-                return null;
+                // For windows, we need to add a .ps1 header to turn the script into a cmdlet
+                customCommands = WrapCustomCommands(customCommands);
             }
 
-            appPackage.TryGetMetadata("Arguments", out string arguments);
-            appPackage.TryGetMetadata("AndroidInstrumentationName", out string androidInstrumentationName);
-            appPackage.TryGetMetadata("DeviceOutputPath", out string deviceOutputPath);
+            string workItemZip = await CreatePayloadArchive(
+                zipArchiveManager,
+                fileSystem,
+                workItemName,
+                isAlreadyArchived,
+                IsPosixShell,
+                apkPath,
+                customCommands,
+                new[]
+                {
+                    // WorkItem payloads of APKs can be reused if sent to multiple queues at once,
+                    // so we'll always include both scripts (very small)
+                    PosixAndroidScript, NonPosixAndroidScript
+                });
+
+            return CreateTaskItem(workItemName, workItemZip, command, workItemTimeout);
+        }
 
-            string outputPathArg = string.IsNullOrEmpty(deviceOutputPath) ? string.Empty : $"--dev-out={deviceOutputPath} ";
-            string instrumentationArg = string.IsNullOrEmpty(androidInstrumentationName) ? string.Empty : $"-i={androidInstrumentationName} ";
+        private string GetDefaultCommand(ITaskItem appPackage, int expectedExitCode)
+        {
+            appPackage.TryGetMetadata(MetadataNames.Arguments, out string extraArguments);
+
+            var exitCodeArg = expectedExitCode != 0 ? $"--expected-exit-code $expected_exit_code" : string.Empty;
+            var passthroughArgs = !string.IsNullOrEmpty(AppArguments) ? $" -- {AppArguments}" : string.Empty;
+
+            var instrumentationArg = appPackage.TryGetMetadata(MetadataNames.AndroidInstrumentationName, out string androidInstrumentationName)
+                ? $"--instrumentation \"{androidInstrumentationName}\""
+                : string.Empty;
+
+            var devOutArg = appPackage.TryGetMetadata(MetadataNames.DeviceOutputPath, out string deviceOutputPath)
+                ? $"--dev-out \"{deviceOutputPath}\""
+                : string.Empty;
+
+            // In case user didn't specify custom commands, we use our default one
+            return "xharness android test " +
+                "--app \"$app\" " +
+                "--output-directory \"$output_directory\" " +
+                "--timeout \"$timeout\" " +
+                "--package-name \"$package_name\" " +
+                " -v " +
+                $"{ devOutArg } { instrumentationArg } { exitCodeArg } { extraArguments } { passthroughArgs }";
+        }
 
-            string outputDirectory = IsPosixShell ? "$HELIX_WORKITEM_UPLOAD_ROOT" : "%HELIX_WORKITEM_UPLOAD_ROOT%";
-            string wrapperScriptName = IsPosixShell ? PosixAndroidWrapperScript : NonPosixAndroidWrapperScript;
+        private string GetHelixCommand(
+            ITaskItem appPackage,
+            string apkName,
+            string androidPackageName,
+            TimeSpan workItemTimeout,
+            TimeSpan xHarnessTimeout,
+            int expectedExitCode)
+        {
+            appPackage.TryGetMetadata(MetadataNames.AndroidInstrumentationName, out string androidInstrumentationName);
+            appPackage.TryGetMetadata(MetadataNames.DeviceOutputPath, out string deviceOutputPath);
 
+            string wrapperScriptName = IsPosixShell ? PosixAndroidScript : NonPosixAndroidScript;
             string xharnessHelixWrapperScript = IsPosixShell ? $"chmod +x ./{wrapperScriptName} && ./{wrapperScriptName}"
-                                                             : $"call {wrapperScriptName}";
+                                                             : $"powershell -ExecutionPolicy ByPass -NoProfile -File \"{wrapperScriptName}\"";
 
+            // We either call .ps1 or .sh so we need to format the arguments well (PS has -argument, bash has --argument)
+            string dash = IsPosixShell ? "--" : "-";
             string xharnessRunCommand = $"{xharnessHelixWrapperScript} " +
-                                        $"dotnet exec \"{(IsPosixShell ? "$XHARNESS_CLI_PATH" : "%XHARNESS_CLI_PATH%")}\" android test " +
-                                        $"--app \"{Path.GetFileName(appPackage.ItemSpec)}\" " +
-                                        $"--output-directory \"{outputDirectory}\" " +
-                                        $"--timeout \"{xHarnessTimeout}\" " +
-                                        $"-p=\"{androidPackageName}\" " +
-                                        "-v " +
-                                        (expectedExitCode != 0 ? $" --expected-exit-code \"{expectedExitCode}\" " : string.Empty) +
-                                        outputPathArg +
-                                        instrumentationArg +
-                                        arguments +
-                                        (!string.IsNullOrEmpty(AppArguments) ? $" -- {AppArguments}" : string.Empty);
+                $"{dash}app \"{apkName}\" " +
+                $"{dash}command_timeout {(int)workItemTimeout.TotalSeconds} " +
+                $"{dash}timeout \"{xHarnessTimeout}\" " +
+                $"{dash}package_name \"{androidPackageName}\" " +
+                (expectedExitCode != 0 ? $" {dash}expected_exit_code \"{expectedExitCode}\" " : string.Empty) +
+                (string.IsNullOrEmpty(deviceOutputPath) ? string.Empty : $"{dash}device_output_path \"{deviceOutputPath}\" ") +
+                (string.IsNullOrEmpty(androidInstrumentationName) ? string.Empty : $"{dash}instrumentation \"{androidInstrumentationName}\" ");
 
             Log.LogMessage(MessageImportance.Low, $"Generated XHarness command: {xharnessRunCommand}");
 
             return xharnessRunCommand;
         }
+
+        private static string WrapCustomCommands(string customCommands)
+        {
+            using Stream stream = ZipArchiveManager.GetResourceFileContent<CreateXHarnessAndroidWorkItems>(
+                ScriptNamespace + NonPosixAndroidWrapperScript);
+            using StreamReader reader = new(stream);
+            return reader.ReadToEnd().Replace("<#%%USER COMMANDS%%#>", customCommands);
+        }
     }
 }
diff --git a/src/Microsoft.DotNet.Helix/Sdk/CreateXHarnessAppleWorkItems.cs b/src/Microsoft.DotNet.Helix/Sdk/CreateXHarnessAppleWorkItems.cs
index f1bc08541fb..e4c4b6bc958 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/CreateXHarnessAppleWorkItems.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk/CreateXHarnessAppleWorkItems.cs
@@ -1,12 +1,11 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
-using System.Net;
 using System.Threading.Tasks;
 using Microsoft.Arcade.Common;
 using Microsoft.Build.Framework;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.DotNet.Helix.Sdk
 {
@@ -15,23 +14,35 @@ namespace Microsoft.DotNet.Helix.Sdk
     /// </summary>
     public class CreateXHarnessAppleWorkItems : XHarnessTaskBase
     {
-        private const string EntryPointScriptName = "xharness-helix-job.apple.sh";
-        private const string RunnerScriptName = "xharness-runner.apple.sh";
-        private const string LaunchTimeoutPropName = "LaunchTimeout";
-        private const string TargetPropName = "Targets";
-        private const string IncludesTestRunnerPropName = "IncludesTestRunner";
-        private const int DefaultLaunchTimeoutInMinutes = 10;
+        public const string iOSTargetName = "ios-device";
+        public const string tvOSTargetName = "tvos-device";
 
-        private readonly IHelpers _helpers = new Arcade.Common.Helpers();
+        public static class MetadataNames
+        {
+            public const string Target = "TestTarget";
+            public const string LaunchTimeout = "LaunchTimeout";
+            public const string IncludesTestRunner = "IncludesTestRunner";
+            public const string ResetSimulator = "ResetSimulator";
+            public const string AppBundlePath = "AppBundlePath";
+        }
+
+        private const string EntryPointScript = "xharness-helix-job.apple.sh";
+        private const string RunnerScript = "xharness-runner.apple.sh";
+
+        // We have a more aggressive timeout towards simulators which tend to slow down until installation takes 20 minutes and the machine needs a reboot
+        // For this reason, it's better to be aggressive and detect a slower machine sooner
+        private static readonly TimeSpan s_defaultSimulatorLaunchTimeout = TimeSpan.FromMinutes(3);
+        private static readonly TimeSpan s_defaultDeviceLaunchTimeout = TimeSpan.FromMinutes(5);
 
         /// <summary>
-        /// An array of one or more paths to iOS app bundles (folders ending with ".app" usually)
+        /// An array of one or more paths to iOS/tvOS app bundles (folders ending with ".app" usually)
         /// that will be used to create Helix work items.
         /// </summary>
+        [Required]
         public ITaskItem[] AppBundles { get; set; }
 
         /// <summary>
-        /// Xcode version to use in the [major].[minor] format, e.g. 11.4
+        /// Xcode version to use, e.g. 11.4 or 12.5_beta3.
         /// </summary>
         public string XcodeVersion { get; set; }
 
@@ -47,41 +58,29 @@ public class CreateXHarnessAppleWorkItems : XHarnessTaskBase
         /// </summary>
         public string TmpDir { get; set; }
 
-        private enum TargetPlatform
+        public override void ConfigureServices(IServiceCollection collection)
         {
-            iOS,
-            tvOS,
+            collection.TryAddProvisioningProfileProvider(ProvisioningProfileUrl, TmpDir);
+            collection.TryAddTransient<IZipArchiveManager, ZipArchiveManager>();
+            collection.TryAddTransient<IFileSystem, FileSystem>();
+            collection.TryAddSingleton(Log);
         }
 
-        private string GetProvisioningProfileFileName(TargetPlatform platform) => Path.GetFileName(GetProvisioningProfileUrl(platform));
-
-        private string GetProvisioningProfileUrl(TargetPlatform platform) => ProvisioningProfileUrl.Replace("{PLATFORM}", platform.ToString());
-
         /// <summary>
         /// The main method of this MSBuild task which calls the asynchronous execution method and
         /// collates logged errors in order to determine the success of HelixWorkItems
         /// </summary>
         /// <returns>A boolean value indicating the success of HelixWorkItem creation</returns>
-        public override bool Execute()
+        public bool ExecuteTask(
+            IProvisioningProfileProvider provisioningProfileProvider,
+            IZipArchiveManager zipArchiveManager,
+            IFileSystem fileSystem)
         {
-            if (!IsPosixShell)
-            {
-                Log.LogError("IsPosixShell was specified as false for an iOS work item; these can only run on MacOS devices currently.");
-                return false;
-            }
+            var tasks = AppBundles.Select(bundle => PrepareWorkItem(zipArchiveManager, fileSystem, provisioningProfileProvider, bundle));
 
-            ExecuteAsync().GetAwaiter().GetResult();
-            return !Log.HasLoggedErrors;
-        }
+            WorkItems = Task.WhenAll(tasks).GetAwaiter().GetResult().Where(wi => wi != null).ToArray();
 
-        /// <summary>
-        /// Create work items for XHarness test execution
-        /// </summary>
-        /// <returns></returns>
-        private async Task ExecuteAsync()
-        {
-            DownloadProvisioningProfiles();
-            WorkItems = (await Task.WhenAll(AppBundles.Select(PrepareWorkItem))).Where(wi => wi != null).ToArray();
+            return !Log.HasLoggedErrors;
         }
 
         /// <summary>
@@ -89,25 +88,46 @@ private async Task ExecuteAsync()
         /// </summary>
         /// <param name="appFolderPath">Path to application package</param>
         /// <returns>An ITaskItem instance representing the prepared HelixWorkItem.</returns>
-        private async Task<ITaskItem> PrepareWorkItem(ITaskItem appBundleItem)
+        private async Task<ITaskItem> PrepareWorkItem(
+            IZipArchiveManager zipArchiveManager,
+            IFileSystem fileSystem,
+            IProvisioningProfileProvider provisioningProfileProvider,
+            ITaskItem appBundleItem)
         {
-            // Forces this task to run asynchronously
-            await Task.Yield();
+            var (workItemName, appFolderPath) = GetNameAndPath(appBundleItem, MetadataNames.AppBundlePath, fileSystem);
 
-            string appFolderPath = appBundleItem.ItemSpec.TrimEnd(Path.DirectorySeparatorChar);
-            
-            string workItemName = Path.GetFileName(appFolderPath);
-            if (workItemName.EndsWith(".app"))
+            appFolderPath = appFolderPath.TrimEnd(Path.DirectorySeparatorChar);
+
+            bool isAlreadyArchived = appFolderPath.EndsWith(".zip");
+            if (isAlreadyArchived && workItemName.EndsWith(".app"))
             {
+                // If someone named the zip something.app.zip, we want both gone
                 workItemName = workItemName.Substring(0, workItemName.Length - 4);
             }
 
-            var (testTimeout, workItemTimeout, expectedExitCode) = ParseMetadata(appBundleItem);
+            if (!ValidateAppBundlePath(fileSystem, appFolderPath, isAlreadyArchived))
+            {
+                Log.LogError($"App bundle not found in {appFolderPath}");
+                return null;
+            }
+
+            // If we are re-using one .zip for multiple work items, we need to copy it to a new location
+            // because we will be changing the contents (we assume we don't mind otherwise)
+            if (isAlreadyArchived && appBundleItem.TryGetMetadata(MetadataNames.AppBundlePath, out string metadata) && !string.IsNullOrEmpty(metadata))
+            {
+                string appFolderDirectory = fileSystem.GetDirectoryName(appFolderPath);
+                string fileName = $"xharness-payload-{workItemName.ToLowerInvariant()}.zip";
+                string archiveCopyPath = fileSystem.PathCombine(appFolderDirectory, fileName);
+                fileSystem.CopyFile(appFolderPath, archiveCopyPath, overwrite: true);
+                appFolderPath = archiveCopyPath;
+            }
+            
+            var (testTimeout, workItemTimeout, expectedExitCode, customCommands) = ParseMetadata(appBundleItem);
 
             // Validation of any metadata specific to iOS stuff goes here
-            if (!appBundleItem.TryGetMetadata(TargetPropName, out string target))
+            if (!appBundleItem.TryGetMetadata(MetadataNames.Target, out string target))
             {
-                Log.LogError("'Targets' metadata must be specified - " +
+                Log.LogError($"'{MetadataNames.Target}' metadata must be specified - " +
                     "expecting list of target device/simulator platforms to execute tests on (e.g. ios-simulator-64)");
                 return null;
             }
@@ -115,18 +135,18 @@ private async Task<ITaskItem> PrepareWorkItem(ITaskItem appBundleItem)
             target = target.ToLowerInvariant();
 
             // Optional timeout for the how long it takes for the app to be installed, booted and tests start executing
-            TimeSpan launchTimeout = TimeSpan.FromMinutes(DefaultLaunchTimeoutInMinutes);
-            if (appBundleItem.TryGetMetadata(LaunchTimeoutPropName, out string launchTimeoutProp))
+            TimeSpan launchTimeout = target.Contains("device") ? s_defaultDeviceLaunchTimeout : s_defaultSimulatorLaunchTimeout;
+            if (appBundleItem.TryGetMetadata(MetadataNames.LaunchTimeout, out string launchTimeoutProp))
             {
                 if (!TimeSpan.TryParse(launchTimeoutProp, out launchTimeout) || launchTimeout.Ticks < 0)
                 {
-                    Log.LogError($"Invalid value \"{launchTimeoutProp}\" provided in <{LaunchTimeoutPropName}>");
+                    Log.LogError($"Invalid value \"{launchTimeoutProp}\" provided in <{MetadataNames.LaunchTimeout}>");
                     return null;
                 }
             }
 
             bool includesTestRunner = true;
-            if (appBundleItem.TryGetMetadata(IncludesTestRunnerPropName, out string includesTestRunnerProp))
+            if (appBundleItem.TryGetMetadata(MetadataNames.IncludesTestRunner, out string includesTestRunnerProp))
             {
                 if (includesTestRunnerProp.ToLowerInvariant() == "false")
                 {
@@ -134,152 +154,85 @@ private async Task<ITaskItem> PrepareWorkItem(ITaskItem appBundleItem)
                 }
             }
 
-            if (includesTestRunner && expectedExitCode != 0)
+            if (includesTestRunner && expectedExitCode != 0 && customCommands != null)
             {
-                Log.LogWarning("The ExpectedExitCode property is ignored in the `apple test` scenario");
+                Log.LogWarning($"The {MetadataName.ExpectedExitCode} property is ignored in the `apple test` scenario");
             }
 
-            bool isDeviceTarget = target.Contains("device");
-            string provisioningProfileDest = Path.Combine(appFolderPath, "embedded.mobileprovision");
-
-            // Handle files needed for signing
-            if (isDeviceTarget)
+            bool resetSimulator = false;
+            if (appBundleItem.TryGetMetadata(MetadataNames.ResetSimulator, out string resetSimulatorRunnerProp))
             {
-                if (string.IsNullOrEmpty(TmpDir))
-                {
-                    Log.LogError(nameof(TmpDir) + " parameter not set but required for real device targets!");
-                    return null;
-                }
-
-                if (string.IsNullOrEmpty(ProvisioningProfileUrl) && !File.Exists(provisioningProfileDest))
+                if (resetSimulatorRunnerProp.ToLowerInvariant() == "true")
                 {
-                    Log.LogError(nameof(ProvisioningProfileUrl) + " parameter not set but required for real device targets!");
-                    return null;
-                }
-
-                if (!File.Exists(provisioningProfileDest))
-                {
-                    // StartsWith because suffix can be the target OS version
-                    TargetPlatform? platform = null;
-                    if (target.StartsWith("ios-device"))
-                    {
-                        platform = TargetPlatform.iOS;
-                    }
-                    else if (target.StartsWith("tvos-device"))
-                    {
-                        platform = TargetPlatform.tvOS;
-                    }
-
-                    if (platform.HasValue)
-                    {
-                        string profilePath = Path.Combine(TmpDir, GetProvisioningProfileFileName(platform.Value));
-                        Log.LogMessage($"Adding provisioning profile `{profilePath}` into the app bundle at `{provisioningProfileDest}`");
-                        File.Copy(profilePath, provisioningProfileDest);
-                    }
-                }
-                else
-                {
-                    Log.LogMessage($"Bundle already contains a provisioning profile at `{provisioningProfileDest}`");
+                    resetSimulator = true;
                 }
             }
 
-            string appName = Path.GetFileName(appBundleItem.ItemSpec);
-            string command = GetHelixCommand(appName, target, testTimeout, launchTimeout, includesTestRunner, expectedExitCode);
-            string payloadArchivePath = await CreateZipArchiveOfFolder(appFolderPath);
-
-            Log.LogMessage($"Creating work item with properties Identity: {workItemName}, Payload: {appFolderPath}, Command: {command}");
-
-            return new Build.Utilities.TaskItem(workItemName, new Dictionary<string, string>()
+            if (customCommands == null)
             {
-                { "Identity", workItemName },
-                { "PayloadArchive", payloadArchivePath },
-                { "Command", command },
-                { "Timeout", workItemTimeout.ToString() },
-            });
-        }
-
-        private string GetHelixCommand(string appName, string targets, TimeSpan testTimeout, TimeSpan launchTimeout, bool includesTestRunner, int expectedExitCode) =>
-            $"chmod +x {EntryPointScriptName} && ./{EntryPointScriptName} " +
-            $"--app \"$HELIX_WORKITEM_ROOT/{appName}\" " +
-             "--output-directory \"$HELIX_WORKITEM_UPLOAD_ROOT\" " +
-            $"--targets \"{targets}\" " +
-            $"--timeout \"{testTimeout}\" " +
-            $"--launch-timeout \"{launchTimeout}\" " +
-             "--xharness-cli-path \"$XHARNESS_CLI_PATH\" " +
-             "--command " + (includesTestRunner ? "test" : "run") +
-            (expectedExitCode != 0 ? $" --expected-exit-code \"{expectedExitCode}\"" : string.Empty) +
-            (!string.IsNullOrEmpty(XcodeVersion) ? $" --xcode-version \"{XcodeVersion}\"" : string.Empty) +
-            (!string.IsNullOrEmpty(AppArguments) ? $" --app-arguments \"{AppArguments}\"" : string.Empty);
-
-        private async Task<string> CreateZipArchiveOfFolder(string folderToZip)
-        {
-            if (!Directory.Exists(folderToZip))
-            {
-                Log.LogError($"Cannot find path containing app: '{folderToZip}'");
-                return string.Empty;
+                // When no user commands are specified, we add the default `apple test ...` command
+                customCommands = GetDefaultCommand(includesTestRunner, resetSimulator);
             }
 
-            string appFolderDirectory = Path.GetDirectoryName(folderToZip);
-            string fileName = $"xharness-ios-app-payload-{Path.GetFileName(folderToZip).ToLowerInvariant()}.zip";
-            string outputZipPath = Path.Combine(appFolderDirectory, fileName);
-
-            if (File.Exists(outputZipPath))
-            {
-                Log.LogMessage($"Zip archive '{outputZipPath}' already exists, overwriting..");
-                File.Delete(outputZipPath);
-            }
-
-            ZipFile.CreateFromDirectory(folderToZip, outputZipPath, CompressionLevel.Fastest, includeBaseDirectory: true);
-
-            Log.LogMessage($"Adding the Helix job payload scripts into the ziparchive");
-            await AddResourceFileToPayload(outputZipPath, EntryPointScriptName);
-            await AddResourceFileToPayload(outputZipPath, RunnerScriptName);
-
-            return outputZipPath;
+            string appName = isAlreadyArchived ? $"{fileSystem.GetFileNameWithoutExtension(appFolderPath)}.app" : fileSystem.GetFileName(appFolderPath);
+            string helixCommand = GetHelixCommand(appName, target, workItemTimeout, testTimeout, launchTimeout, includesTestRunner, expectedExitCode, resetSimulator);
+            string payloadArchivePath = await CreatePayloadArchive(
+                zipArchiveManager,
+                fileSystem,
+                workItemName,
+                isAlreadyArchived,
+                isPosix: true,
+                appFolderPath,
+                customCommands,
+                new[] { EntryPointScript, RunnerScript });
+
+            provisioningProfileProvider.AddProfileToPayload(payloadArchivePath, target);
+
+            return CreateTaskItem(workItemName, payloadArchivePath, helixCommand, workItemTimeout);
         }
 
-        private void DownloadProvisioningProfiles()
+        private bool ValidateAppBundlePath(
+            IFileSystem fileSystem, 
+            string appBundlePath, 
+            bool isAlreadyArchived)
         {
-            if (string.IsNullOrEmpty(ProvisioningProfileUrl))
-            {
-                return;
-            }
-
-            string[] targets = AppBundles
-                .Select(appBundle => appBundle.TryGetMetadata(TargetPropName, out string target) ? target : null)
-                .Where(t => t != null)
-                .ToArray();
-
-            bool hasiOSTargets = targets.Contains("ios-device");
-            bool hastvOSTargets = targets.Contains("tvos-device");
-
-            if (hasiOSTargets)
-            {
-                DownloadProvisioningProfile(TargetPlatform.iOS);
-            }
-
-            if (hastvOSTargets)
-            {
-                DownloadProvisioningProfile(TargetPlatform.tvOS);
-            }
+            return isAlreadyArchived ? fileSystem.FileExists(appBundlePath) : fileSystem.DirectoryExists(appBundlePath);
         }
 
-        private void DownloadProvisioningProfile(TargetPlatform platform)
-        {
-            var targetFile = Path.Combine(TmpDir, GetProvisioningProfileFileName(platform));
-
-            using var client = new WebClient();
-            _helpers.DirectoryMutexExec(async () => {
-                if (File.Exists(targetFile))
-                {
-                    Log.LogMessage($"Provisioning profile is already downloaded");
-                    return;
-                }
-
-                Log.LogMessage($"Downloading {platform} provisioning profile to {targetFile}");
-
-                await client.DownloadFileTaskAsync(new Uri(GetProvisioningProfileUrl(platform)), targetFile);
-            }, TmpDir);
-        }
+        private string GetDefaultCommand(bool includesTestRunner, bool resetSimulator) =>
+            $"xharness apple {(includesTestRunner ? "test" : "run")} " +
+            "--app \"$app\" " +
+            "--output-directory \"$output_directory\" " +
+            "--target \"$target\" " +
+            "--timeout \"$timeout\" " +
+            "--xcode \"$xcode_path\" " +
+            "-v " +
+            (includesTestRunner
+                ? $"--launch-timeout \"$launch_timeout\" "
+                : $"--expected-exit-code $expected_exit_code ") +
+            (resetSimulator ? $"--reset-simulator " : string.Empty) +
+            (!string.IsNullOrEmpty(AppArguments) ? "-- " + AppArguments : string.Empty);
+
+        private string GetHelixCommand(
+            string appName,
+            string target,
+            TimeSpan workItemTimeout,
+            TimeSpan testTimeout,
+            TimeSpan launchTimeout,
+            bool includesTestRunner,
+            int expectedExitCode,
+            bool resetSimulator)
+            =>
+            $"chmod +x {EntryPointScript} && ./{EntryPointScript} " +
+            $"--app \"{appName}\" " +
+            $"--target \"{target}\" " +
+            $"--command-timeout {(int)workItemTimeout.TotalSeconds} " +
+            $"--timeout \"{testTimeout}\" " +
+            $"--launch-timeout \"{launchTimeout}\" " +
+            (includesTestRunner ? "--includes-test-runner " : string.Empty) +
+            (resetSimulator ? "--reset-simulator" : string.Empty) +
+            $"--expected-exit-code \"{expectedExitCode}\" " +
+            (!string.IsNullOrEmpty(XcodeVersion) ? $" --xcode-version \"{XcodeVersion}\"" : string.Empty) +
+            (!string.IsNullOrEmpty(AppArguments) ? $" --app-arguments \"{AppArguments}\"" : string.Empty);
     }
 }
diff --git a/src/Microsoft.DotNet.Helix/Sdk/DownloadFromResultsContainer.cs b/src/Microsoft.DotNet.Helix/Sdk/DownloadFromResultsContainer.cs
index d36ab9f4fe1..27406e73b83 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/DownloadFromResultsContainer.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk/DownloadFromResultsContainer.cs
@@ -1,12 +1,11 @@
-using Microsoft.Build.Framework;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Auth;
-using Microsoft.WindowsAzure.Storage.Blob;
 using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
+using Azure.Storage.Blobs;
+using Microsoft.Build.Framework;
 
 namespace Microsoft.DotNet.Helix.Sdk
 {
@@ -95,13 +94,17 @@ private async Task DownloadFilesForWorkItem(ITaskItem workItem, string directory
                         string destinationFile = Path.Combine(destinationDir.FullName, file);
                         Log.LogMessage(MessageImportance.Normal, $"Downloading {file} => {destinationFile}...");
 
-                        var uri = new Uri($"{ResultsContainer}{workItemName}/{file}");
-                        CloudBlob blob = string.IsNullOrEmpty(ResultsContainerReadSAS) ? new CloudBlob(uri) : new CloudBlob(uri, new StorageCredentials(ResultsContainerReadSAS));
-                        await blob.DownloadToFileAsync(destinationFile, FileMode.Create);
+                        // Currently the blob storage includes the retry iteration, however there is no good way
+                        // to get the "best" iteration number to download the files from. For now, use always iteration
+                        // 1 until helix provides an API to get result files from the "good" iteration run.
+                        // https://github.com/dotnet/core-eng/issues/13983
+                        var uri = new Uri($"{ResultsContainer}{workItemName}/1/{file}");
+                        BlobClient blob = string.IsNullOrEmpty(ResultsContainerReadSAS) ? new BlobClient(uri) : new BlobClient(uri, new AzureSasCredential(ResultsContainerReadSAS));
+                        await blob.DownloadToAsync(destinationFile);
                     }
-                    catch (StorageException e)
+                    catch (RequestFailedException rfe)
                     {
-                        Log.LogWarning($"Failed to download {workItemName}/{file} blob from results container: {e.Message}");
+                        Log.LogWarning($"Failed to download {workItemName}/1/{file} blob from results container: {rfe.Message}");
                     }
                 }
             };
diff --git a/src/Microsoft.DotNet.Helix/Sdk/FindDotNetCliPackage.cs b/src/Microsoft.DotNet.Helix/Sdk/FindDotNetCliPackage.cs
index 5d82a45f509..1d4f62a78c1 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/FindDotNetCliPackage.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk/FindDotNetCliPackage.cs
@@ -1,15 +1,24 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.Arcade.Common;
 using Microsoft.Build.Framework;
+using NuGet.Versioning;
 
 namespace Microsoft.DotNet.Helix.Sdk
 {
     public class FindDotNetCliPackage : BaseTask
     {
+        // Use lots of retries since an Http Client failure here means failure to send to Helix
+        private ExponentialRetry _retry = new ExponentialRetry()
+        {
+            MaxAttempts = 10,
+            DelayBase = 3.0
+        };
         private static readonly HttpClient _client = new HttpClient(new HttpClientHandler { CheckCertificateRevocationList = true });
-        private const string DotNetCliAzureFeed = "https://dotnetcli.blob.core.windows.net/dotnet";
 
         /// <summary>
         ///   'LTS' or 'Current'
@@ -30,7 +39,7 @@ public class FindDotNetCliPackage : BaseTask
         public string Runtime { get; set; }
 
         /// <summary>
-        ///   'sdk', 'runtime' or 'aspnetcore-runtime'
+        ///   'sdk', 'runtime' or 'aspnetcore-runtime' (default is runtime)
         /// </summary>
         [Required]
         public string PackageType { get; set; }
@@ -47,48 +56,186 @@ public override bool Execute()
         private async Task ExecuteAsync()
         {
             NormalizeParameters();
-            await ResolveVersionAsync();
+            var feeds = new List<string>
+            {
+                "https://dotnetcli.azureedge.net/dotnet",
+                "https://dotnetbuilds.azureedge.net/public",
+            };
+
+            string finalDownloadUrl = null;
+            foreach (var feed in feeds)
+            {
+                string downloadUrl = await GetDownloadUrlAsync(feed);
+                if (downloadUrl == null)
+                {
+                    Log.LogMessage($"Could not retrieve dotnet cli {PackageType} version {Version} package uri from feed {feed}");
+                    continue;
+                }
+
+                Log.LogMessage($"Retrieved dotnet cli {PackageType} version {Version} package uri {downloadUrl} from feed {feed}, testing...");
+
+                try
+                {
+                    using HttpResponseMessage res = await HeadRequestWithRetry(downloadUrl);
+
+                    if (res.StatusCode == HttpStatusCode.NotFound)
+                    {
+                        // 404 means that we successfully hit the server, and it returned 404. This cannot be a network hiccup
+                        Log.LogMessage($"Unable to find dotnet cli {PackageType} version {Version} from feed {feed}");
+                        continue;
+                    }
+
+                    res.EnsureSuccessStatusCode();
+                    finalDownloadUrl = downloadUrl;
+                }
+                catch (Exception ex)
+                {
+                    Log.LogMessage($"Unable to access dotnet cli {PackageType} version {Version} from feed {feed}, {ex.Message}");
+                }
+            }
 
-            string downloadUrl = GetDownloadUrl();
+            if (finalDownloadUrl == null)
+            {
+                Log.LogError(FailureCategory.Build, $"Unable to find dotnet cli {PackageType} version {Version} from any of the specified feeds.");
+            }
 
-            Log.LogMessage($"Retrieved dotnet cli {PackageType} version {Version} package uri {downloadUrl}, testing...");
 
+            if (!Log.HasLoggedErrors)
+            {
+                Log.LogMessage($"Url {finalDownloadUrl} is valid.");
+                PackageUri = finalDownloadUrl;
+            }
+        }
+
+        private async Task<string> GetDownloadUrlAsync(string feed)
+        {
+            var oldVersion = Version; // ResolveVersionAsync will adjust the Version property, but we need it set back for other feeds to see the same initial Version
             try
             {
-                using var req = new HttpRequestMessage(HttpMethod.Head, downloadUrl);
-                using HttpResponseMessage res = await _client.SendAsync(req);
+                var version = await ResolveVersionAsync(feed);
+                string extension = Runtime.StartsWith("win") ? "zip" : "tar.gz";
+                string effectiveVersion = await GetEffectiveVersion(feed, version);
 
-                if (res.StatusCode == HttpStatusCode.NotFound)
+                return PackageType switch
                 {
-                    // 404 means that we successfully hit the server, and it returned 404. This cannot be a network hiccup
-                    Log.LogError(FailureCategory.Build, $"Unable to find dotnet cli {PackageType} version {Version}, tried {downloadUrl}");
+                    "sdk" => $"{feed}/Sdk/{version}/dotnet-sdk-{effectiveVersion}-{Runtime}.{extension}",
+                    "aspnetcore-runtime" =>
+                        $"{feed}/aspnetcore/Runtime/{version}/aspnetcore-runtime-{effectiveVersion}-{Runtime}.{extension}",
+                    _ => $"{feed}/Runtime/{version}/dotnet-runtime-{effectiveVersion}-{Runtime}.{extension}"
+                };
+            }
+            catch (Exception ex)
+            {
+                Log.LogWarning($"Unable to resolve download link from feed {feed}; {ex.Message}");
+                return null;
+            }
+            finally
+            {
+                Version = oldVersion;
+            }
+        }
+
+        private async Task<string> GetEffectiveVersion(string feed, string version)
+        {
+            if (NuGetVersion.TryParse(version, out NuGetVersion semanticVersion))
+            {
+                // Pared down version of the logic from https://github.com/dotnet/install-scripts/blob/main/src/dotnet-install.ps1
+                // If this functionality stops working, review changes made there.
+                // Current strategy is to start with a runtime-specific name then fall back to 'productVersion.txt'
+                string effectiveVersion = version;
+
+                // Do nothing for older runtimes; the file won't exist
+                if (semanticVersion >= new NuGetVersion("5.0.0"))
+                {
+                    var productVersionText = PackageType switch
+                    {
+                        "sdk" => await GetMatchingProductVersionTxtContents($"{feed}/Sdk/{version}", "sdk-productVersion.txt"),
+                        "aspnetcore-runtime" => await GetMatchingProductVersionTxtContents($"{feed}/aspnetcore/Runtime/{version}", "aspnetcore-productVersion.txt"),
+                        _ => await GetMatchingProductVersionTxtContents($"{feed}/Runtime/{version}", "runtime-productVersion.txt")
+                    };
+
+                    if (!productVersionText.Equals(version))
+                    {
+                        effectiveVersion = productVersionText;
+                        Log.LogMessage($"Switched to effective .NET Core version '{productVersionText}' from matching productVersion.txt");
+                    }
+                }
+                return effectiveVersion;
+            }
+
+            throw new ArgumentException($"'{version}' is not a valid semantic version.");
+        }
+        private async Task<string> GetMatchingProductVersionTxtContents(string baseUri, string customVersionTextFileName)
+        {
+            Log.LogMessage(MessageImportance.Low, $"Checking for productVersion.txt files under {baseUri}");
+
+            using HttpResponseMessage specificResponse = await GetAsyncWithRetry($"{baseUri}/{customVersionTextFileName}");
+            if (specificResponse.StatusCode == HttpStatusCode.NotFound)
+            {
+                using HttpResponseMessage genericResponse = await GetAsyncWithRetry($"{baseUri}/productVersion.txt");
+                if (genericResponse.StatusCode != HttpStatusCode.NotFound)
+                {
+                    genericResponse.EnsureSuccessStatusCode();
+                    return (await genericResponse.Content.ReadAsStringAsync()).Trim();
                 }
                 else
                 {
-                    res.EnsureSuccessStatusCode();
+                    Log.LogMessage(MessageImportance.Low, $"No *productVersion.txt files found for {Version} under {baseUri}");
                 }
             }
-            catch (Exception ex)
+            else
             {
-                Log.LogError(FailureCategory.Build, $"Unable to access dotnet cli {PackageType} version {Version} at {downloadUrl}, {ex.Message}");
+                specificResponse.EnsureSuccessStatusCode();
+                return (await specificResponse.Content.ReadAsStringAsync()).Trim();
             }
+            return Version;
+        }
 
-            if (!Log.HasLoggedErrors)
+        private async Task<HttpResponseMessage> GetAsyncWithRetry(string uri)
+        {
+            HttpResponseMessage response = null;
+            await _retry.RunAsync(async attempt =>
+            {
+                try
+                {
+                    response = await _client.GetAsync(uri);
+                    return true;
+                }
+                catch (Exception toLog)
+                {
+                    Log.LogMessage(MessageImportance.Low, $"Hit exception in GetAsync(); will retry up to 10 times ({toLog.Message})");
+                    return false;
+                }
+            });
+            if (response == null)  // All retries failed
             {
-                Log.LogMessage($"Url {downloadUrl} is valid.");
-                PackageUri = downloadUrl;
+                throw new Exception($"Failed to GET from {uri}, even after retrying");
             }
+            return response;
         }
 
-        private string GetDownloadUrl()
+        private async Task<HttpResponseMessage> HeadRequestWithRetry(string uri)
         {
-            string extension = Runtime.StartsWith("win") ? "zip" : "tar.gz";
-            return PackageType switch
+            HttpResponseMessage response = null;
+            await _retry.RunAsync(async attempt =>
             {
-                "sdk"                => $"{DotNetCliAzureFeed}/Sdk/{Version}/dotnet-sdk-{Version}-{Runtime}.{extension}",
-                "aspnetcore-runtime" => $"{DotNetCliAzureFeed}/aspnetcore/Runtime/{Version}/aspnetcore-runtime-{Version}-{Runtime}.{extension}",
-                _                    => $"{DotNetCliAzureFeed}/Runtime/{Version}/dotnet-runtime-{Version}-{Runtime}.{extension}"
-            };
+                try
+                {
+                    using var req = new HttpRequestMessage(HttpMethod.Head, uri);
+                    response = await _client.SendAsync(req);
+                    return true;
+                }
+                catch (Exception toLog)
+                {
+                    Log.LogMessage(MessageImportance.Low, $"Hit exception in SendAsync(); will retry up to 10 times ({toLog.Message})");
+                    return false;
+                }
+            });
+            if (response == null) // All retries failed
+            {
+                throw new Exception($"Failed to make HEAD request to {uri}, even after retrying");
+            }
+            return response;
         }
 
         private void NormalizeParameters()
@@ -129,24 +276,30 @@ private void NormalizeParameters()
             }
         }
 
-        private async Task ResolveVersionAsync()
+        private async Task<string> ResolveVersionAsync(string feed)
         {
+            string version = Version;
             if (Version == "latest")
             {
                 Log.LogMessage(MessageImportance.Low, "Resolving latest dotnet cli version.");
                 string latestVersionUrl = PackageType switch
                 {
-                    "sdk"                => $"{DotNetCliAzureFeed}/Sdk/{Channel}/latest.version",
-                    "aspnetcore-runtime" => $"{DotNetCliAzureFeed}/aspnetcore/Runtime/{Channel}/latest.version",
-                    _                    => $"{DotNetCliAzureFeed}/Runtime/{Channel}/latest.version"
+                    "sdk" => $"{feed}/Sdk/{Channel}/latest.version",
+                    "aspnetcore-runtime" => $"{feed}/aspnetcore/Runtime/{Channel}/latest.version",
+                    _ => $"{feed}/Runtime/{Channel}/latest.version"
                 };
 
                 Log.LogMessage(MessageImportance.Low, $"Resolving latest version from url {latestVersionUrl}");
-                string latestVersionContent = await _client.GetStringAsync(latestVersionUrl);
+
+                using HttpResponseMessage versionResponse = await GetAsyncWithRetry(latestVersionUrl);
+                versionResponse.EnsureSuccessStatusCode();
+                string latestVersionContent = await versionResponse.Content.ReadAsStringAsync();
                 string[] versionData = latestVersionContent.Split(Array.Empty<char>(), StringSplitOptions.RemoveEmptyEntries);
-                Version = versionData[1];
-                Log.LogMessage(MessageImportance.Low, $"Got latest dotnet cli version {Version}");
+                version = versionData[1];
+                Log.LogMessage(MessageImportance.Low, $"Got latest dotnet cli version {version}");
             }
+
+            return version;
         }
     }
 }
diff --git a/src/Microsoft.DotNet.Helix/Sdk/HelixTask.cs b/src/Microsoft.DotNet.Helix/Sdk/HelixTask.cs
index c411bdca5b3..caa5ae3aef1 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/HelixTask.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk/HelixTask.cs
@@ -21,6 +21,13 @@ public abstract class HelixTask : BaseTask, ICancelableTask
         /// </summary>
         public string AccessToken { get; set; }
 
+        /// <summary>
+        ///   If <see langword="true"/>, fail when posting jobs to non-existent queues; If <see langword="false"/> allow it and print a warning.
+        ///   Note if an MSBuild sequence starts and waits on jobs, and none are started, this will still fail.
+        ///   Defined on HelixTask so the catch block around Execute() can know about it.
+        /// </summary>
+        public bool FailOnMissingTargetQueue { get; set; } = true;
+
         protected IHelixApi HelixApi { get; private set; }
 
         protected IHelixApi AnonymousApi { get; private set; }
@@ -63,6 +70,17 @@ public sealed override bool Execute()
                 // Canceled
                 return false;
             }
+            catch (ArgumentException argEx) when (argEx.Message.StartsWith("Helix API does not contain an entry "))
+            {
+                if (FailOnMissingTargetQueue)
+                {
+                    Log.LogError(FailureCategory.Build, argEx.Message);
+                }
+                else
+                {
+                    Log.LogWarning($"{argEx.Message} (FailOnMissingTargetQueue is false, so this is just a warning.)");
+                }
+            }
             catch (Exception ex)
             {
                 Log.LogErrorFromException(FailureCategory.Helix, ex, true, true, null);
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetTool.cs b/src/Microsoft.DotNet.Helix/Sdk/InstallDotNetTool.cs
similarity index 65%
rename from src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetTool.cs
rename to src/Microsoft.DotNet.Helix/Sdk/InstallDotNetTool.cs
index f9016e09d07..22ce4ee049f 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetTool.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk/InstallDotNetTool.cs
@@ -6,7 +6,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace Microsoft.DotNet.Arcade.Sdk
+namespace Microsoft.DotNet.Helix.Sdk
 {
     /// <summary>
     /// Task that installs a .NET tool in a given folder.
@@ -15,36 +15,61 @@ namespace Microsoft.DotNet.Arcade.Sdk
     public class InstallDotNetTool : MSBuildTaskBase
     {
         /// <summary>
-        /// The name of the tool to install (same as the NuGet package name, e.g. Microsoft.DotNet.XHarness.CLI).
+        /// The name of the tool to install (same as the NuGet package name, e.g. Microsoft.DotNet.XHarness.CLI)
         /// </summary>
         [Required]
         public string Name { get; set; }
 
         /// <summary>
-        /// Directory where the tool will be installed.
+        /// Directory where the tool will be installed
         /// </summary>
         [Required]
         public string DestinationPath { get; set; }
 
         /// <summary>
-        /// Version of the tool to install.
+        /// Version of the tool to install
+        /// 
         /// Must not contain * so that we can make sure the right version is installed.
         /// </summary>
         [Required]
         public string Version { get; set; }
 
         /// <summary>
-        /// Optional path to dotnet.exe to use.
+        /// Optional path to dotnet.exe to use
         /// </summary>
         public string DotnetPath { get; set; }
 
         /// <summary>
-        /// Source to install the tool from.
+        /// Source to install the tool from
         /// </summary>
         public string Source { get; set; }
 
         /// <summary>
-        /// Location of where the tool was installed (including the version).
+        /// The target framework to install the tool for
+        /// </summary>
+        public string TargetFramework { get; set; }
+
+        /// <summary>
+        /// The target architecture to install the tool for
+        /// </summary>
+        public string TargetArchitecture { get; set; }
+
+        /// <summary>
+        /// Working directory when executing the command
+        /// 
+        /// There is an issue in the SDK where if the working directory contains .proj files, `dotnet tool install` will fail.
+        /// https://github.com/dotnet/sdk/issues/12120
+        /// You can use this property to work around this.
+        /// </summary>
+        public string WorkingDirectory { get; set; }
+
+        /// <summary>
+        /// Do not use a cached .nupkg when installing
+        /// </summary>
+        public bool NoCache { get; set; } = false;
+
+        /// <summary>
+        /// Location of where the tool was installed (including the version)
         /// </summary>
         [Output]
         public string ToolPath { get; set; }
@@ -53,7 +78,7 @@ public override void ConfigureServices(IServiceCollection collection)
         {
             collection.TryAddTransient<ICommandFactory, CommandFactory>();
             collection.TryAddTransient<IFileSystem, FileSystem>();
-            collection.TryAddTransient<IHelpers, Helpers>();
+            collection.TryAddTransient<IHelpers, Arcade.Common.Helpers>();
             collection.TryAddSingleton(Log);
         }
 
@@ -103,15 +128,41 @@ private bool InstallTool(ICommandFactory commandFactory)
                 ToolPath,
             };
 
+            if (!string.IsNullOrEmpty(TargetFramework))
+            {
+                args.Add("--framework");
+                args.Add(TargetFramework);
+            }
+
+            if (!string.IsNullOrEmpty(TargetArchitecture))
+            {
+                args.Add("--arch");
+                args.Add(TargetArchitecture);
+            }
+
             if (!string.IsNullOrEmpty(Source))
             {
                 args.Add("--add-source");
                 args.Add(Source);
             }
 
+            if (NoCache)
+            {
+                args.Add("--no-cache");
+            }
+
             args.Add(Name);
 
-            var command = commandFactory.Create(string.IsNullOrEmpty(DotnetPath) ? "dotnet" : DotnetPath, args);
+            var executable = string.IsNullOrEmpty(DotnetPath) ? "dotnet" : DotnetPath;
+            Log.LogMessage($"Executing {DotnetPath} {string.Join(" ", args)}");
+
+            ICommand command = commandFactory.Create(executable, args);
+
+            if (!string.IsNullOrEmpty(WorkingDirectory))
+            {
+                command.WorkingDirectory(WorkingDirectory);
+            }
+
             CommandResult result = command.Execute();
 
             if (result.ExitCode != 0)
diff --git a/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj b/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj
index e06aeef2fbe..8f8e83037df 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj
+++ b/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj
@@ -11,7 +11,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
+    <PackageReference Include="Microsoft.Data.Services.Client" Version="$(MicrosoftDataServicesClientVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+    <PackageReference Include="NuGet.Versioning" Version="6.0.0-preview.4.230" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 
@@ -31,16 +33,22 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="tools\xharness-runner\xharness-event-processor.py">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </EmbeddedResource>
     <EmbeddedResource Include="tools\xharness-runner\xharness-helix-job.apple.sh">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </EmbeddedResource>
     <EmbeddedResource Include="tools\xharness-runner\xharness-runner.apple.sh">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="tools\xharness-runner\xharness-runner.android.ps1">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </EmbeddedResource>
     <EmbeddedResource Include="tools\xharness-runner\xharness-helix-job.android.sh">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\xharness-runner\xharness-helix-job.android.bat">
+    <EmbeddedResource Include="tools\xharness-runner\xharness-helix-job.android.ps1">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/src/Microsoft.DotNet.Helix/Sdk/ProvisioningProfileProvider.cs b/src/Microsoft.DotNet.Helix/Sdk/ProvisioningProfileProvider.cs
new file mode 100644
index 00000000000..d1313f0311c
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Sdk/ProvisioningProfileProvider.cs
@@ -0,0 +1,229 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Net.Http;
+using System.Text.RegularExpressions;
+using Microsoft.Arcade.Common;
+using Microsoft.Build.Utilities;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+#nullable enable
+namespace Microsoft.DotNet.Helix.Sdk
+{
+    public enum ApplePlatform
+    {
+        iOS,
+        tvOS,
+    }
+
+    public interface IProvisioningProfileProvider
+    {
+        void AddProfileToPayload(string archivePath, string testTarget);
+    }
+
+    /// <summary>
+    /// This class embeds Apple provisioning profiles into app bundles.
+    /// App bundles are directories with files that represent an iOS or tvOS application.
+    /// Provisioning profile is a file used for signing and differs per platform (iOS/tvOS).
+    /// This class makes sure each app bundle has one before it is sent to Helix.
+    /// It injects the profiles into all top-level app bundles in a given .zip archive.
+    /// </summary>
+    public class ProvisioningProfileProvider : IProvisioningProfileProvider
+    {
+        // The name of the profile that Apple expects
+        private const string ProfileFileName = "embedded.mobileprovision";
+
+        // Matches all paths to .app bundle directories in archive's root
+        private static readonly Regex s_topLevelAppPattern = new("^[^" + Regex.Escape(new string(Path.GetInvalidFileNameChars())) + "]+\\.app/.+");
+        private static readonly IReadOnlyDictionary<ApplePlatform, string> s_targetNames = new Dictionary<ApplePlatform, string>()
+        {
+            { ApplePlatform.iOS, "ios-device" },
+            { ApplePlatform.tvOS, "tvos-device" },
+        };
+
+        private readonly TaskLoggingHelper _log;
+        private readonly IHelpers _helpers;
+        private readonly IFileSystem _fileSystem;
+        private readonly IZipArchiveManager _zipArchiveManager;
+        private readonly HttpClient _httpClient;
+        private readonly string? _profileUrlTemplate;
+        private readonly string? _tmpDir;
+        private readonly Dictionary<ApplePlatform, string> _downloadedProfiles = new();
+
+        public ProvisioningProfileProvider(
+            TaskLoggingHelper log,
+            IHelpers helpers,
+            IFileSystem fileSystem,
+            IZipArchiveManager zipArchiveManager,
+            HttpClient httpClient,
+            string? profileUrlTemplate,
+            string? tmpDir)
+        {
+            _log = log ?? throw new ArgumentNullException(nameof(log));
+            _helpers = helpers ?? throw new ArgumentNullException(nameof(helpers));
+            _fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+            _zipArchiveManager = zipArchiveManager ?? throw new ArgumentNullException(nameof(zipArchiveManager));
+            _httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
+            _profileUrlTemplate = profileUrlTemplate;
+            _tmpDir = tmpDir;
+        }
+
+        public void AddProfileToPayload(string archivePath, string testTarget)
+        {
+            foreach (var pair in s_targetNames)
+            {
+                ApplePlatform platform = pair.Key;
+                string targetName = pair.Value;
+
+                // Only app bundles that target iOS/tvOS devices need a profile (simulators don't)
+                if (!testTarget.Contains(targetName))
+                {
+                    continue;
+                }
+
+                // This makes sure we download the profile the first time we see an app that needs it
+                if (!_downloadedProfiles.TryGetValue(platform, out string? profilePath))
+                {
+                    if (string.IsNullOrEmpty(_tmpDir))
+                    {
+                        _log.LogError($"{nameof(CreateXHarnessAppleWorkItems.TmpDir)} parameter not set but required for real device targets!");
+                        return;
+                    }
+
+                    if (string.IsNullOrEmpty(_profileUrlTemplate))
+                    {
+                        _log.LogError($"{nameof(CreateXHarnessAppleWorkItems.ProvisioningProfileUrl)} parameter not set but required for real device targets!");
+                        return;
+                    }
+
+                    profilePath = DownloadProvisioningProfile(platform);
+                    _downloadedProfiles.Add(platform, profilePath);
+                }
+
+                AddProfileToArchive(archivePath, profilePath);
+            }
+        }
+
+        /// <summary>
+        /// Adds a provisioning profile to a given zip archive.
+        /// Either adds it to all .app folders inside or to the root of the archive if no app bundles found.
+        /// </summary>
+        private void AddProfileToArchive(string archivePath, string profilePath)
+        {
+            // App comes with a profile already
+            using ZipArchive zipArchive = _zipArchiveManager.OpenArchive(archivePath, ZipArchiveMode.Update);
+
+            HashSet<string> rootLevelAppBundles = new();
+            HashSet<string> appBundlesWithProfile = new();
+
+            foreach (ZipArchiveEntry entry in zipArchive.Entries)
+            {
+                if (!s_topLevelAppPattern.IsMatch(entry.FullName))
+                {
+                    continue;
+                }
+
+                string appBundleName = entry.FullName.Split(new[] { '/' }, 2).First();
+                
+                if (entry.FullName == appBundleName + "/" + ProfileFileName)
+                {
+                    appBundlesWithProfile.Add(appBundleName);
+                    _log.LogMessage($"{appBundleName} already contains provisioning profile");
+                }
+                else
+                {
+                    rootLevelAppBundles.Add(appBundleName);
+                }
+            }
+
+            rootLevelAppBundles = rootLevelAppBundles.Except(appBundlesWithProfile).ToHashSet();
+
+            // If no .app bundles, add it to the root
+            if (!rootLevelAppBundles.Any())
+            {
+                _log.LogMessage($"No app bundles found in the archive. Adding provisioning profile to root");
+
+                // Check if archive comes with a profile already
+                if (!zipArchive.Entries.Any(e => e.FullName == ProfileFileName))
+                {
+                    zipArchive.CreateEntryFromFile(profilePath, ProfileFileName);
+                }
+
+                return;
+            }
+
+            // Else inject profile to every app bundle in the root of the archive
+            foreach (string appBundle in rootLevelAppBundles)
+            {
+                var profileDestPath = appBundle + "/" + ProfileFileName;
+                _log.LogMessage($"Adding provisioning profile to {appBundle}");
+                zipArchive.CreateEntryFromFile(profilePath, profileDestPath);
+            }
+        }
+
+        /// <summary>
+        /// Process-safe download of the profile (several clashing msbuild processes should download once).
+        /// </summary>
+        /// <param name="platform">Which platform to download the profile for</param>
+        /// <returns>Path where the profile was downloaded to</returns>
+        private string DownloadProvisioningProfile(ApplePlatform platform)
+        {
+            var targetFile = _fileSystem.PathCombine(_tmpDir!, GetProvisioningProfileFileName(platform));
+
+            _helpers.DirectoryMutexExec(async () =>
+            {
+                if (_fileSystem.FileExists(targetFile))
+                {
+                    _log.LogMessage($"Using provisioning profile in {targetFile}");
+                    return;
+                }
+
+                _log.LogMessage($"Downloading {platform} provisioning profile to {targetFile}");
+
+                var uri = new Uri(GetProvisioningProfileUrl(platform));
+                using var response = await _httpClient.GetAsync(uri);
+                response.EnsureSuccessStatusCode();
+
+                using var fileStream = _fileSystem.GetFileStream(targetFile, FileMode.Create, FileAccess.Write);
+                await response.Content.CopyToAsync(fileStream);
+            }, _tmpDir);
+
+            return targetFile;
+        }
+
+        private string GetProvisioningProfileFileName(ApplePlatform platform)
+            => _fileSystem.GetFileName(GetProvisioningProfileUrl(platform))
+                ?? throw new InvalidOperationException("Failed to get provision profile file name");
+
+        private string GetProvisioningProfileUrl(ApplePlatform platform)
+            => _profileUrlTemplate!.Replace("{PLATFORM}", platform.ToString());
+    }
+
+    public static class ProvisioningProfileProviderRegistration
+    {
+        public static void TryAddProvisioningProfileProvider(this IServiceCollection collection, string provisioningProfileUrlTemplate, string tmpDir)
+        {
+            collection.TryAddTransient<IHelpers, Arcade.Common.Helpers>();
+            collection.TryAddTransient<IFileSystem, FileSystem>();
+            collection.TryAddTransient<IZipArchiveManager, ZipArchiveManager>();
+            collection.TryAddSingleton(_ => new HttpClient(new HttpClientHandler { CheckCertificateRevocationList = true }));
+            collection.TryAddSingleton<IProvisioningProfileProvider>(serviceProvider =>
+            {
+                return new ProvisioningProfileProvider(
+                    serviceProvider.GetRequiredService<TaskLoggingHelper>(),
+                    serviceProvider.GetRequiredService<IHelpers>(),
+                    serviceProvider.GetRequiredService<IFileSystem>(),
+                    serviceProvider.GetRequiredService<IZipArchiveManager>(),
+                    serviceProvider.GetRequiredService<HttpClient>(),
+                    provisioningProfileUrlTemplate,
+                    tmpDir);
+            });
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Helix/Sdk/Readme.md b/src/Microsoft.DotNet.Helix/Sdk/Readme.md
index ac3d16a0406..f582c2513e0 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/Readme.md
+++ b/src/Microsoft.DotNet.Helix/Sdk/Readme.md
@@ -1,9 +1,9 @@
 # Microsoft.DotNet.Helix.Sdk
 
-This Package provides Helix Job sending functionality from an MSBuild project file.
+This Package provides Helix Job-sending functionality from an MSBuild project file.
 
 ## Examples
-Each of the following examples require dotnet-cli >= 2.1.300 and need the following files in a directory at or above the example project's directory.
+Each of the following examples require dotnet-cli >= 3.1.x, and need the following files in a directory at or above the example project's directory.
 #### NuGet.config
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
@@ -25,6 +25,8 @@ Each of the following examples require dotnet-cli >= 2.1.300 and need the follow
 
 Versions of the package can be found by browsing the feed at https://dev.azure.com/dnceng/public/_packaging?_a=feed&feed=dotnet-eng
 
+### Developing Helix SDK
+
 The examples can all be run with `dotnet msbuild` and will require an environment variable or MSBuildProperty `HelixAccessToken` set if a queue with a value of IsInternalOnly=true (usually any not ending in '.Open') is selected for `HelixTargetQueues`. You will also need to set the following environment variables before building:
 
 ```
@@ -36,6 +38,49 @@ BUILD_REASON
 
 Also, make sure your helix project doesn't have `EnableAzurePipelinesReporter` set, or sets it to false, or building locally will fail with an error that looks like `SYSTEM_ACCESSTOKEN is not set`.
 
+Furthermore, when you need to make changes to Helix SDK, there's a way to run it locally with ease to test your changes in a tighter dev loop than having to have to wait for the full PR build.
+
+The repository contains E2E tests that utilize the Helix SDK to send test Helix jobs.
+In order to run them, one has to publish the SDK locally so that the unit tests can grab the re-built DLLs.
+
+#### Detailed steps:
+1. Make your changes
+2. Build the product
+    ```sh
+    # Linux/MacOS
+    ./build.sh
+    # Windows
+    .\Build.cmd
+    ```
+3. Publish Arcade SDK and Helix SDK
+    ```sh
+    dotnet publish -f netcoreapp3.1 src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
+    dotnet publish -f netcoreapp3.1 src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj
+    ```
+4. Pick one of the test `.proj` files, set some env variables and build it  
+    Bash
+    ```sh
+    export BUILD_REASON=pr
+    export BUILD_REPOSITORY_NAME=arcade
+    export BUILD_SOURCEBRANCH=master
+    export SYSTEM_TEAMPROJECT=dnceng
+    export SYSTEM_ACCESSTOKEN=''
+
+    eng/common/build.sh -test -projects tests/XHarness.Apple.DeviceTests.proj /v:n /bl:Arcade.binlog
+    ```
+
+    PowerShell
+    ```ps1
+    $Env:BUILD_REASON = "pr"
+    $Env:BUILD_REPOSITORY_NAME = "arcade"
+    $Env:BUILD_SOURCEBRANCH = "master"
+    $Env:SYSTEM_TEAMPROJECT = "dnceng"
+    $Env:SYSTEM_ACCESSTOKEN = ""
+
+    .\eng\common\build.ps1 -configuration Debug -restore -test -projects tests\XHarness.Apple.DeviceTests.proj /p:RestoreUsingNugetTargets=false /bl:Arcade.binlog
+    ```
+5. An MSBuild log file called `Arcade.binlog` will be produced which you can inspect using the [MSBuild Structured Log Viewer](https://msbuildlog.com/). There you can see which props were set with which values, in what order the targets were executed under which conditions and so on.
+
 ### Docker Support
 Helix machines now have (where available on the machine) the ability to run work items directly inside Docker containers.  This allows work items to use operating systems that only work for Docker scenarios, as well as custom configurations of already-supported operating systems.  
 #### Specifying a docker tag:
@@ -104,13 +149,21 @@ Given a local folder `$(TestFolder)` containing `runtests.cmd`, this will run `r
     <!-- The helix queue this job should run on. -->
     <HelixTargetQueue>Windows.10.Amd64.Open</HelixTargetQueue>
 
+    <!-- Whether to fail the build if any Helix queues supplied don't exist.
+         If set to false, sending to non-existent Helix Queues will only print a warning. Defaults to true. 
+         Only set this to false if losing this coverage when the target queue is deprecated is acceptable.
+         For any job waiting on runs, this will still cause failure if all queues do not exist as there must be
+         one or more runs started for waiting to not log errors.  Only set if you need it.
+    -->
+    <FailOnMissingTargetQueue>false</FailOnMissingTargetQueue>
+
     <!--
       The set of helix queues to send jobs to.
       This property is multiplexed over just like <TargetFrameworks> for C# projects.
       The project is built once per entry in this list with <HelixTargetQueue> set to the current list element value.
       Note that all payloads sent need to be able to run on all variations included.
     -->
-    <HelixTargetQueues>Ubuntu.1804.Amd64.Open;Ubuntu.1604.Amd64.Open;(Alpine.39.Amd64)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-bfcd90a-20200123191053</HelixTargetQueues>
+    <HelixTargetQueues>Ubuntu.1804.Amd64.Open;Ubuntu.1604.Amd64.Open;(Alpine.39.Amd64)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-bfcd90a-20200123191053</HelixTargetQueues>
 
     <!-- 'true' to download dotnet cli and add it to the path for every workitem. Default 'false' -->
     <IncludeDotNetCli>true</IncludeDotNetCli>
@@ -126,19 +179,6 @@ Given a local folder `$(TestFolder)` containing `runtests.cmd`, this will run `r
     <!-- 'true' to produce a build error when tests fail. Default 'true' -->
     <FailOnTestFailure>true</FailOnTestFailure>
 
-    <!--
-      'true' to enable the xunit reporter. Default 'false'
-      The xunit reporter will report test results from a test results
-      xml file found in the work item working directory.
-      The following file names are accepted:
-        testResults.xml
-        test-results.xml
-        test_results.xml
-    -->
-    <EnableXUnitReporter>false</EnableXUnitReporter>
-    <!-- Instruct the sdk to wait for test result ingestion by MC, and fail if there are any failed work items or tests. -->
-    <FailOnMissionControlTestFailure>false</FailOnMissionControlTestFailure>
-
     <!--
       Commands that are run before each workitem's command
       semicolon-separated; use ';;' to escape a single semicolon
@@ -183,12 +223,11 @@ Given a local folder `$(TestFolder)` containing `runtests.cmd`, this will run `r
     <!-- TargetFramework of the xunit.runner.dll to use when running the tests -->
     <XUnitRuntimeTargetFramework>netcoreapp2.0</XUnitRuntimeTargetFramework>
     <!-- PackageVersion of xunit.runner.console to use -->
-    <XUnitRunnerVersion>2.4.1</XUnitRunnerVersion>
+    <XUnitRunnerVersion>2.4.2-pre.9</XUnitRunnerVersion>
     <!-- Additional command line arguments to pass to xunit.console.exe -->
     <XUnitArguments></XUnitArguments>
   </PropertyGroup>
 
-
   <ItemGroup>
     <!--
       Another way to specify target queues
@@ -231,42 +270,44 @@ There are times when a work item may detect that the machine being executed on i
 #### Request Infrastructure Retry
 An "infrastructure retry" is pre-existing functionality Helix Clients use in cases such as when communication to the telemetry service or Azure Service Bus fails; this allows the work item be run again in entirety, generally (but not guaranteedly) on a different machine, with the hope that the next machine will be in a better state.  Note that requesting this prevents any job using it from finishing, and as a FIFO queue the work items that get retried go to the back of the queue, so calling this API can significantly increase job execution time based off how many jobs are being handled by a given queue.      
 
-##### Sample usage:
+##### Sample usage in Python:
 
-###### In Python:
 
-```
-from helix.workitemutil import request_infra_retry
+```py
+from helix.public import request_infra_retry
 
 request_infra_retry('Optional reason string')
-
 ```
 
-###### Outside python:
-
-Linux / OSX: `$HELIX_PYTHONPATH -c "from helix.workitemutil import request_infra_retry; request_infra_retry('Optional reason string')"`
-
-Windows: `%HELIX_PYTHONPATH% -c "from helix.workitemutil import request_infra_retry; request_infra_retry('Optional reason string')"`
-
 #### Request post-workitem reboot
 Helix work items explicitly rebooting the helix client machine themself will never "finish", since this will in most cases preclude sending the final event telemetry for these work items.  However, a work item may know that the machine is in a bad state where a reboot would be desirable (for instance, if the Helix agent is acting as a build machine and some leaked build process is preventing workspace cleanup). After calling this API, the work item runs to completion as normal, then after sending the usual telemetry and uploading results will perform a reboot before taking the next work item. 
 
-##### Sample usage:
+##### Sample usage in Python:
 
-###### In Python:
+```py
+from helix.public import request_reboot
 
+request_reboot('Optional reason string')
 ```
-from helix.workitemutil import request_reboot
 
-request_reboot('Optional reason string')
+#### Send workitem metric / metrics
+Send custom metric(s) for the current workitem. The API accepts metric name(s), value(s) (float) and metric dimensions. These metrics are stored in the Kusto Metrics table.
+
+##### Sample usage in Python:
 
+```py
+from helix.public import send_metric, send_metrics
+
+send_metric('MetricName', <value>, {'Dimension1': 'value1', 'Dimension2' : 'value2', ...})
+
+send_metrics({'Metric1': <value1>, 'Metric2': <value2>,...}, {'Dimension1': 'value1', 'Dimension2' : 'value2', ...})
 ```
 
-###### Outside python:
+#### Sample usage from outside python:
 
-Linux / OSX: `$HELIX_PYTHONPATH -c "from helix.workitemutil import request_reboot; request_reboot('Optional reason string')"`
+Linux / OSX: `$HELIX_PYTHONPATH -c "from helix.public import <function>; <function>(...)"`
 
-Windows: `%HELIX_PYTHONPATH% -c "from helix.workitemutil import request_reboot; request_reboot('Optional reason string')"`
+Windows: `%HELIX_PYTHONPATH% -c "from helix.public import <function>; <function>(...)"`
 
 ### Common Helix client environment variables
 
@@ -286,3 +327,80 @@ You may assume that all the following variables are set on any given Helix clien
 - **HELIX_CURRENT_LOG** : Path to the current work item's console log (note: will typically have file handles open)
 
 
+## Test Retry
+Helix supports retrying and reporting on partial successes for tests based on repository specific configuration.
+When the configuration matches a test failure, the test assembly is reexecuted, and the results compared.
+Tests that failed partially (only in some executions) will be reported to Azure DevOps as "Passed on Rerun",
+which will include each iteration as a sub-result of the failing test.
+If a test passes or fails in all attempts, only a single report is made representing the first execution.
+
+To opt-in and configure test retries when using helix, create file in the reporitory at "eng/test-configuration.json"
+
+### test-configuration.json format
+```json
+{
+  "version" : 1,
+  "defaultOnFailure": "fail",
+  "localRerunCount" : 2,
+  "retryOnRules": [
+    {"testName": {"regex": "^System\\.Networking\\..*"}},
+    {"testAssembly": {"wildcard": "System.SomethingElse.*" }},
+    {"failureMessage": "network disconnected" },
+  ],
+  "failOnRules": [
+  ],
+  "quarantineRules": [
+  ]
+}
+```
+
+## Description
+### version
+Schema version for compatibility (curent version is 1)
+
+### defaultOnFailure
+- default: "fail"
+
+One of "fail" or "rerun"
+<dl>
+<dt>fail</dt><dd>If a test fails, the default behavior if no rules match is to fail the test immediate</dd>
+<dt>rerun</dt><dd>If a test fails, the default behavior is no rules match is to rerun the test according to the localRerun/remoteRerun counts</dd>
+</dl>
+
+## localRerunCount
+- default: 1
+
+This number indicates the number of times a test that needs to be "rerun" should be rerun on the local computer immediately.
+This is the fastest rerun option, because the payloads don't need to be redownloaded, so it always the first attempted re-execution method.
+
+In the example, with a value of "2", that means that the test will need to fail 3 times before being marks as failed (1 intial failure, and 2 rerun failures).
+
+## rules
+The three "rules" entries are lists of rules that will be used to match test to determine desired behavior. In the case of multiple rule matches:
+- if a quarantine rule matches, the test is quarantined
+- if the default behavior is "rerun" and a "fail" rule matches, the test is failed
+- if the default behavior is "fail" and a "rerun" rule matches, the test is rerun
+- default behavior is used
+
+A "rule" consists of a property, and then a rule object
+
+### Properties
+<dl>
+<dt>testName</dt><dd>The name of the test, including namespace, class name, and method name</dd>
+<dt>testAssembly</dt><dd>The name of the assembly containing the test</dd>
+<dt>failureMessage</dt><dd>The failure message logged by the test</dd>
+<dt>callstack (multiline)</dt><dd>The callstack reported by the test execution</dd>
+</dl>
+
+### Rule object
+For all rules, if a property is designated "multiline", then the rule must match a line, otherwise the entire value is used.
+
+All comparisons are case-insensitive
+#### Raw string (e.g. "rule string")
+True if the property value exactly matches the string
+#### {"contains": "value"}
+True if the property contains (case-insensitive) the value string
+#### {"wildcard": "value with * wildcard"}
+The same as a raw string, but "*" can match any number of characters, and "?" can match one character
+#### {"regex": "value with .* regex"}
+true if the property matches the regular expression
diff --git a/src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs b/src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs
index a4f18c4e2b4..a2abfe956a3 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -14,6 +15,28 @@ namespace Microsoft.DotNet.Helix.Sdk
 {
     public class SendHelixJob : HelixTask
     {
+        public static class MetadataNames
+        {
+            public const string Identity = "Identity";
+            public const string Value = "Value";
+
+            // HelixWorkItem
+            public const string PayloadDirectory = "PayloadDirectory";
+            public const string PayloadArchive = "PayloadArchive";
+            public const string PayloadUri = "PayloadUri";
+            public const string Timeout = "Timeout";
+            public const string Command = "Command";
+            public const string PreCommands = "PreCommands";
+            public const string PostCommands = "PostCommands";
+
+            // Correlation payload
+            public const string FullPath = "FullPath";
+            public const string Uri = "Uri";
+            public const string Destination = "Destination";
+            public const string IncludeDirectoryName = "IncludeDirectoryName";
+            public const string AsArchive = "AsArchive";
+        }
+
         /// <summary>
         ///   The 'type' value reported to Helix
         /// </summary>
@@ -208,7 +231,7 @@ protected override async Task ExecuteCore(CancellationToken cancellationToken)
                         def = AddProperty(def, helixProperty);
                     }
                 }
-                
+
                 def = AddBuildVariableProperty(def, "CollectionUri", "System.CollectionUri");
                 def = AddBuildVariableProperty(def, "Project", "System.TeamProject");
                 def = AddBuildVariableProperty(def, "BuildNumber", "Build.BuildNumber");
@@ -216,7 +239,7 @@ protected override async Task ExecuteCore(CancellationToken cancellationToken)
                 def = AddBuildVariableProperty(def, "DefinitionName", "Build.DefinitionName");
                 def = AddBuildVariableProperty(def, "DefinitionId", "System.DefinitionId");
                 def = AddBuildVariableProperty(def, "Reason", "Build.Reason");
-                var variablesToCopy = new []
+                var variablesToCopy = new[]
                 {
                     "System.JobId",
                     "System.JobName",
@@ -239,9 +262,9 @@ protected override async Task ExecuteCore(CancellationToken cancellationToken)
                 }
 
                 Log.LogMessage(MessageImportance.High, $"Sending Job to {TargetQueue}...");
-
                 cancellationToken.ThrowIfCancellationRequested();
-                ISentJob job = await def.SendAsync(msg => Log.LogMessage(msg), cancellationToken);
+                // LogMessageFromText will take any string formatted as a canonical error or warning and convert the type of log to this
+                ISentJob job = await def.SendAsync(msg => Log.LogMessageFromText(msg, MessageImportance.High), cancellationToken);
                 JobCorrelationId = job.CorrelationId;
                 JobCancellationToken = job.HelixCancellationToken;
                 ResultsContainerUri = job.ResultsContainerUri;
@@ -274,12 +297,12 @@ private static string FromAzdoVariableNameToEnvironmentVariableName(string name)
 
         private IJobDefinition AddProperty(IJobDefinition def, ITaskItem property)
         {
-            if (!property.GetRequiredMetadata(Log, "Identity", out string key))
+            if (!property.GetRequiredMetadata(Log, MetadataNames.Identity, out string key))
             {
                 return def;
             }
 
-            if (!property.GetRequiredMetadata(Log, "Value", out string value))
+            if (!property.GetRequiredMetadata(Log, MetadataNames.Value, out string value))
             {
                 return def;
             }
@@ -291,12 +314,12 @@ private IJobDefinition AddProperty(IJobDefinition def, ITaskItem property)
 
         private IJobDefinition AddWorkItem(IJobDefinition def, ITaskItem workItem)
         {
-            if (!workItem.GetRequiredMetadata(Log, "Identity", out string name))
+            if (!workItem.GetRequiredMetadata(Log, MetadataNames.Identity, out string name))
             {
                 return def;
             }
 
-            if(name.Contains('%'))
+            if (name.Contains('%'))
             {
                 Log.LogWarning($"Work Item named '{name}' contains encoded characters which is not recommended.");
             }
@@ -310,7 +333,7 @@ private IJobDefinition AddWorkItem(IJobDefinition def, ITaskItem workItem)
 
             name = cleanedName;
 
-            if (!workItem.GetRequiredMetadata(Log, "Command", out string command))
+            if (!workItem.GetRequiredMetadata(Log, MetadataNames.Command, out string command))
             {
                 return def;
             }
@@ -339,9 +362,9 @@ private IJobDefinition AddWorkItem(IJobDefinition def, ITaskItem workItem)
                 }
             }
 
-            string payloadDirectory = workItem.GetMetadata("PayloadDirectory");
-            string payloadArchive = workItem.GetMetadata("PayloadArchive");
-            string payloadUri = workItem.GetMetadata("PayloadUri");
+            string payloadDirectory = workItem.GetMetadata(MetadataNames.PayloadDirectory);
+            string payloadArchive = workItem.GetMetadata(MetadataNames.PayloadArchive);
+            string payloadUri = workItem.GetMetadata(MetadataNames.PayloadUri);
             IWorkItemDefinition wi;
             if (!string.IsNullOrEmpty(payloadUri))
             {
@@ -365,7 +388,7 @@ private IJobDefinition AddWorkItem(IJobDefinition def, ITaskItem workItem)
             }
 
 
-            string timeoutString = workItem.GetMetadata("Timeout");
+            string timeoutString = workItem.GetMetadata(MetadataNames.Timeout);
             if (!string.IsNullOrEmpty(timeoutString))
             {
                 if (TimeSpan.TryParse(timeoutString, CultureInfo.InvariantCulture, out TimeSpan timeout))
@@ -396,7 +419,7 @@ private IEnumerable<string> GetCommands(ITaskItem workItem, string workItemComma
                 }
             }
 
-            if (workItem.TryGetMetadata("PreCommands", out string workItemPreCommandsString))
+            if (workItem.TryGetMetadata(MetadataNames.PreCommands, out string workItemPreCommandsString))
             {
                 foreach (string command in SplitCommands(workItemPreCommandsString))
                 {
@@ -412,7 +435,7 @@ private IEnumerable<string> GetCommands(ITaskItem workItem, string workItemComma
             // this way we can exit the process honoring that exit code, needed for retry.
             yield return IsPosixShell ? $"export {exitCodeVariableName}=$?" : $"set {exitCodeVariableName}=%ERRORLEVEL%";
 
-            if (workItem.TryGetMetadata("PostCommands", out string workItemPostCommandsString))
+            if (workItem.TryGetMetadata(MetadataNames.PostCommands, out string workItemPostCommandsString))
             {
                 foreach (string command in SplitCommands(workItemPostCommandsString))
                 {
@@ -479,9 +502,9 @@ private IEnumerable<string> SplitCommands(string value)
 
         private IJobDefinition AddCorrelationPayload(IJobDefinition def, ITaskItem correlationPayload)
         {
-            string path = correlationPayload.GetMetadata("FullPath");
-            string uri = correlationPayload.GetMetadata("Uri");
-            string destination = correlationPayload.GetMetadata("Destination") ?? "";
+            string path = correlationPayload.GetMetadata(MetadataNames.FullPath);
+            string uri = correlationPayload.GetMetadata(MetadataNames.Uri);
+            string destination = correlationPayload.GetMetadata(MetadataNames.Destination) ?? "";
 
             if (!string.IsNullOrEmpty(uri))
             {
@@ -499,17 +522,44 @@ private IJobDefinition AddCorrelationPayload(IJobDefinition def, ITaskItem corre
 
             if (Directory.Exists(path))
             {
-                string includeDirectoryNameStr = correlationPayload.GetMetadata("IncludeDirectoryName");
-                bool.TryParse(includeDirectoryNameStr, out bool includeDirectoryName);
+                string includeDirectoryNameStr = correlationPayload.GetMetadata(MetadataNames.IncludeDirectoryName);
+                if (!bool.TryParse(includeDirectoryNameStr, out bool includeDirectoryName))
+                {
+                    includeDirectoryName = false;
+                }
 
-                Log.LogMessage(MessageImportance.Low, $"Adding Correlation Payload Directory '{path}', destination '{destination}'");
+                Log.LogMessage(
+                    MessageImportance.Low,
+                    $"Adding Correlation Payload Directory '{path}', destination '{destination}'"
+                );
                 return def.WithCorrelationPayloadDirectory(path, includeDirectoryName, destination);
+
             }
 
             if (File.Exists(path))
             {
-                Log.LogMessage(MessageImportance.Low, $"Adding Correlation Payload Archive '{path}', destination '{destination}'");
-                return def.WithCorrelationPayloadArchive(path, destination);
+                string asArchiveStr = correlationPayload.GetMetadata(MetadataNames.AsArchive);
+                if (!bool.TryParse(asArchiveStr, out bool asArchive))
+                {
+                    // With no other information, default to true, since that was the previous behavior
+                    // before we added the option
+                    asArchive = true;
+                }
+
+                if (asArchive)
+                {
+                    Log.LogMessage(
+                        MessageImportance.Low,
+                        $"Adding Correlation Payload Archive '{path}', destination '{destination}'"
+                    );
+                    return def.WithCorrelationPayloadArchive(path, destination);
+                }
+
+                Log.LogMessage(
+                    MessageImportance.Low,
+                    $"Adding Correlation Payload File '{path}', destination '{destination}'"
+                );
+                return def.WithCorrelationPayloadFiles(path);
             }
 
             Log.LogError(FailureCategory.Build, $"Correlation Payload '{path}' not found.");
diff --git a/src/Microsoft.DotNet.Helix/Sdk/XharnessTaskBase.cs b/src/Microsoft.DotNet.Helix/Sdk/XharnessTaskBase.cs
index 53c8fd5db52..ec33ab7fc6d 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/XharnessTaskBase.cs
+++ b/src/Microsoft.DotNet.Helix/Sdk/XharnessTaskBase.cs
@@ -1,31 +1,32 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
-using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.Arcade.Common;
 using Microsoft.Build.Framework;
-using Newtonsoft.Json;
 
 namespace Microsoft.DotNet.Helix.Sdk
 {
     /// <summary>
     /// MSBuild custom task to create HelixWorkItems for provided Android application packages.
     /// </summary>
-    public abstract class XHarnessTaskBase : BaseTask
+    public abstract class XHarnessTaskBase : MSBuildTaskBase
     {
-        private const int DefaultWorkItemTimeoutInMinutes = 20;
-        private const int DefaultTestTimeoutInMinutes = 12;
+        private static readonly TimeSpan s_defaultWorkItemTimeout = TimeSpan.FromMinutes(20);
+        private static readonly TimeSpan s_defaultTestTimeout = TimeSpan.FromMinutes(12);
+        protected static readonly TimeSpan s_telemetryBuffer = TimeSpan.FromSeconds(20); // extra time to send the XHarness telemetry
 
-        private const string TestTimeoutPropName = "TestTimeout";
-        private const string WorkItemTimeoutPropName = "WorkItemTimeout";
-        private const string ExpectedExitCodePropName = "ExpectedExitCode";
+        public class MetadataName
+        {
+            public const string TestTimeout = "TestTimeout";
+            public const string WorkItemTimeout = "WorkItemTimeout";
+            public const string ExpectedExitCode = "ExpectedExitCode";
+            public const string CustomCommands = "CustomCommands";
+        }
 
-        /// <summary>
-        /// Boolean true if this is a posix shell, false if not.
-        /// This does not need to be set by a user; it is automatically determined in Microsoft.DotNet.Helix.Sdk.MonoQueue.targets
-        /// </summary>
-        [Required]
-        public bool IsPosixShell { get; set; }
+        protected const string ScriptNamespace = "tools.xharness_runner.";
+        private const string CustomCommandsScript = "command";
+        private const string DiagnosticsScript = "xharness-event-processor.py";
 
         /// <summary>
         /// Extra arguments that will be passed to the iOS/Android/... app that is being run
@@ -48,35 +49,41 @@ public abstract class XHarnessTaskBase : BaseTask
         ///   - WorkItemTimeout - Optional timeout for the whole Helix work item run (includes SDK and tool installation)
         ///   - ExpectedExitCode - Optional expected exit code parameter that is forwarded to XHarness
         /// </returns>
-        protected (TimeSpan TestTimeout, TimeSpan WorkItemTimeout, int ExpectedExitCode) ParseMetadata(ITaskItem xHarnessAppItem)
+        protected (TimeSpan TestTimeout, TimeSpan WorkItemTimeout, int ExpectedExitCode, string CustomCommands) ParseMetadata(ITaskItem xHarnessAppItem)
         {
+            xHarnessAppItem.TryGetMetadata(MetadataName.CustomCommands, out string customCommands);
+            if (string.IsNullOrEmpty(customCommands))
+            {
+                customCommands = null;
+            }
+
             // Optional timeout for the actual test execution in the TimeSpan format
-            TimeSpan testTimeout = TimeSpan.FromMinutes(DefaultTestTimeoutInMinutes);
-            if (xHarnessAppItem.TryGetMetadata(TestTimeoutPropName, out string testTimeoutProp))
+            TimeSpan testTimeout = s_defaultTestTimeout;
+            if (xHarnessAppItem.TryGetMetadata(MetadataName.TestTimeout, out string testTimeoutProp))
             {
                 if (!TimeSpan.TryParse(testTimeoutProp, out testTimeout) || testTimeout.Ticks < 0)
                 {
-                    Log.LogError($"Invalid value \"{testTimeoutProp}\" provided in <{TestTimeoutPropName}>");
+                    Log.LogError($"Invalid value \"{testTimeoutProp}\" provided in <{MetadataName.TestTimeout}>");
                 }
             }
 
             // Optional timeout for the whole Helix work item run (includes SDK and tool installation)
-            TimeSpan workItemTimeout = TimeSpan.FromMinutes(DefaultWorkItemTimeoutInMinutes);
-            if (xHarnessAppItem.TryGetMetadata(WorkItemTimeoutPropName, out string workItemTimeoutProp))
+            TimeSpan workItemTimeout = s_defaultWorkItemTimeout;
+            if (xHarnessAppItem.TryGetMetadata(MetadataName.WorkItemTimeout, out string workItemTimeoutProp))
             {
                 if (!TimeSpan.TryParse(workItemTimeoutProp, out workItemTimeout) || workItemTimeout.Ticks < 0)
                 {
-                    Log.LogError($"Invalid value \"{workItemTimeoutProp}\" provided in <{WorkItemTimeoutPropName}>");
+                    Log.LogError($"Invalid value \"{workItemTimeoutProp}\" provided in <{MetadataName.WorkItemTimeout}>");
                 }
             }
             else if (!string.IsNullOrEmpty(testTimeoutProp))
             {
                 // When test timeout was set and work item timeout has not,
                 // we adjust the work item timeout to give enough space for things to work
-                workItemTimeout = TimeSpan.FromMinutes(testTimeout.TotalMinutes + DefaultWorkItemTimeoutInMinutes - DefaultTestTimeoutInMinutes);
+                workItemTimeout = testTimeout + s_defaultWorkItemTimeout - s_defaultTestTimeout;
             }
 
-            if (workItemTimeout <= testTimeout)
+            if (customCommands == null && workItemTimeout <= testTimeout)
             {
                 Log.LogWarning(
                     $"Work item timeout ({workItemTimeout}) should be larger than test timeout ({testTimeout}) " +
@@ -84,36 +91,105 @@ public abstract class XHarnessTaskBase : BaseTask
             }
 
             int expectedExitCode = 0;
-            if (xHarnessAppItem.TryGetMetadata(ExpectedExitCodePropName, out string expectedExitCodeProp))
+            if (xHarnessAppItem.TryGetMetadata(MetadataName.ExpectedExitCode, out string expectedExitCodeProp))
             {
                 int.TryParse(expectedExitCodeProp, out expectedExitCode);
             }
 
-            return (
-                TestTimeout: testTimeout,
-                WorkItemTimeout: workItemTimeout,
-                ExpectedExitCode: expectedExitCode);
+            return (testTimeout, workItemTimeout, expectedExitCode, customCommands);
         }
 
-        protected static async Task AddResourceFileToPayload(string payloadArchivePath, string resourceFileName, string targetFileName = null)
+        protected Build.Utilities.TaskItem CreateTaskItem(string workItemName, string payloadArchivePath, string command, TimeSpan timeout)
         {
-            using Stream fileStream = GetResourceFileContent(resourceFileName);
-            await AddToPayloadArchive(payloadArchivePath, targetFileName ?? resourceFileName, fileStream);
+            Log.LogMessage($"Creating work item with properties Identity: {workItemName}, Payload: {payloadArchivePath}, Command: {command}");
+
+            // Leave some time at the end of the work item to send the telemetry (in case it times out)
+            timeout += s_telemetryBuffer;
+
+            return new(workItemName, new Dictionary<string, string>()
+            {
+                { "Identity", workItemName },
+                { "PayloadArchive", payloadArchivePath },
+                { "Command", command },
+                { "Timeout", timeout.ToString() },
+            });
         }
 
-        protected static async Task AddToPayloadArchive(string payloadArchivePath, string targetFilename, Stream content)
+        protected async Task<string> CreatePayloadArchive(
+            IZipArchiveManager zipArchiveManager,
+            IFileSystem fileSystem,
+            string workItemName,
+            bool isAlreadyArchived,
+            bool isPosix,
+            string pathToZip,
+            string injectedCommands,
+            string[] payloadScripts)
         {
-            using FileStream archiveStream = new FileStream(payloadArchivePath, FileMode.Open);
-            using ZipArchive archive = new ZipArchive(archiveStream, ZipArchiveMode.Update);
-            ZipArchiveEntry entry = archive.CreateEntry(targetFilename);
-            using Stream targetStream = entry.Open();
-            await content.CopyToAsync(targetStream);
+            string outputZipPath;
+            if (!isAlreadyArchived)
+            {
+                string appFolderDirectory = fileSystem.GetDirectoryName(pathToZip);
+                string fileName = $"xharness-payload-{workItemName.ToLowerInvariant()}.zip";
+                outputZipPath = fileSystem.PathCombine(appFolderDirectory, fileName);
+
+                if (fileSystem.FileExists(outputZipPath))
+                {
+                    Log.LogMessage($"Zip archive '{outputZipPath}' already exists, overwriting..");
+                    fileSystem.DeleteFile(outputZipPath);
+                }
+
+                if (fileSystem.GetAttributes(pathToZip).HasFlag(FileAttributes.Directory))
+                {
+                    zipArchiveManager.ArchiveDirectory(pathToZip, outputZipPath, true);
+                }
+                else
+                {
+                    zipArchiveManager.ArchiveFile(pathToZip, outputZipPath);
+                }
+            }
+            else
+            {
+                Log.LogMessage($"App payload '{workItemName}` has already been zipped");
+                outputZipPath = pathToZip;
+            }
+
+            Log.LogMessage($"Adding the XHarness job scripts into the payload archive");
+
+            foreach (var payloadScript in payloadScripts)
+            {
+                await zipArchiveManager.AddResourceFileToArchive<XHarnessTaskBase>(
+                    outputZipPath,
+                    ScriptNamespace + payloadScript,
+                    payloadScript);
+            }
+
+            await zipArchiveManager.AddResourceFileToArchive<XHarnessTaskBase>(
+                outputZipPath,
+                ScriptNamespace + DiagnosticsScript,
+                DiagnosticsScript);
+
+            await zipArchiveManager.AddContentToArchive(
+                outputZipPath,
+                CustomCommandsScript + (isPosix ? ".sh" : ".ps1"),
+                injectedCommands);
+
+            return outputZipPath;
         }
 
-        protected static Stream GetResourceFileContent(string resourceFileName)
+        /// <summary>
+        /// This method parses the name for the Helix work item and path of the app from the item's metadata.
+        /// The user can re-use the same .apk for 2 work items so the name of the work item will come from ItemSpec and path from metadata.
+        /// </summary>
+        public static (string WorkItemName, string AppPath) GetNameAndPath(ITaskItem item, string pathMetadataName, IFileSystem fileSystem)
         {
-            Assembly thisAssembly = typeof(XHarnessTaskBase).Assembly;
-            return thisAssembly.GetManifestResourceStream($"{thisAssembly.GetName().Name}.tools.xharness_runner.{resourceFileName}");
+            if (item.TryGetMetadata(pathMetadataName, out string appPathMetadata) && !string.IsNullOrEmpty(appPathMetadata))
+            {
+                return (item.ItemSpec, appPathMetadata);
+            }
+            else
+            {
+                return (fileSystem.GetFileNameWithoutExtension(item.ItemSpec), item.ItemSpec);
+            }
         }
     }
 }
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MonoQueue.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MonoQueue.targets
index b271e821239..20c875c5637 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MonoQueue.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MonoQueue.targets
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <EnableXUnitReporter Condition=" '$(EnableXUnitReporter)' != 'true' ">false</EnableXUnitReporter>
+    <!-- Helix Queues which do not exist (deprecation, typos, or purposful removal for use reduction) will error by default. 
+         For users that do not want this to break builds (such as in release branch testing) this property allows to downgrade 
+         this failure mode to just a warning, which hopefully still tells the user to remove usage when possible. -->
+    <FailOnMissingTargetQueue Condition=" '$(FailOnMissingTargetQueue)' != 'false' ">true</FailOnMissingTargetQueue>
   </PropertyGroup>
-
+  
+  <PropertyGroup Condition=" '$(HelixTestConfigurationFilePath)' == '' ">
+    <HelixTestConfigurationFilePath Condition=" '$(RepositoryEngineeringDir)' != '' ">$(RepositoryEngineeringDir)/test-configuration.json</HelixTestConfigurationFilePath>
+  </PropertyGroup>
+  
   <Choose>
     <When Condition="$(HelixTargetQueue.ToLowerInvariant().Contains('windows'))">
       <PropertyGroup>
@@ -19,23 +26,15 @@
 
   <Import Project="$(_HelixMonoQueueTargets)" Condition="'$(_HelixMonoQueueTargets)' != ''"/>
 
-  <Target Name="AddXUnitReporter" Condition="$(EnableXUnitReporter)" BeforeTargets="CoreTest">
-    <ItemGroup>
-      <HelixCorrelationPayload Include="$(MSBuildThisFileDirectory)xunit-reporter"/>
-    </ItemGroup>
-    <PropertyGroup>
-      <HelixPostCommands Condition="$(IsPosixShell)">$(HelixPostCommands);$HELIX_PYTHONPATH -B $HELIX_CORRELATION_PAYLOAD/xunit-reporter.py</HelixPostCommands>
-      <HelixPostCommands Condition="!$(IsPosixShell)">$(HelixPostCommands);%HELIX_PYTHONPATH% -B %HELIX_CORRELATION_PAYLOAD%\xunit-reporter.py</HelixPostCommands>
-
-      <MaxRetryCount Condition="'$(MaxRetryCount)' == ''">0</MaxRetryCount>
-    </PropertyGroup>
-  </Target>
-
   <ItemGroup>
     <HelixProperties Condition="'$(HelixConfiguration)' != ''" Include="configuration" Value="$(HelixConfiguration)" />
     <HelixProperties Condition="'$(HelixArchitecture)' != ''" Include="architecture" Value="$(HelixArchitecture)" />
     <HelixProperties Include="operatingSystem" Value="$(HelixTargetQueue)" />
   </ItemGroup>
+  
+  <ItemGroup Condition="Exists('$(HelixTestConfigurationFilePath)')">
+    <HelixCorrelationPayload Include="$(HelixTestConfigurationFilePath)" AsArchive="false" />
+  </ItemGroup>
 
   <Target Name="CoreBuild">
   </Target>
@@ -46,6 +45,7 @@
     </PropertyGroup>
     <SendHelixJob Type="$(HelixType)"
                   TargetQueue="$(HelixTargetQueue)"
+                  FailOnMissingTargetQueue="$(FailOnMissingTargetQueue)"
                   IsPosixShell="$(IsPosixShell)"
                   Creator="$(Creator)"
                   BaseUri="$(HelixBaseUri)"
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props
index 7fd0d526b6a..902a74f8cd2 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props
@@ -26,4 +26,5 @@
   <UsingTask TaskName="CheckAzurePipelinesTestResults" AssemblyFile="$(MicrosoftDotNetHelixSdkTasksAssembly)"/>
   <UsingTask TaskName="DownloadFromResultsContainer" AssemblyFile="$(MicrosoftDotNetHelixSdkTasksAssembly)"/>
   <UsingTask TaskName="CancelHelixJobs" AssemblyFile="$(MicrosoftDotNetHelixSdkTasksAssembly)"/>
+  <UsingTask TaskName="InstallDotNetTool" AssemblyFile="$(MicrosoftDotNetHelixSdkTasksAssembly)"/>
 </Project>
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/AzurePipelines.MonoQueue.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/AzurePipelines.MonoQueue.targets
index 335fac7897f..d5fbcb4569f 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/AzurePipelines.MonoQueue.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/AzurePipelines.MonoQueue.targets
@@ -7,11 +7,11 @@
   <PropertyGroup>
     <HelixPostCommands Condition="$(IsPosixShell)">
       $(HelixPostCommands);
-      /bin/sh $HELIX_CORRELATION_PAYLOAD/reporter/run.sh $(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI) $(SYSTEM_TEAMPROJECT) $(TestRunId) $(SYSTEM_ACCESSTOKEN)
+      $HELIX_PYTHONPATH $HELIX_CORRELATION_PAYLOAD/reporter/run.py $(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI) $(SYSTEM_TEAMPROJECT) $(TestRunId) $(SYSTEM_ACCESSTOKEN) || exit $?
     </HelixPostCommands>
     <HelixPostCommands Condition="!$(IsPosixShell)">
       $(HelixPostCommands);
-      call %HELIX_CORRELATION_PAYLOAD%\reporter\run.bat $(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI) $(SYSTEM_TEAMPROJECT) $(TestRunId) $(SYSTEM_ACCESSTOKEN)
+      %HELIX_PYTHONPATH% %HELIX_CORRELATION_PAYLOAD%\reporter\run.py $(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI) $(SYSTEM_TEAMPROJECT) $(TestRunId) $(SYSTEM_ACCESSTOKEN) || exit /b
     </HelixPostCommands>
   </PropertyGroup>
 
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/azure_devops_result_publisher.py b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/azure_devops_result_publisher.py
deleted file mode 100644
index fe9441887d0..00000000000
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/azure_devops_result_publisher.py
+++ /dev/null
@@ -1,237 +0,0 @@
-import base64
-import os
-import logging
-from typing import Iterable, Mapping, List, Dict, Optional, Tuple
-from builtins import str as text
-from azure.devops.connection import Connection
-from msrest.authentication import BasicTokenAuthentication, BasicAuthentication
-from azure.devops.v5_1.test import TestClient
-from azure.devops.v5_1.test.models import TestCaseResult, TestAttachmentRequestModel, TestSubResult
-
-from helpers import get_env
-from defs import TestResult
-
-log = logging.getLogger(__name__)
-
-class AzureDevOpsTestResultPublisher:
-    def __init__(self, collection_uri, access_token, team_project, test_run_id=None):
-        """
-
-        :type collection_uri: str The team project collection uri
-        :type access_token: str The value of SYSTEM_ACCESSTOKEN from the azure pipelines build
-        """
-        self.collection_uri = collection_uri
-        self.access_token = access_token
-        self.team_project = team_project
-        self.test_run_id = test_run_id
-        self.work_item_name = get_env("HELIX_WORKITEM_FRIENDLYNAME")
-        pass
-
-    def upload_batch(self, results: Iterable[TestResult]):
-        results_with_attachments = {r.name: r for r in results if r is not None and r.attachments}
-
-        (test_case_results, test_name_order) = self.convert_results(results)
-
-        self.publish_results(test_case_results, test_name_order, results_with_attachments)
-
-    def is_data_driven_test(self, r: str) -> bool:
-        return r.endswith(")")
-
-    def get_ddt_base_name(self, r: str) -> str:
-        return r.split('(',1)[0]
-
-    def send_attachment(self, test_client, attachment, published_result):
-        try:
-            # Python 3 will throw a TypeError exception because b64encode expects bytes
-            stream=base64.b64encode(text(attachment.text))
-        except TypeError:
-            # stream has to be a string but b64encode takes and returns bytes on Python 3
-            stream=base64.b64encode(bytes(attachment.text, "utf-8")).decode("utf-8")
-
-        test_client.create_test_result_attachment(
-            TestAttachmentRequestModel(
-                file_name=text(attachment.name),
-                stream=stream,
-            ), self.team_project, self.test_run_id, published_result.id)
-
-    def send_sub_attachment(self, test_client, attachment, published_result, sub_result_id):
-        stream=base64.b64encode(bytes(attachment.text, "utf-8")).decode("utf-8")
-
-        test_client.create_test_sub_result_attachment(
-            TestAttachmentRequestModel(
-                file_name=text(attachment.name),
-                stream=stream,
-            ), self.team_project, self.test_run_id, published_result.id, sub_result_id)
-
-    def publish_results(self, test_case_results: Iterable[TestCaseResult], test_result_order: Dict[str, List[str]], results_with_attachments: Mapping[str, TestResult]) -> None:
-        connection = self.get_connection()
-        test_client = connection.get_client("azure.devops.v5_1.test.TestClient")  # type: TestClient
-
-        published_results = test_client.add_test_results_to_test_run(list(test_case_results), self.team_project, self.test_run_id)  # type: List[TestCaseResult]
-
-        for published_result in published_results:
-
-            # Don't send attachments if the result was not accepted.
-            if published_result.id == -1:
-                continue
-
-            # Does the test result have an attachment with an exact matching name?
-            if published_result.automated_test_name in results_with_attachments:
-                log.debug("Result {0} has an attachment".format(published_result.automated_test_name))
-                result = results_with_attachments.get(published_result.automated_test_name)
-
-                for attachment in result.attachments:
-                    self.send_attachment(test_client, attachment, published_result)
-
-            # Does the test result have an attachment with a sub-result matching name?
-            # The data structure returned from AzDO does not contain a subresult's name, only an 
-            # index. The order of results is meant to be the same as was posted. This assumes that 
-            # is true , and uses the order of test names recorded earlier to look-up the attachments.
-            elif published_result.sub_results is not None:
-                sub_results_order = test_result_order[published_result.automated_test_name]
-                
-                # Sanity check
-                if len(sub_results_order) != len(published_result.sub_results):
-                    log.warning("Returned subresults list length does not match expected. Attachments may not pair correctly.")
-                
-                for (name, sub_result) in zip(sub_results_order, published_result.sub_results):
-                    if name in results_with_attachments:
-                        result = results_with_attachments.get(name)
-                        for attachment in result.attachments:
-                            self.send_sub_attachment(test_client, attachment, published_result, sub_result.id)
-
-    def convert_results(self, results: Iterable[TestResult]) -> Tuple[Iterable[TestCaseResult], Dict[str, List[str]]]:
-        comment = "{{ \"HelixJobId\": \"{}\", \"HelixWorkItemName\": \"{}\" }}".format(
-            os.getenv("HELIX_CORRELATION_ID"),
-            os.getenv("HELIX_WORKITEM_FRIENDLYNAME"),
-        )
-
-        def convert_to_sub_test(r: TestResult) -> Optional[TestSubResult]:
-            if r.result == "Pass":
-                return TestSubResult(
-                    comment=comment,
-                    display_name=text(r.name),
-                    duration_in_ms=r.duration_seconds*1000,
-                    outcome="Passed"
-                    )
-            if r.result == "Fail":
-                return TestSubResult(
-                    comment=comment,
-                    display_name=text(r.name),
-                    duration_in_ms=r.duration_seconds*1000,
-                    outcome="Failed",
-                    stack_trace=text(r.stack_trace) if r.stack_trace is not None else None,
-                    error_message=text(r.failure_message)
-                    )
-            if r.result == "Skip":
-                return TestSubResult(
-                    comment=comment,
-                    display_name=text(r.name),
-                    duration_in_ms=r.duration_seconds*1000,
-                    outcome="NotExecuted"
-                    )
-            log.warning("Unexpected result value {} for {}".format(r.result, r.name))
-            return None
-
-        def convert_result(r: TestResult) -> Optional[TestCaseResult]:
-            if r.result == "Pass":
-                return TestCaseResult(
-                    test_case_title=text(r.name),
-                    automated_test_name=text(r.name),
-                    automated_test_type=text(r.kind),
-                    automated_test_storage=self.work_item_name,
-                    priority=1,
-                    duration_in_ms=r.duration_seconds*1000,
-                    outcome="Passed",
-                    state="Completed",
-                    comment=comment,
-                )
-            if r.result == "Fail":
-                return TestCaseResult(
-                    test_case_title=text(r.name),
-                    automated_test_name=text(r.name),
-                    automated_test_type=text(r.kind),
-                    automated_test_storage=self.work_item_name,
-                    priority=1,
-                    duration_in_ms=r.duration_seconds*1000,
-                    outcome="Failed",
-                    state="Completed",
-                    error_message=text(r.failure_message),
-                    stack_trace=text(r.stack_trace) if r.stack_trace is not None else None,
-                    comment=comment,
-                )
-
-            if r.result == "Skip":
-                return TestCaseResult(
-                    test_case_title=text(r.name),
-                    automated_test_name=text(r.name),
-                    automated_test_type=text(r.kind),
-                    automated_test_storage=self.work_item_name,
-                    priority=1,
-                    duration_in_ms=r.duration_seconds*1000,
-                    outcome="NotExecuted",
-                    state="Completed",
-                    error_message=text(r.skip_reason),
-                    comment=comment,
-                )
-
-            log.warning("Unexpected result value {} for {}".format(r.result, r.name))
-            return None
-
-        unconverted_results = list(results) # type: List[TestResult]
-        log.debug("Count of unconverted_results: {0}".format(len(unconverted_results)))
-
-        # Find all DDTs, determine parent, and add to dictionary
-        data_driven_tests = {}  # type: Dict[str, TestCaseResult]
-        non_data_driven_tests = [] # type: List[TestCaseResult]
-        test_name_ordering = {} # type: Dict[str, List[str]]
-
-        for r in unconverted_results:
-            if r is None:
-                continue
-
-            if not self.is_data_driven_test(r.name):
-                non_data_driven_tests.append(convert_result(r))
-                test_name_ordering[r.name] = []
-                continue
-
-            # Must be a DDT
-            base_name = self.get_ddt_base_name(r.name)
-
-            if base_name in data_driven_tests:
-                sub_test = convert_to_sub_test(r)
-                if sub_test is None:
-                    continue
-
-                data_driven_tests[base_name].sub_results.append(sub_test)
-                test_name_ordering[base_name].append(r.name)
-
-                # Mark parent test as Failed if any subresult is Failed
-                if sub_test.outcome == "Failed":
-                    data_driven_tests[base_name].outcome = "Failed"
-
-            else:
-                cr = convert_result(r)
-                csr = convert_to_sub_test(r)
-
-                if cr is None or csr is None:
-                    continue
-
-                data_driven_tests[base_name] = cr
-                data_driven_tests[base_name].automated_test_name = base_name
-                data_driven_tests[base_name].result_group_type = "dataDriven"
-                data_driven_tests[base_name].sub_results = [csr]
-                test_name_ordering[base_name] = [r.name]
-
-        return (list(data_driven_tests.values()) + non_data_driven_tests, test_name_ordering)
-
-    def get_connection(self) -> Connection:
-        credentials = self.get_credentials()
-        return Connection(self.collection_uri, credentials)
-
-    def get_credentials(self) -> BasicTokenAuthentication:
-        if self.access_token:
-            return BasicTokenAuthentication({'access_token': self.access_token})
-
-        token = get_env("VSTS_PAT")
-        return BasicAuthentication("ignored", token)
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/defs.py b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/defs.py
deleted file mode 100644
index 53cc7f8b5c5..00000000000
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/defs.py
+++ /dev/null
@@ -1,98 +0,0 @@
-from typing import List
-
-
-class TestResult:
-    def __init__(self, name, kind, type_name, method, duration, result, exception_type, failure_message, stack_trace,
-                 skip_reason, attachments):
-        """
-
-        :type name: unicode
-        :type kind: unicode
-        :type type_name: unicode
-        :type method: unicode
-        :type duration: float
-        :type result: unicode
-        :type exception_type: unicode
-        :type failure_message: unicode
-        :type stack_trace: unicode
-        :type skip_reason: unicode
-        :type attachments: List[TestResultAttachment]
-        """
-        self._name = name
-        self._kind = kind
-        self._type = type_name
-        self._method = method
-        self._duration_seconds = duration
-        self._result = result
-        self._exception_type = exception_type
-        self._failure_message = failure_message
-        self._stack_trace = stack_trace
-        self._skip_reason = skip_reason
-        self._attachments = attachments
-
-    @property
-    def name(self):
-        return self._name
-
-    @property
-    def kind(self):
-        return self._kind
-
-    @property
-    def type(self):
-        return self._type
-
-    @property
-    def method(self):
-        return self._method
-
-    @property
-    def duration_seconds(self):
-        return self._duration_seconds
-
-    @property
-    def result(self):
-        return self._result
-
-    @property
-    def exception_type(self):
-        return self._exception_type
-
-    @property
-    def failure_message(self):
-        return self._failure_message
-
-    @property
-    def stack_trace(self):
-        return self._stack_trace
-
-    @property
-    def skip_reason(self):
-        return self._skip_reason
-
-    @property
-    def output(self):
-        return self._output
-
-    @property
-    def attachments(self):
-        return self._attachments
-
-
-class TestResultAttachment:
-    def __init__(self, name, text):
-        """
-
-        :type name: unicode
-        :type text: unicode
-        """
-        self._name = name
-        self._text = text
-
-    @property
-    def name(self):
-        return self._name
-
-    @property
-    def text(self):
-        return self._text
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/junit.py b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/junit.py
index e5bdbf554cc..629f31b2165 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/junit.py
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/junit.py
@@ -1,6 +1,6 @@
 import xml.etree.ElementTree
 from .result_format import ResultFormat
-from defs import TestResult, TestResultAttachment
+from helix.public import TestResult, TestResultAttachment
 
 
 class JUnitFormat(ResultFormat):
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/result_format.py b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/result_format.py
index 43aa2a2bb40..8d7cc966311 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/result_format.py
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/result_format.py
@@ -1,5 +1,5 @@
 from abc import ABCMeta, abstractmethod, abstractproperty
-from defs import TestResult
+from helix.public import TestResult
 from typing import Iterable
 
 
@@ -10,15 +10,13 @@ def __init__(self):
         pass
 
     @abstractproperty
-    def name(self):
+    def name(self) -> str:
         pass
 
     @abstractproperty
-    def acceptable_file_suffixes(self):
-        # type: () -> Iterable[str]
+    def acceptable_file_suffixes(self) -> Iterable[str]:
         pass
 
     @abstractmethod
-    def read_results(self, path):
-        # type: (str) -> Iterable[TestResult]
+    def read_results(self, path) -> Iterable[TestResult]:
         pass
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/trx.py b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/trx.py
index 9fabb0d88db..cb2afbec916 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/trx.py
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/trx.py
@@ -1,7 +1,7 @@
 import glob
 import xml.etree.ElementTree
 from .result_format import ResultFormat
-from defs import TestResult, TestResultAttachment
+from helix.public import TestResult, TestResultAttachment
 
 
 class TRXFormat(ResultFormat):
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/xunit.py b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/xunit.py
index d0d3f4025fc..bbf8ee6f96e 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/xunit.py
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/formats/xunit.py
@@ -1,7 +1,31 @@
+import re
 import xml.etree.ElementTree
+
 from .result_format import ResultFormat
-from defs import TestResult, TestResultAttachment
+from helix.public import TestResult, TestResultAttachment
+
+_unescape_char_map = {
+    'r': '\r',
+    'n': '\n',
+    't': '\t',
+    '0': '\0',
+    'a': '\a',
+    'b': '\b',
+    'v': '\v',
+    'f': '\f',
+}
 
+def _unescape_xunit_message(value):
+    # xunit does some escaping on the error message we need to do our
+    # best to turn back into something resembling the original message
+    # It only uses \x**, \x**** (indistinguishably), and then the items from __unescape_char_map
+    def bs(match):
+        grp = match.group(0)
+        sym = grp[1]
+        if sym == 'x':
+            return chr(int(grp[2:], 16))
+        return _unescape_char_map.get(match.group(0)[1]) or sym
+    return re.sub(r'\\x[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]?[0-9a-fA-F]?|\\[^x]', bs, value)
 
 class XUnitFormat(ResultFormat):
 
@@ -38,7 +62,7 @@ def read_results(self, path):
                     exception_type = failure_element.get("exception-type")
                     message_element = failure_element.find("message")
                     if message_element is not None:
-                        failure_message = message_element.text
+                        failure_message = _unescape_xunit_message(message_element.text)
                     stack_trace_element = failure_element.find("stack-trace")
                     if stack_trace_element is not None:
                         stack_trace = stack_trace_element.text
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/run.bat b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/run.bat
deleted file mode 100644
index 6522f803bc9..00000000000
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/run.bat
+++ /dev/null
@@ -1,38 +0,0 @@
-
-set ENV_PATH=%USERPROFILE%\.azdo-env
-set TMP_ENV_PATH=%USERPROFILE%\.azdo-env-tmp
-
-REM Removing pythonpath forces a clean installation of the Azure DevOps client, but subsequent commands may use HELIX libraries
-set _OLD_PYTHONPATH=%PYTHONPATH%
-set PYTHONPATH=
-
-echo  %date%-%time%
-
-if NOT EXIST %ENV_PATH%\Scripts\python.exe (
-  rmdir /Q /S %TMP_ENV_PATH%
-  rmdir /Q /S %ENV_PATH%
-  %HELIX_PYTHONPATH% -m virtualenv --no-site-packages %TMP_ENV_PATH%
-  rename %TMP_ENV_PATH% .azdo-env
-)
-REM On certain slow machines python.exe keeps a handle open just long enough to break the rename; retry if so
-set /a renameAttemptNumber=1
-:retryloop
-if NOT EXIST %ENV_PATH%\Scripts\python.exe (
-set /a renameAttemptNumber+=1
-echo Error renaming venv folder; waiting 5 seconds and retrying up to 10x Attempt: %renameAttemptNumber% 
-ping -n 6 127.0.0.1 > nul
-rename %TMP_ENV_PATH% .azdo-env
-IF %renameAttemptNumber% GEQ 10 GOTO :renamingdone
-GOTO :retryloop
-)
-:renamingdone
-
-%ENV_PATH%\Scripts\python.exe -c "import azure.devops" || %ENV_PATH%\Scripts\python.exe -m pip install azure-devops==5.0.0b9
-
-%ENV_PATH%\Scripts\python.exe -c "import future" || %ENV_PATH%\Scripts\python.exe -m pip install future==0.17.1
-
-echo  %date%-%time%
-%ENV_PATH%\Scripts\python.exe -B %~dp0run.py %*
-echo  %date%-%time%
-
-set PYTHONPATH=%_OLD_PYTHONPATH%
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/run.py b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/run.py
index dcfd343dd98..00f77cf7cba 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/run.py
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/run.py
@@ -1,49 +1,18 @@
 import os
+import re
 import sys
+import time
 import traceback
 import logging
+import shutil
 from queue import Queue
-from threading import Thread
+from threading import Thread, Lock
 from typing import Tuple, Optional
-
+ 
+from helpers import get_env
 from test_results_reader import read_results
-from helpers import batch, get_env
-from azure_devops_result_publisher import AzureDevOpsTestResultPublisher
-
-class UploadWorker(Thread):
-    def __init__(self, queue, idx, collection_uri, team_project, test_run_id, access_token):
-        super(UploadWorker, self).__init__()
-        self.queue = queue
-        self.idx = idx
-        self.publisher = AzureDevOpsTestResultPublisher(
-            collection_uri=collection_uri,
-            access_token=access_token,
-            team_project=team_project,
-            test_run_id=test_run_id,
-        )
-        self.total_uploaded = 0
-  
-    def __print(self, msg):
-        sys.stdout.write('Worker {}: {}\n'.format(self.idx, msg))
-        sys.stdout.flush()
-
-    def __process(self, batch):
-        self.publisher.upload_batch(batch)
-        self.total_uploaded = self.total_uploaded + len(batch)
-        self.__print('uploaded {} results'.format(self.total_uploaded))
-
-    def run(self):
-        self.__print("starting...")
-        while True:
-            try:
-                item = self.queue.get()
-                self.__process(item)
-            except:
-                self.__print("got error: {}".format(traceback.format_exc()))
-            finally:
-                self.queue.task_done()
-
 
+from helix.public import DefaultTestReporter, AzureDevOpsReportingParameters, PackingTestReporter
 
 def process_args() -> Tuple[str, str, str, Optional[str]]:
     if len(sys.argv) < 4 or len(sys.argv) > 5:
@@ -76,35 +45,24 @@ def main():
 
     collection_uri, team_project, test_run_id, access_token = process_args()
 
-    worker_count = 10
-    q = Queue()
-
-    log.info("Main thread starting {0} workers".format(worker_count))
-
-    for i in range(worker_count):
-        worker = UploadWorker(q, i, collection_uri, team_project, test_run_id, access_token)
-        worker.daemon = True 
-        worker.start()
-
     log.info("Beginning reading of test results.")
 
     # In case the user puts the results in HELIX_WORKITEM_UPLOAD_ROOT for upload, check there too.
-    all_results = read_results([os.getcwd(),
-                                get_env("HELIX_WORKITEM_UPLOAD_ROOT")])
-
-    batch_size = 1000
-    batches = batch(all_results, batch_size)
-
-    log.info("Uploading results in batches of size {}".format(batch_size))
-
-    for b in batches:
-        q.put(b)
-
-    log.info("Main thread finished queueing batches")
-
-    q.join()
+    all_results = read_results([
+        os.getcwd(),
+        get_env("HELIX_WORKITEM_UPLOAD_ROOT"),
+    ])
+
+    reporter = DefaultTestReporter(
+        AzureDevOpsReportingParameters(
+            collection_uri,
+            team_project,
+            test_run_id,
+            access_token
+        )
+    )
 
-    log.info("Main thread exiting")
+    reporter.report_results(all_results)
 
 if __name__ == '__main__':
     main()
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/run.sh b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/run.sh
deleted file mode 100755
index 2f082175508..00000000000
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/run.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-set -x
-
-# relaunch as root
-[ `whoami` = root ] || exec sudo -E "$0" "$@"
-
-script_path=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
-
-ENV_PATH=$HOME/.azdo-env
-TMP_ENV_PATH=$HOME/.azdo-env-tmp
-date -u +"%FT%TZ"
-
-if [ ! -f $ENV_PATH/bin/python ]; then
-  rm -rf $ENV_PATH
-  rm -rf $TMP_ENV_PATH
-  $HELIX_PYTHONPATH -m virtualenv --no-site-packages $TMP_ENV_PATH
-  mv $TMP_ENV_PATH $ENV_PATH
-fi
-
-# Removing pythonpath forces a clean installation of the Azure DevOps client, but subsequent commands may use HELIX libraries
-_OLD_PYTHONPATH=$PYTHONPATH
-export PYTHONPATH=
-
-if $ENV_PATH/bin/python -c "import azure.devops"; then
-  echo "azure-devops module already available"
-else
-  $ENV_PATH/bin/python -m pip install azure-devops==5.0.0b9
-fi
-
-if $ENV_PATH/bin/python -c "import future"; then
-  echo "future module already available"
-else
-  $ENV_PATH/bin/python -m pip install future==0.17.1
-fi
-
-date -u +"%FT%TZ"
-$ENV_PATH/bin/python -B $script_path/run.py "$@"
-date -u +"%FT%TZ"
-
-export PYTHONPATH=$_OLD_PYTHONPATH
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/test_results_reader/__init__.py b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/test_results_reader/__init__.py
index 95e6c999561..c7ec50efcaf 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/test_results_reader/__init__.py
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/reporter/test_results_reader/__init__.py
@@ -1,10 +1,13 @@
+import logging
 import os
-from defs import TestResult, TestResultAttachment
+from helix.public import TestResult, TestResultAttachment
 from typing import Iterable, List
 from formats import all_formats
 from helpers import get_env
 
 
+log = logging.getLogger(__name__)
+
 def __no_results_result():
     exitCode = get_env("_commandExitCode")
     work_item_name = get_env("HELIX_WORKITEM_FRIENDLYNAME")
@@ -42,7 +45,7 @@ def construct_log_uri(name):
 
 
 def get_log_files(dir):
-    print("Searching '{}' for log files".format(dir))
+    log.info("Searching '{}' for log files".format(dir))
     for name in os.listdir(dir):
         path = os.path.join(dir, name)
         root, ext = os.path.splitext(path)
@@ -60,7 +63,7 @@ def line(name, url):
     lines = [line(name, url) for name, url in log_files]
 
     output = u"\n".join(lines)
-    print("Generated log list: {}".format(output))
+    log.info("Generated log list: {}".format(output))
     return output
 
 
@@ -84,18 +87,18 @@ def read_results(dirs_to_check: List[str]) -> Iterable[TestResult]:
     found = False
 
     for dir in dirs_to_check:
-        print("Searching '{}' for test results files".format(dir))
+        log.info("Searching '{}' for test results files".format(dir))
         for root, dirs, files in os.walk(dir):
             for file_name in files:
                 for f in all_formats:
                     if file_name.endswith(tuple(f.acceptable_file_suffixes)):
                         file_path = os.path.join(root, file_name)
-                        print('Found results file {} with format {}'.format(file_path, f.name))
+                        log.info('Found results file {} with format {}'.format(file_path, f.name))
                         found = True
                         file_results = (add_logs(tr, log_list) for tr in f.read_results(file_path))
                         for result in file_results:
                             yield result
 
     if not found:
-        print('No results file found in any of the following formats: {}'.format(', '.join((f.name for f in all_formats))))
+        log.warn('No results file found in any of the following formats: {}'.format(', '.join((f.name for f in all_formats))))
         yield add_logs(__no_results_result(), log_list)
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
index 0746d3586c4..3b59cef4ba3 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
@@ -1,10 +1,12 @@
 <Project>
   <PropertyGroup>
     <IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
+    <!-- TODO (https://github.com/dotnet/arcade/issues/7787): When bumping this, we should do #7787 -->
+    <AspNetCoreRuntimeVersion>6.0.0</AspNetCoreRuntimeVersion>
     <DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
     <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
     <!-- TODO (https://github.com/dotnet/arcade/issues/7022): We are hardcoding this version to use the one tied to the SDK version from global.json -->
-    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">6.0.0-preview.2.21154.6</DotNetCliVersion>
+    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
     <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'sdk' ">$(NETCoreSdkVersion)</DotNetCliVersion>
     <DotNetCliChannel Condition=" '$(DotNetCliChannel)' == '' ">Current</DotNetCliChannel>
     <DotNetCliDestination>dotnet-cli</DotNetCliDestination>
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets
index 54e87951858..50a93f39490 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets
@@ -16,6 +16,10 @@
       <HelixPreCommands Condition="!$(IsPosixShell)">$(HelixPreCommands);set PATH=%HELIX_CORRELATION_PAYLOAD%\$(DotNetCliDestination)%3B%PATH%</HelixPreCommands> <!-- %3B is an escaped ; -->
       <HelixPreCommands Condition="$(IsPosixShell)">$(HelixPreCommands);export DOTNET_ROOT=$HELIX_CORRELATION_PAYLOAD/$(DotNetCliDestination);export DOTNET_CLI_TELEMETRY_OPTOUT=1</HelixPreCommands>
       <HelixPreCommands Condition="!$(IsPosixShell)">$(HelixPreCommands);set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\$(DotNetCliDestination);set DOTNET_CLI_TELEMETRY_OPTOUT=1</HelixPreCommands>
+      <HelixPreCommands Condition="$(IsPosixShell)">$(HelixPreCommands);export DOTNET_CLI_HOME=$HELIX_WORKITEM_ROOT/.dotnet</HelixPreCommands>
+      <HelixPreCommands Condition="!$(IsPosixShell)">$(HelixPreCommands);set DOTNET_CLI_HOME=%HELIX_WORKITEM_ROOT%\.dotnet</HelixPreCommands>
+      <HelixPreCommands Condition="$(IsPosixShell)">$(HelixPreCommands);export NUGET_PACKAGES=$HELIX_WORKITEM_ROOT/.nuget</HelixPreCommands>
+      <HelixPreCommands Condition="!$(IsPosixShell)">$(HelixPreCommands);set NUGET_PACKAGES=%HELIX_WORKITEM_ROOT%\.nuget</HelixPreCommands>
     </PropertyGroup>
   </Target>
   
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.targets
index a3b6f158fa8..ac8ad014f04 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.targets
@@ -13,7 +13,7 @@
     </ItemGroup>
 
     <PropertyGroup>
-      <HelixResultsDestinationDir Condition="'$(HelixResultsDestinationDir)' == '' AND '$(BUILD_SOURCESDIRECTORY)' != ''">$([MSBuild]::NormalizeDirectory('$(BUILD_SOURCESDIRECTORY)', 'artifacts', helixresults'))</HelixResultsDestinationDir>
+      <HelixResultsDestinationDir Condition="'$(HelixResultsDestinationDir)' == '' AND '$(BUILD_SOURCESDIRECTORY)' != ''">$([MSBuild]::NormalizeDirectory($(BUILD_SOURCESDIRECTORY), 'artifacts', helixresults'))</HelixResultsDestinationDir>
 
       <_shouldDownloadResults>false</_shouldDownloadResults>
       <_shouldDownloadResults Condition="'@(_workItemsWithDownloadMetadata)' != '' AND '$(HelixResultsDestinationDir)' != ''">true</_shouldDownloadResults>
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/Readme.md b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/Readme.md
index cfea64e5f79..c1aa85fd8be 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/Readme.md
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/Readme.md
@@ -1,86 +1,89 @@
 # XHarness support in Microsoft.DotNet.Helix.Sdk
 
-> This document presumes you are familiar with the usage of Microsoft.DotNet.Helix.Sdk. If not, please [start here](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md).
+> Note: This document presumes you are familiar with the usage of Microsoft.DotNet.Helix.Sdk. If not, please [start here](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md).
 
-The Helix SDK supports execution of certain **Android/iOS/tvOS/WatchOS/WASM workloads** where you only need to point the SDK to:
+The Helix SDK has extended support for execution of **Android/iOS/tvOS/WASM workloads** where you only need to point the SDK to:
   - Android .apks,
-  - iOS/tvOS/WatchOS .app bundles,
+  - iOS/tvOS .app bundles,
   - WASM-ready test DLLs
 
-and it will execute these for you.
+and the SDK will create a Helix job with the specified payload and send it to Helix where it will be run using a tool called [XHarness](https://github.com/dotnet/xharness). A suitable test target will be found - an emulator, a real device or a specified JS engine for WASM scenarios - the app will be installed, run and logs extracted and uploaded with other job results.
 
-The SDK will create a Helix job with the specified payload and send it to Helix where, using a tool called [XHarness](https://github.com/dotnet/xharness), it will find a suitable test target - an emulator, a real device or a specified JS engine for WASM scenarios - which it will run the workload on.
+**Please note that we require all jobs targeting Android and Apple platforms to use Helix SDK as described below. The SDK makes sure the environment stays clean and the jobs run more reliably. Using the SDK will for instance re-run your work item on a different machine when we detect infrastructure issues such as problematic mobile device. Furthermore, it collects additional telemtry that helps us maintain these platforms in Helix.**
 
-For these workloads, we currently expect the payload to contain xUnit tests and an [XHarness TestRunner](https://github.com/dotnet/xharness#test-runners) which will run these tests once the application is started.
-Logs will be collected automatically and sent back with the other Helix results.
-The test results themselves can be published to Azure DevOps using the same python-based publishing scripts as regular Helix jobs.
+XHarness is a [.NET tool](https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools) and requires .NET 6 ASP.NET runtime to execute on the Helix agent.
+The SDK will automatically pre-install the needed runtime and the XHarness tool and you can then call XHarness directly.
 
-XHarness is a [.NET Core tool](https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools) and requires **.NET Core 3.1 runtime** to execute on the Helix agent.
-This is automatically included as a Helix Correlation Payload for the job when XHarness workload is detected.
+Furthermore, in case your application contains the [XHarness TestRunner](https://github.com/dotnet/xharness#test-runners), Helix SDK can handle everything for you - you just need to point it to the application.
+XHarness will be called automatically and test results will be published to Azure DevOps.
+
+## Table of contents
+
+- [How to use](#how-to-use)
+  - [iOS/tvOS .app bundle payloads](#iostvos-app-bundle-payloads)
+    - [Targeting real iOS/tvOS devices](#targeting-real-iostvos-devices)
+  - [Android .apk payloads](#android-apk-payloads)
+  - [WASM payloads](#wasm-payloads)
+  - [Calling the XHarness tool directly via custom commands](#calling-the-xharness-tool-directly-via-custom-commands)
+    - [Variables defined for Apple scenarios](#variables-defined-for-apple-scenarios)
+    - [Variables defined for Android scenarios](#variables-defined-for-android-scenarios)
+  - [Reusing app bundles / apks](#reusing-app-bundles--apks)
+  - [Supplying arbitrary .zip archive](#supplying-arbitrary-zip-archive)
+  - [Detecting infrastructural issues](#detecting-infrastructural-issues)
 
 ## How to use
 
-There are three main ways how to use XHarness through the Helix SDK:
-- Specify the apks/app bundles using the `XHarnessApkToTest` and `XHarnessAppBundleToTest` items as described below and everything will be taken care of from there. You no longer specify the `HelixCommand` to be executed. Each apk/app bundle will be processed as a separate Helix work item.
-- Specify the `XHarnessAndroidProject` or `XHarnessAppleProject` task items which will point to projects that produce apks/app bundles from their `Build` target.
+There are few ways how to run XHarness using the Helix SDK:
+- Specifying the apks/app bundles using the `XHarnessApkToTest` and `XHarnessAppBundleToTest` items as described below; rest (running the app and collecting results) will be taken care of from there.
+  You no longer specify the `HelixCommand` to be executed even though you can specify your own custom commands to be executed.
+  Each apk/app bundle will be processed as a separate Helix work item.
+- Specifying the `XHarnessAndroidProject` or `XHarnessAppleProject` task items which will point to projects that produce apks/app bundles from their `Build` target.
   - Examples - [iOS](https://github.com/dotnet/arcade/blob/master/tests/XHarness/XHarness.TestAppBundle.proj) and [Android](https://github.com/dotnet/arcade/blob/master/tests/XHarness/XHarness.TestApk.proj)
-- Only request the XHarness dotnet tool to be pre-installed for the Helix job for you and then call the XHarness tool yourself as shown below.
+- Specifying the apks/app bundles using the `XHarnessApkToTest` and `XHarnessAppBundleToTest` and providing custom commands to be executed via the `CustomCommands` property [(see below)](#calling-the-xharness-tool-directly-via-custom-commands).
+- Specifying the `XHarnessAndroidProject` or `XHarnessAppleProject` task items by pointing them to a zip archive [(see details below)](#supplying-arbitrary-zip-archive) including any number of apps (or no apps at all if these are for example built as part of the job) and providing custom commands to be executed via the `CustomCommands` property [(see below)](#calling-the-xharness-tool-directly-via-custom-commands).
 
-There are some required configuration properties that need to be set for XHarness to work and some optional to customize the run further:
+There are some required configuration properties that need to be set for the SDK to enable XHarness. You can also provide some optional properties to customize the run further:
 
 ```xml
 <PropertyGroup>
-  <!-- Required: Version of XHarness CLI to use -->
+  <!-- Required: Makes sure XHarness is pre-installed on the Helix agent before the job starts - this effectively marks the job as one using XHarness -->
   <IncludeXHarnessCli>true</IncludeXHarnessCli>
 
   <!-- Required: Version of XHarness CLI to use. Check the NuGet feed for current version: https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=Microsoft.DotNet.XHarness.CLI&protocolType=NuGet -->
-  <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.20322.1</MicrosoftDotNetXHarnessCLIVersion>
+  <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21511.3</MicrosoftDotNetXHarnessCLIVersion>
 
-  <!-- Optional: Properties that are also valid for the Arcade Helix SDK (some might be needed for CI runs only) -->
+  <!-- Optional: Properties that are also valid for regular jobs created by Helix SDK (some might be needed for CI runs only) -->
   <HelixType>test/product/</HelixType>
   <HelixBaseUri>https://helix.int-dot.net</HelixBaseUri>
   <Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator>
-  <EnableXUnitReporter>true</EnableXUnitReporter>
   <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
 </PropertyGroup>
 
-<!-- Required: Configuration that is already needed for the Helix SDK -->
-<ItemGroup Condition=" '$(HelixAccessToken)' == '' ">
-  <HelixTargetQueue Include="osx.1015.amd64.open"/>
-</ItemGroup>
-```
-
-### Calling the XHarness tool directly
-
-In case you decide to request the SDK to pre-install the XHarness tool only without any specific payload, you just don't specify `XHarnessApkToTest` or `XHarnessAppBundleToTest` items and you specify the Helix command directly.
-There will be an environmental variable called `XHARNESS_CLI_PATH` set that will point to the XHarness CLI DLL that needs to be run using `dotnet exec` like so:
-
-```xml
+<!-- Required: Configuration that is already needed for any job created by Helix SDK -->
 <ItemGroup>
-  <HelixWorkItem Include="Run WASM tests">
-    <Command Condition="$(IsPosixShell)">dotnet exec $XHARNESS_CLI_PATH wasm test --engine ...</Command>
-    <Command Condition="!$(IsPosixShell)">dotnet exec %XHARNESS_CLI_PATH% wasm test --engine ...</Command>
-  </HelixWorkItem>
+  <HelixTargetQueue Include="osx.1015.amd64.open"/>
 </ItemGroup>
 ```
 
-### iOS/tvOS/WatchOS .app bundle payloads
+### iOS/tvOS .app bundle payloads
 
 To execute .app bundles, declare one or more `XHarnessAppBundleToTest` items:
 
 ```xml
 <ItemGroup>
-  <!-- Find all directories named *.app -->
+  <!-- Example that finds all directories named *.app -->
   <XHarnessAppBundleToTest Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))">
-    <Targets>ios-simulator-64_13.5</Targets>
+    <!-- Specify target platform () -->
+    <TestTarget>ios-simulator-64_13.5</TestTarget>
   </XHarnessAppBundleToTest>
 </ItemGroup>
 ```
 
-The `<Targets>` metadata is a required configuration that tells XHarness which kind of device/Simulator to target.
-Use the XHarness CLI help command to find more (see the `--targets` option).
+The `<TestTarget>` metadata is a required configuration that tells XHarness which kind of device/Simulator to target.
+You can omit the iOS version too by specifying ios-simulator-64 only.
+For more information, use the `help apple test` command of the XHarness CLI, see the `--target` option.
 
-You can also specify some metadata that will help you configure the run better:
+You can also specify some additional metadata that will help you configure the run better:
 
 ```xml
 <ItemGroup>
@@ -94,14 +97,18 @@ You can also specify some metadata that will help you configure the run better:
 
     <!-- Optional: Timeout for how long it takes to install and boot the app and start running the first test -->
     <LaunchTimeout>00:10:00</LaunchTimeout>
+    
+    <!-- Optional: Apps that don't contain the TestRunner can be run using the `apple run` command instead of `apple test` -->
+    <!-- Default is true -->
+    <IncludesTestRunner>false</IncludesTestRunner>
 
     <!-- Optional (`apple run` command only): Expected exit code of the iOS/tvOS application. XHarness exits with 0 when the app exits with this code -->
     <!-- Please note that exit code detection may not be reliable across iOS/tvOS versions -->
     <ExpectedExitCode>3</ExpectedExitCode>
-    
-    <!-- Optional: For apps that don't contain unit tests, they can be run using the `apple run` command instead of `apple test` -->
-    <!-- Default is true -->
-    <IncludesTestRunner>false</IncludesTestRunner>
+
+    <!-- Optional: Before and after the run, erases all simulator data and resets it for a clean state -->
+    <!-- Default is false -->
+    <ResetSimulator>true</ResetSimulator>
   </XHarnessAppBundleToTest>
 </ItemGroup>
 ```
@@ -118,12 +125,13 @@ You can configure the execution further via MSBuild properties:
 #### Targeting real iOS/tvOS devices
 
 To deploy an app bundle to a real device, the app bundle needs to be signed before the deployment.
-The Helix machines, that have devices attached to them, already contain the signing certificates and a provisioning profile will be downloaded as part of the job.
+The Helix machines, that have devices attached to them, already contain the signing certificates and a provisioning profile will be downloaded as part of the job prepartion.
 
 When using the Helix SDK and targeting real devices:
 - You have to ideally supply a non-signed app bundle - the app will be signed for you on the Helix machine where your job gets executed
 - Only the basic set of app permissions are supported at the moment and we cannot re-sign an app that was already signed with a different set of permissions
-- Bundle id has to start with `net.dot.` since we only support those application IDs at the moment
+- App bundle identifier has to start with `net.dot.` since we only support those application IDs at the moment (restrictions by Apple)
+- In case you don't supply the app bundle but for example build the app on the Helix agent as part of the job, use the `sign [path to app]` bash function to perform the signing. In this case, make sure the provisioning profile is part of the app bundle present at `[app]/embedded.mobileprovision`.
 
 ### Android .apk payloads
 
@@ -141,7 +149,7 @@ To execute .apks, declare one or more `XHarnessApkToTest` items:
 </ItemGroup>
 ```
 
-You can also specify some metadata that will help you configure the run better:
+You can also specify some additional metadata that will help you configure the run better:
 
 ```xml
 <ItemGroup>
@@ -161,4 +169,142 @@ You can also specify some metadata that will help you configure the run better:
 
 ### WASM payloads
 
-We currently do not support execution of WASM workloads directly, please call the `xharness wasm test` command manually.
+We currently do not support execution of WASM workloads directly, please call the `xharness wasm *` commands manually via `CustomCommands`.
+
+### Calling the XHarness tool directly via custom commands
+
+In case you want to run your own custom set of commands, you can specify the `CustomCommands` property.
+However, be mindful that you need to perform a clean up (read "uninstall the apps").
+The SDK will try to clean up the device/simulator state at the end of the job too but it is better to be handled by user's payload too.
+
+Example:
+
+```xml
+<ItemGroup>
+  <XHarnessAppBundleToTest Include="path\to\Some.iOS.app">
+    <TestTarget>ios-simulator-64</TestTarget>
+    <WorkItemTimeout>00:12:00</WorkItemTimeout>
+    <CustomCommands>
+      <![CDATA[
+      set -e
+      deviceId=`xharness apple device $target`
+      xharness apple install -t $target --device "$deviceId" -o "$output_directory" --app=$app
+      set +e
+      result=0
+      xharness apple just-test -t $target --device "$deviceId" -o "$output_directory" --app net.dot.Some.iOS --timeout 00:08:00
+      ((result|=$?))
+      xharness apple uninstall -t $target --device "$deviceId" -o "$output_directory" --app net.dot.Some.iOS
+      ((result|=$?))
+      exit $result
+      ]]>
+    </CustomCommands>
+  </XHarnessAppBundleToTest>
+</ItemGroup>
+```
+
+Please note that Android can run on both Windows and Linux based on the target queue.
+For that reason, make sure the `<CustomCommands>` script you supply is either **bash** for Linux queues or **PowerShell** for Windows.
+
+When using `CustomCommands`, several variables will be defined for you for easier run.
+
+#### Variables defined for Apple scenarios
+- `$app` - path to the application
+- `$output_directory` - path under which all files will be uploaded to Helix at the end of the job
+  - If a file named `testResults.xml` is found containing xUnit results, it will be uploaded back to Azure DevOps
+- `$target`, `$timeout`, `$launch_timeout`, `$expected_exit_code`, `$includes_test_runner` - parsed metadata defined on the original `XHarnessAppBundleToTest` MSBuild item
+
+#### Variables defined for Android scenarios
+- `$app` - path to the application
+- `$package_name` - name of the Android package
+- `$output_directory` - path under which all files will be uploaded to Helix at the end of the job
+  - If a file named `testResults.xml` is found containing xUnit results, it will be uploaded back to Azure DevOps
+- `$timeout`, `$expected_exit_code`, `$device_output_path`, `$instrumentation` - parsed metadata defined on the original `XHarnessApkToTest` MSBuild item
+
+### Reusing app bundles / apks
+
+In some scenarios, you might need to re-use one application for multiple work items, i.e. to supply each with a different custom command to run the application with different parameters or to run the application on different test targets (e.g. different versions of iOS).
+
+You can then name the item however you like and supply the path to the app as metadata:
+
+```xml
+<XHarnessApkToTest Include="System.Text.Json"> <!-- Include can be any string -->
+  <ApkPath>path/to/System.Text.Json.Tests.apk</ApkPath> <!-- Set the path in here -->
+  <AndroidPackageName>net.dot.System.Buffers.Tests</AndroidPackageName>
+  <AndroidInstrumentationName>net.dot.MonoRunner</AndroidInstrumentationName>
+</XHarnessApkToTest>
+
+<XHarnessApkToTest Include="System.Text.Json-with-custom-commands"> <!-- Include should differ for different work items -->
+  <ApkPath>path/to/System.Text.Json.Tests.apk</ApkPath> <!-- The path stays the same -->
+  <AndroidPackageName>net.dot.System.Buffers.Tests</AndroidPackageName>
+  <AndroidInstrumentationName>net.dot.MonoRunner</AndroidInstrumentationName>
+  <CustomCommands>
+    <![CDATA[
+    xharness android test --app "$app" --package-name "net.dot.System.Buffers.Tests" --output-directory "$output_directory" --instrumentation=net.dot.MonoRunner
+    ]]>
+  </CustomCommands>
+</XHarnessApkToTest>
+```
+
+For Apple it is the same, just the metadata property name is `<AppBundlePath>`.
+
+### Supplying arbitrary .zip archive
+
+In some scenarios, you might not have the app/apk available because you will build it in Helix. Alternatively, you might need to send multiple apps and run XHarness commands over them.
+In these cases, you can point the SDK to a .zip archive with your payloads.
+The SDK will add some scripts needed for clean execution inside of this .zip archive and send it to Helix.
+The .zip archive will be extracted for you in the working directory.
+
+**Note that in case you supply a .zip you also need to supply the `CustomCommands` property since the SDK won't know the specifics of the .zip contents.**
+
+Example:
+
+```xml
+<ItemGroup>
+  <XHarnessAppBundleToTest Include="path\to\an-archive.zip">
+    <TestTarget>ios-device_14.4</TestTarget>
+    <WorkItemTimeout>00:12:00</WorkItemTimeout>
+    <CustomCommands>
+      <![CDATA[
+      # Sign applications since we are targeting real devices in this example
+      sign first.app
+      sign second.app
+      result=0
+      xharness apple test --target $target --output-directory "$output_directory" -app first.app
+      ((result|=$?))
+      xharness apple test --target $target --output-directory "$output_directory" -app second.app
+      ((result|=$?))
+      exit $result
+      ]]>
+    </CustomCommands>
+  </XHarnessAppBundleToTest>
+</ItemGroup>
+```
+
+### Detecting infrastructural issues
+
+The mobile platforms can sometimes be unreliable and the devices and emulators can get into bad states which can fail the job.
+Examples can be:
+- Device rebooted and has not started properly
+- Device is locked
+- Device memory is full and app cannot be installed
+- Android emulator is not started
+- Apple Simulator is freezing up (caused by Apple's CPU/RAM leaks)
+
+The SDK can detect most of these problems and will try to run your work on a different Helix agent with a different device.
+This usually resolves the issue transparently for the end user.
+
+However, when supplying own commands via the [`CustomCommand` property](#calling-the-xharness-tool-directly-via-custom-commands), the SDK doesn't have visibility into the job and in those cases, it is up to the user to handle some of the issues.
+Usually the issues can be recognized from the [exit code returned by XHarness](https://github.com/dotnet/xharness/blob/main/src/Microsoft.DotNet.XHarness.Common/CLI/ExitCode.cs), e.g.:
+- 78 - `PACKAGE_INSTALLATION_FAILURE`
+- 81 - `DEVICE_NOT_FOUND`
+- 85 - `ADB_DEVICE_ENUMERATION_FAILURE`
+- 86 - `PACKAGE_INSTALLATION_TIMEOUT`
+
+In these cases, you can ask for the work item to be processed again (usually by a different Helix agent, but not 100% granted).
+You have two options how to achieve this:
+
+- Calling a bash/PowerShell function named `report_infrastructure_failure` which is available in your main script.
+  - The function accepts a string parameter - a reason message that will be reported to Helix, e.g. "Failed to install app X.Y (XHarness returned 86)".
+- Creating a file in the working directory called `.retry` with the reason message set as its content.
+  - You can also create a `.reboot` file which will reboot the machine after the job is over. This is also recommended as it might resolve some of the issues. It will also increase the chance some other Helix agent will pick up the re-tried job.
+
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props
index 1beaf8122f0..10b6f9624b3 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props
@@ -6,6 +6,7 @@
     <_HelixMonoQueueTargets>$(_HelixMonoQueueTargets);$(MSBuildThisFileDirectory)XHarnessRunner.targets</_HelixMonoQueueTargets>
 
     <XHarnessPackageSource Condition=" '$(XHarnessPackageSource)' == '' ">https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet-eng/nuget/v3/index.json</XHarnessPackageSource>
+    <EnableXHarnessTelemetry>true</EnableXHarnessTelemetry>
 
     <!-- Needed for app signing and tied to certificates installed in Helix machines -->
     <XHarnessAppleProvisioningProfileUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/macos/signing/NET_Apple_Development_{PLATFORM}.mobileprovision</XHarnessAppleProvisioningProfileUrl>
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
index 0e31001124d..05eb88368d1 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
@@ -1,12 +1,12 @@
 <Project>
-
   <PropertyGroup Condition=" '$(IncludeXHarnessCli)' == 'true' ">
     <!-- We then invoke the CLI DLL directly using .NET runtime without the need for .NET SDK -->
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <IncludeXHarnessCli>true</IncludeXHarnessCli>
-    <DotNetCliPackageType Condition="'$(DotNetCliPackageType)' != 'sdk'">aspnetcore-runtime</DotNetCliPackageType>
-    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' ">6.0.100-preview.2.21155.3</DotNetCliVersion>
-    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '$(BundledNETCoreAppPackageVersion)' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">6.0.0-preview.2.21154.6</DotNetCliVersion>
+    <XHarnessTargetFramework Condition=" '$(XHarnessTargetFramework)' == '' ">net6.0</XHarnessTargetFramework>
+    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' ">6.0.100</DotNetCliVersion>
+    <DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' != 'sdk' ">aspnetcore-runtime</DotNetCliPackageType>
+    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '$(NETCoreSdkVersion)' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
   </PropertyGroup>
 
   <Target Name="AddXHarnessCli"
@@ -20,20 +20,30 @@
     <Message Condition=" '$(XHarnessNupkgPath)' != '' " Text="XHarnessNupkgPath is set so XHarnessPackageSource will be ignored" Importance="normal" />
 
     <PropertyGroup Condition=" '$(XHarnessNupkgPath)' != '' ">
-      <XHarnessPackageSource>$([System.IO.Path]::GetDirectoryName($(XHarnessNupkgPath))) --no-cache</XHarnessPackageSource>
+      <XHarnessPackageSource>$([System.IO.Path]::GetDirectoryName($(XHarnessNupkgPath)))</XHarnessPackageSource>
+      <XHarnessNoCache>true</XHarnessNoCache>
     </PropertyGroup>
 
-    <!-- We install the tool locally on the build machine, then, installed as-is, we zip it up and send as a correlation payload -->
+    <!--
+      We install the tool locally on the build machine, then, installed as-is, we zip it up and send as a correlation payload
+      We do this so that we avoid all of the machines installing the tool too and ddosing the NuGet feed
+    -->
+    <InstallDotNetTool Name="$(_XHarnessPackageName)"
+                       DestinationPath="$(ArtifactsTmpDir)"
+                       Version="$(_XHarnessPackageVersion)"
+                       Source="$(XHarnessPackageSource)"
+                       TargetFramework="$(XHarnessTargetFramework)"
+                       WorkingDirectory="$(ArtifactsTmpDir)"
+                       DotnetPath="$(DotNetTool)"
+                       NoCache="$(XHarnessNoCache)">
+      <Output TaskParameter="ToolPath" PropertyName="_XHarnessCliPath" />
+    </InstallDotNetTool>
+
+    <!-- We grab the unpacked .NET command line application from the .NET tool store where it is installed -->
     <PropertyGroup>
-      <_XHarnessLocalToolPath>$(ArtifactsTmpDir)Microsoft.DotNet.XHarness.CLI</_XHarnessLocalToolPath>
-      <_XHarnessCliPath>$(_XHarnessLocalToolPath)\.store\microsoft.dotnet.xharness.cli\$(_XHarnessPackageVersion)\microsoft.dotnet.xharness.cli\$(_XHarnessPackageVersion)</_XHarnessCliPath>
+      <_XHarnessCliPath>$(_XHarnessCliPath)\.store\microsoft.dotnet.xharness.cli\$(_XHarnessPackageVersion)\microsoft.dotnet.xharness.cli\$(_XHarnessPackageVersion)</_XHarnessCliPath>
     </PropertyGroup>
 
-    <!-- It can happen that the SDK is invoked in parallel and then it can fail when re-using the install location, so we ignore the exit code -->
-    <Exec Command="&quot;$(DotNetTool)&quot; tool install --framework net6.0 --tool-path $(_XHarnessLocalToolPath) --version $(_XHarnessPackageVersion) --add-source $(XHarnessPackageSource) $(_XHarnessPackageName)"
-          WorkingDirectory="$(ArtifactsTmpDir)"
-          IgnoreExitCode="true" />
-
     <!-- There are files we don't need extracted inside of the extracted tool dir (such as the original .nupkg) that blow up the size 3x, so we remove them -->
     <ItemGroup>
       <_XHarnessExtraToolFiles Include="$(_XHarnessCliPath)\*.*" />
@@ -55,6 +65,9 @@
       <HelixPreCommands>$(HelixPreCommands);export XHARNESS_DISABLE_COLORED_OUTPUT=true</HelixPreCommands>
       <HelixPreCommands>$(HelixPreCommands);export XHARNESS_LOG_WITH_TIMESTAMPS=true</HelixPreCommands>
       <HelixPreCommands>$(HelixPreCommands);export XHARNESS_CLI_PATH=$HELIX_CORRELATION_PAYLOAD/microsoft.dotnet.xharness.cli/$(_XHarnessPackageVersion)/tools/net6.0/any/Microsoft.DotNet.XHarness.CLI.dll</HelixPreCommands>
+
+      <HelixPreCommands Condition=" '$(EnableXHarnessTelemetry)' == 'true' ">$(HelixPreCommands);export XHARNESS_DIAGNOSTICS_PATH=$HELIX_WORKITEM_ROOT/diagnostics.json</HelixPreCommands>
+      <HelixPostCommands Condition=" '$(EnableXHarnessTelemetry)' == 'true' ">"$HELIX_PYTHONPATH" -u "$HELIX_WORKITEM_PAYLOAD/xharness-event-processor.py";$(HelixPostCommands)</HelixPostCommands>
     </PropertyGroup>
 
     <PropertyGroup Condition="!$(IsPosixShell)">
@@ -62,6 +75,10 @@
       <HelixPreCommands>$(HelixPreCommands);set XHARNESS_DISABLE_COLORED_OUTPUT=true</HelixPreCommands>
       <HelixPreCommands>$(HelixPreCommands);set XHARNESS_LOG_WITH_TIMESTAMPS=true</HelixPreCommands>
       <HelixPreCommands>$(HelixPreCommands);set XHARNESS_CLI_PATH=%HELIX_CORRELATION_PAYLOAD%\microsoft.dotnet.xharness.cli\$(_XHarnessPackageVersion)\tools\net6.0\any\Microsoft.DotNet.XHarness.CLI.dll</HelixPreCommands>
+      <HelixPreCommands>$(HelixPreCommands);doskey xharness="dotnet exec %XHARNESS_CLI_PATH%"</HelixPreCommands>
+
+      <HelixPreCommands Condition=" '$(EnableXHarnessTelemetry)' == 'true' ">$(HelixPreCommands);set XHARNESS_DIAGNOSTICS_PATH=%HELIX_WORKITEM_ROOT%\diagnostics.json</HelixPreCommands>
+      <HelixPostCommands Condition=" '$(EnableXHarnessTelemetry)' == 'true' ">"%HELIX_PYTHONPATH%" -u "%HELIX_WORKITEM_PAYLOAD%\xharness-event-processor.py";$(HelixPostCommands)</HelixPostCommands>
     </PropertyGroup>
   </Target>
 
@@ -94,8 +111,7 @@
   <Target Name="CreateAndroidWorkItems"
           Condition=" '@(XHarnessApkToTest)' != '' "
           BeforeTargets="CoreTest">
-    <CreateXHarnessAndroidWorkItems Apks="@(XHarnessApkToTest)"
-                                    IsPosixShell="$(IsPosixShell)">
+    <CreateXHarnessAndroidWorkItems Apks="@(XHarnessApkToTest)" IsPosixShell="$(IsPosixShell)">
       <Output TaskParameter="WorkItems" ItemName="HelixWorkItem"/>
     </CreateXHarnessAndroidWorkItems>
   </Target>
@@ -104,7 +120,6 @@
           Condition=" '@(XHarnessAppBundleToTest)' != '' "
           BeforeTargets="CoreTest">
     <CreateXHarnessAppleWorkItems AppBundles="@(XHarnessAppBundleToTest)"
-                                  IsPosixShell="$(IsPosixShell)"
                                   XcodeVersion="$(XHarnessXcodeVersion)"
                                   ProvisioningProfileUrl="$(XHarnessAppleProvisioningProfileUrl)"
                                   TmpDir="$(ArtifactsTmpDir)">
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-event-processor.py b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-event-processor.py
new file mode 100644
index 00000000000..75fb856e1e9
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-event-processor.py
@@ -0,0 +1,326 @@
+import getopt
+import json
+import os
+import subprocess
+import sys
+from typing import Tuple
+
+from helix.appinsights import app_insights
+from helix.public import request_reboot, request_infra_retry, send_metric, send_metrics
+
+### This script's purpose is to parse the diagnostics.json file produced by XHarness, evaluate it and send it to AppInsights
+### The diagnostics.json file contains information about each XHarness command executed during the job
+### In case of events that suggest infrastructure issues, we request a retry and for some reboot the agent
+
+# Name of metrics we send to App Insights
+# TODO (https://github.com/dotnet/core-eng/issues/15274): Stop sending app insights telemetry
+OPERATION_METRIC_NAME = 'XHarnessOperation'
+DURATION_METRIC_NAME = 'XHarnessOperationDuration'
+RETRY_METRIC_NAME = 'XHarnessRetry'
+REBOOT_METRIC_NAME = 'XHarnessReboot'
+NETWORK_CONNECTIVITY_METRIC_NAME = 'XHarnessDeviceNetworkFailure'
+
+# Name of metrics we send to Kusto
+KUSTO_EVENT_TYPE = 'MobileDeviceOperation'
+KUSTO_OPERATION_METRIC_NAME = 'ExitCode'
+KUSTO_DURATION_METRIC_NAME = 'Duration'
+KUSTO_RETRY_METRIC_NAME = 'Retry'
+KUSTO_REBOOT_METRIC_NAME = 'Reboot'
+KUSTO_NETWORK_CONNECTIVITY_METRIC_NAME = 'NoInternet'
+
+opts, args = getopt.gnu_getopt(sys.argv[1:], 'd:', ['diagnostics-data='])
+opt_dict = dict(opts)
+
+diagnostics_file = None
+
+if '--data' in opt_dict:
+    diagnostics_file = opt_dict['--data']
+elif '-d' in opt_dict:
+    diagnostics_file = opt_dict['-d']
+else:
+    diagnostics_file = os.getenv('XHARNESS_DIAGNOSTICS_PATH')
+
+if not diagnostics_file:
+    print('ERROR: Expected path to the diagnostics JSON file generated by XHarness')
+    exit(1)
+
+if not os.path.isfile(diagnostics_file):
+    print(f"WARNING: Diagnostics file not found at `{diagnostics_file}`")
+    exit(2)
+
+output_directory = os.getenv('HELIX_WORKITEM_UPLOAD_ROOT')
+
+# For the first operation that causes a retry/reboot, we send a metric to Helix
+# Retry/reboot can be also asked for by the client (by creating .retry/.reboot files)
+retry = False
+reboot = False
+retry_dimensions = None
+reboot_dimensions = None
+retry_exit_code = -1
+reboot_exit_code = -1
+android_connectivity_verified = False
+
+class AdditionalTelemetryRequired(Exception):
+    """Exception raised when we need to send additional telemetry during analysis
+
+    Attributes:
+        metric_name -- name of the event
+        metric_value -- value of the metric event
+    """
+
+    def __init__(self, metric_name, metric_value):
+        self.metric_name = metric_name
+        self.metric_value = metric_value
+        super().__init__("Additional telemetry required")
+
+def call_xharness(args: list, capture_output: bool = False) -> Tuple[int, str]:
+    """ Calls the XHarness CLI with given arguments
+    """
+
+    xharness_cli_path = os.getenv('XHARNESS_CLI_PATH')
+    args = ['dotnet', 'exec', xharness_cli_path] + args
+
+    if capture_output:
+        process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+        stdout = process.communicate()[0]
+        return process.returncode, stdout
+    else:
+        return subprocess.run(args, stdout=None, stderr=None, text=True).returncode, None
+
+def call_adb(args: list, capture_output: bool = False):
+    """ Calls the XHarness CLI with `android adb` command and given arguments
+    """
+
+    return call_xharness(['android', 'adb', '--'] + args, capture_output)
+
+def remove_android_apps(device: str = None):
+    """ Removes all Android applications from the target device/emulator
+    """
+
+    print('    Removing installed apps after unsuccessful run' + (' from ' + device if device else ""))
+
+    # Get list of installed apps
+    args = ['shell', 'pm', 'list', 'packages', 'net.dot']
+    if device:
+        args = ['-s', device] + args
+
+    exit_code, output = call_adb(args, capture_output=True)
+    if exit_code != 0:
+        print(f'    Failed to get list of installed apps: {output}')
+        return
+
+    installed_apps = output.splitlines()
+    installed_apps = [app.split(':')[1] for app in installed_apps if app and app.startswith('package:')]
+
+    # Remove all installed apps
+    for app in installed_apps:
+        print(f'        Removing {app}')
+
+        args = ['uninstall', app]
+        if device:
+            args = ['-s', device] + args
+
+        exit_code, _ = call_adb(args)
+
+        if exit_code != 0:
+            print(f'            Failed to remove app {app}')
+
+def analyze_operation(command: str, platform: str, device: str, is_device: bool, target: str, exit_code: int):
+    """ Analyzes the result and requests retry/reboot in case of an infra failure
+        Too see where the exit code values come from, see https://github.com/dotnet/xharness/blob/master/src/Microsoft.DotNet.XHarness.Common/CLI/ExitCode.cs
+    """
+
+    print(f'Analyzing {platform}/{command}@{target} ({exit_code})')
+
+    global retry, reboot, android_connectivity_verified
+
+    retry_message = 'This is typically not a failure of the work item. It will be run again.'
+    reboot_message = 'This machine will reboot to heal.'
+
+    if platform == "android":
+        if exit_code == 85: # ADB_DEVICE_ENUMERATION_FAILURE
+            # This handles issues where devices or emulators fail to start.
+            # The only solution is to reboot the machine, so we request a work item retry + agent reboot when this happens
+            print(f'    Encountered ADB_DEVICE_ENUMERATION_FAILURE. {retry_message} {reboot_message}')
+            print('    If this occurs repeatedly, please check for architectural mismatch, e.g. sending arm64_v8a APKs to an x86_64 / x86 only queue.')
+
+            if not is_device and os.name != 'nt':
+                # Copy emulator log
+                subprocess.call(['cp', '/tmp/*-logcat.log', output_directory])
+
+            reboot = True
+            retry = True
+            return
+
+        if exit_code == 78: # PACKAGE_INSTALLATION_FAILURE
+            # This handles issues where APKs fail to install.
+            # We already reboot a device inside XHarness and now request a work item retry when this happens
+            print(f'    Encountered PACKAGE_INSTALLATION_FAILURE. {retry_message}')
+            print('    If this occurs repeatedly, please check for architectural mismatch, e.g. requesting installation on arm64_v8a-only queue for x86 or x86_64 APKs.')
+            retry = True
+
+            if is_device:
+                try:
+                    remove_android_apps(device)
+                except Exception as e:
+                    print(f'    Failed to remove installed apps from device: {e}')
+
+            return
+
+        if exit_code != 0 and is_device and not android_connectivity_verified:
+            # Any issue can also be caused by network connectivity problems (devices sometimes lose the WiFi connection)
+            # In those cases, we want a retry and we want to report this
+            print('    Encountered non-zero exit code. Checking network connectivity...')
+            android_connectivity_verified = True
+
+            exitcode, _ = call_adb(['shell', 'ping', '-i', '0.2', '-c', '3', 'www.microsoft.com'])
+
+            if exitcode != 0:
+                retry = True
+                print(f'    Detected network connectivity issue. {retry_message}')
+                raise AdditionalTelemetryRequired(KUSTO_NETWORK_CONNECTIVITY_METRIC_NAME, 1)
+
+    elif platform == "apple":
+        retry_message = 'This is typically not a failure of the work item. It will be run again. '
+        reboot_message = 'This machine will reboot to heal.'
+        
+        if exit_code == 82: # RETURN_CODE_NOT_SET
+            # See https://github.com/dotnet/xharness/issues/812
+            print(f'    Failed to detect app\'s exit code. {retry_message}')
+            retry = True
+            return
+
+        if is_device:
+            # If we fail to find a real device, it is unexpected as device queues should have one
+            # It can often be fixed with a reboot
+            if exit_code == 81: # DEVICE_NOT_FOUND
+                print(f'    Requested tethered Apple device not found. {retry_message} {reboot_message}')
+                reboot = True
+                retry = True
+
+            # Devices can be locked or in a corrupted state, in this case we only retry the work item
+            if exit_code == 89: # DEVICE_FAILURE
+                print(f'    Failed to launch the simulator. {retry_message}')
+                retry = True
+        else:
+            # Kill the simulator when we fail to launch the app
+            if exit_code == 80: # APP_CRASH
+                simulator_app = os.getenv('SIMULATOR_APP')
+                subprocess.call(['sudo', 'pkill', '-9', '-f', simulator_app])
+
+            # If we have a launch failure on simulators, we want a reboot+retry
+            if exit_code == 83: # APP_LAUNCH_FAILURE
+                print(f'    Encountered APP_LAUNCH_FAILURE. {retry_message} {reboot_message}')
+                reboot = True
+                retry = True
+
+            # If we fail to find a simulator and we are not targeting a specific version (e.g. `ios-simulator_13.5`),
+            # it is probably an issue because Xcode should always have at least one runtime version inside
+            if exit_code == 81 and '_' not in target: # DEVICE_NOT_FOUND
+                print(f'    No simulator runtime found. {retry_message}')
+                retry = True
+
+            # Simulators are known to slow down which results in installation taking several minutes
+            # Retry+reboot usually resolves this
+            if exit_code == 86: # APP_INSTALLATION_TIMEOUT
+                print(f'    Installation timed out. {retry_message} {reboot_message}')
+                reboot = True
+                retry = True
+
+            # Simulators are known to slow/break down and a reboot usually helps
+            # This manifest by us not being able to launch the simulator
+            if exit_code == 88: # SIMULATOR_FAILURE
+                print(f'    Failed to launch the simulator. {retry_message} {reboot_message}')
+                reboot = True
+                retry = True
+
+            # Simulators are known to slow/break down and a reboot usually helps
+            # This manifest by us not being able to launch the simulator/start the test run in time
+            if exit_code == 90: # APP_LAUNCH_TIMEOUT
+                print(f'    Failed to start the test execution in time. {retry_message} {reboot_message}')
+                reboot = True
+                retry = True
+
+# The JSON should be an array of objects (one per each executed XHarness command)
+operations = json.load(open(diagnostics_file))
+
+print(f"Reporting {len(operations)} events from diagnostics file `{diagnostics_file}`")
+
+# Parse operations, analyze them and send them to Application Insights
+for operation in operations:
+    command = operation['command']
+    platform = operation['platform']
+    exit_code = operation['exitCode']
+    duration = operation['duration']
+    device = operation.get('device')
+    target = operation.get('target')
+    target_os = operation.get('targetOS')
+    is_device = operation.get('isDevice', None)
+
+    custom_dimensions = dict()
+    custom_dimensions['command'] = command
+    custom_dimensions['platform'] = platform
+
+    if is_device is not None:
+        custom_dimensions['isDevice'] = 'true' if str(is_device).lower() == 'true' else 'false'
+
+    if 'target' in operation:
+        if 'targetOS' in operation:
+            custom_dimensions['target'] = target + ':' + target_os
+        else:
+            custom_dimensions['target'] = target
+    elif 'targetOS' in operation:
+        custom_dimensions['target'] = target_os
+
+    try:
+        analyze_operation(command, platform, device, is_device, target, exit_code)
+    except AdditionalTelemetryRequired as e:
+        app_insights.send_metric(e.metric_name, e.metric_value, properties=custom_dimensions)
+    except Exception as e:
+        print(f'    Failed to analyze operation: {e}')
+
+    # Note down the dimensions that caused retry/reboot
+    if retry and retry_dimensions is None:
+        retry_dimensions = custom_dimensions
+        retry_exit_code = exit_code
+
+    if reboot and reboot_dimensions is None:
+        reboot_dimensions = custom_dimensions
+
+    # TODO (https://github.com/dotnet/core-eng/issues/15274): Stop sending app insights telemetry
+    app_insights.send_metric(OPERATION_METRIC_NAME, exit_code, properties=custom_dimensions)
+    app_insights.send_metric(DURATION_METRIC_NAME, duration, properties=custom_dimensions)
+
+    kusto_metrics = dict()
+    kusto_metrics[KUSTO_OPERATION_METRIC_NAME] = exit_code
+    kusto_metrics[KUSTO_DURATION_METRIC_NAME] = duration
+
+    send_metrics(kusto_metrics, custom_dimensions, event_type=KUSTO_EVENT_TYPE)
+
+# Retry / reboot is handled here
+script_dir = os.getenv('HELIX_WORKITEM_ROOT')
+
+if os.path.exists(os.path.join(script_dir, '.retry')):
+    retry = True
+
+if os.path.exists(os.path.join(script_dir, '.reboot')):
+    reboot = True
+
+if retry:
+    # TODO (https://github.com/dotnet/core-eng/issues/15274): Stop sending app insights telemetry
+    app_insights.send_metric(RETRY_METRIC_NAME, retry_exit_code, properties=retry_dimensions)
+    send_metric(KUSTO_RETRY_METRIC_NAME, retry_exit_code, retry_dimensions, event_type=KUSTO_EVENT_TYPE)
+    request_infra_retry('Requesting work item retry because an infrastructure issue was detected on this machine')
+
+    # TODO https://github.com/dotnet/core-eng/issues/15059
+    # We need to remove testResults.xml so that it is not uploaded since this run will be discarded
+    # This is a workaround until we make AzDO reporter not upload test results
+    test_results = os.path.join(output_directory, "testResults.xml")
+    if os.path.exists(test_results):
+        os.remove(test_results)
+
+if reboot:
+    # TODO (https://github.com/dotnet/core-eng/issues/15274): Stop sending app insights telemetry
+    app_insights.send_metric(REBOOT_METRIC_NAME, reboot_exit_code, properties=reboot_dimensions)
+    send_metric(KUSTO_REBOOT_METRIC_NAME, reboot_exit_code, reboot_dimensions, event_type=KUSTO_EVENT_TYPE)
+    request_reboot('Requesting machine reboot as an infrastructure issue was detected on this machine')
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.bat b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.bat
deleted file mode 100644
index 5ffe3a911dc..00000000000
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-@echo off
-
-REM This script is used as a payload of Helix jobs that execute Android workloads through XHarness on Windows systems.
-REM This is used as the entrypoint of the work item so that XHarness failures can be detected and (when appropriate)
-REM cause the work item to retry and reboot the Helix agent the work is running on.
-
-REM Currently no special functionality is needed beyond causing infrastructure retry and reboot if the emulators
-REM or devices have trouble, but to add more Helix-specific Android XHarness behaviors, this is one extensibility point.
-
-set ADB_DEVICE_ENUMERATION_FAILURE=85
-
-echo Xharness Helix Wrapper: Arguments: %*
-%*
-set EXIT_CODE=%ERRORLEVEL%
-
-if %EXIT_CODE%==%ADB_DEVICE_ENUMERATION_FAILURE% (
-  echo Encountered ADB_DEVICE_ENUMERATION_FAILURE.  This is typically not a failure of the work item.  We will run it again and reboot this computer to help its devices
-  echo If this occurs repeatedly, please check for architectural mismatch, e.g. sending x86 or x86_64 APKs to an arm64_v8a-only queue.
-  %HELIX_PYTHONPATH% -c "from helix.workitemutil import request_infra_retry; request_infra_retry('Retrying because we could not enumerate all Android devices')"
-  %HELIX_PYTHONPATH% -c "from helix.workitemutil import request_reboot; request_reboot('Rebooting to allow Android emulator or device to restart')"
-) 
-
-exit /B %EXIT_CODE%
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.ps1 b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.ps1
new file mode 100644
index 00000000000..29fc604f26d
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.ps1
@@ -0,0 +1,60 @@
+<#
+This script is used as a payload of Helix jobs that execute Android workloads through XHarness on Windows systems.
+
+The purpose of this script is to time-constrain user commands (command.ps1) so that we have time at the end of the
+work item to process XHarness telemetry.
+#>
+
+param (
+    [Parameter(Mandatory)]
+    [string]$app,
+    [Parameter(Mandatory)]
+    [string]$timeout,
+    [Parameter(Mandatory)]
+    [int]$command_timeout, # in seconds
+    [Parameter()]
+    [string]$package_name = $null,
+    [Parameter()]
+    [int]$expected_exit_code = 0,
+    [Parameter()]
+    [string]$device_output_path = $null,
+    [Parameter()]
+    [string]$instrumentation = $null
+)
+
+$ErrorActionPreference="Continue"
+
+# Act out the actual commands
+# We have to time constrain them to create buffer for the end of this script
+$psinfo = [System.Diagnostics.ProcessStartInfo]::new()
+$psinfo.FileName = "powershell"
+$psinfo.Arguments = " -ExecutionPolicy ByPass -NoProfile -File `"$PSScriptRoot\command.ps1`" -output_directory `"$Env:HELIX_WORKITEM_UPLOAD_ROOT`" -app `"$app`" -timeout `"$timeout`" -package_name `"$package_name`" -expected_exit_code `"$expected_exit_code`" -device_output_path `"$device_output_path`" -instrumentation `"$instrumentation`""
+$psinfo.RedirectStandardError = $false
+$psinfo.RedirectStandardOutput = $false
+$psinfo.UseShellExecute = $false
+
+$process = [System.Diagnostics.Process]::new()
+$process.StartInfo = $psinfo
+$process.Start()
+
+Wait-Process -InputObject $process -TimeOut $command_timeout -ErrorVariable ev -ErrorAction SilentlyContinue
+
+if ($ev) {
+    Stop-Process -InputObject $process -Force
+    $process.WaitForExit()
+    [Console]::Out.Flush()
+    Write-Output "User command timed out after $command_timeout seconds!"
+
+    Write-Output "Removing installed apps after unsuccessful run"
+    $packages = dotnet exec $Env:XHARNESS_CLI_PATH android adb -- shell pm list packages net.dot
+    $split_packages = $packages.split(':')
+    For ($i = 1; $i -lt $split_packages.Length; $i += 2) {
+        Write-Output "    Uninstalling $($split_packages[$i])"
+        dotnet exec $Env:XHARNESS_CLI_PATH android adb -- uninstall $split_packages[$i]
+    }
+
+    exit -3
+} else {
+    Write-Output "User command ended with $($process.ExitCode)"
+    exit $process.ExitCode
+}
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.sh b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.sh
index 3206267624c..64d952028dc 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.sh
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.sh
@@ -1,29 +1,83 @@
 #!/bin/bash
 
 ### This script is used as a payload of Helix jobs that execute Android workloads through XHarness on Linux systems.
-### This is used as the entrypoint of the work item so that XHarness failures can be detected and (when appropriate)
-### cause the work item to retry and reboot the Helix agent the work is running on.
-### 
-### Currently no special functionality is needed beyond causing infrastructure retry and reboot if the emulators
-### or devices have trouble, but to add more Helix-specific Android XHarness behaviors, this is one extensibility point.
+###
+### The purpose of this script is to time-constrain user commands (command.ps1) so that we have time at the end of the
+### work item to process XHarness telemetry.
 
-set -x
 echo "XHarness Helix Job Wrapper calling '$@'"
-"$@"
-exit_code=$?
-
-# This handles issues where devices or emulators fail to start.
-# The only solution is to reboot the machine, so we request a work item retry + agent reboot when this happens
-# Too see where these values come from, check out https://github.com/dotnet/xharness/blob/master/src/Microsoft.DotNet.XHarness.Common/CLI/ExitCode.cs
-# Avoid any helix-ism in the Xharness!
-
-ADB_DEVICE_ENUMERATION_FAILURE=85 
-if [ $exit_code -eq $ADB_DEVICE_ENUMERATION_FAILURE ]; then
-    echo 'Encountered ADB_DEVICE_ENUMERATION_FAILURE.  This is typically not a failure of the work item.  We will run it again and reboot this computer to help its devices'
-    echo 'If this occurs repeatedly, please check for architectural mismatch, e.g. sending arm64_v8a APKs to an x86_64 / x86 only queue.'
-    # Since we run the payload script using launchctl, env vars are not set there and we have to do this part here
-    "$HELIX_PYTHONPATH" -c "from helix.workitemutil import request_infra_retry; request_infra_retry('Retrying because we could not enumerate all Android devices')"
-    "$HELIX_PYTHONPATH" -c "from helix.workitemutil import request_reboot; request_reboot('Rebooting to allow Android emulator or device to restart.')"
+
+set -x
+
+app=''
+command_timeout=20
+timeout=''
+package_name=''
+expected_exit_code=0
+device_output_path=''
+instrumentation=''
+output_directory=$HELIX_WORKITEM_UPLOAD_ROOT
+
+while [[ $# -gt 0 ]]; do
+    opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
+    case "$opt" in
+      --app)
+        app="$2"
+        shift
+        ;;
+      --command_timeout)
+        command_timeout="$2"
+        shift
+        ;;
+      --timeout)
+        timeout="$2"
+        shift
+        ;;
+      --package_name)
+        package_name="$2"
+        shift
+        ;;
+      --expected_exit_code)
+        expected_exit_code="$2"
+        shift
+        ;;
+      --device_output_path)
+        device_output_path="$2"
+        shift
+        ;;
+      --instrumentation)
+        instrumentation="$2"
+        shift
+        ;;
+    esac
+    shift
+done
+
+if [ -z "$app" ]; then
+    die "App bundle path wasn't provided";
+fi
+
+if [ -z "$timeout" ]; then
+    die "No timeout was provided";
+fi
+
+if [ -z "$output_directory" ]; then
+    die "No output directory provided";
 fi
 
-exit $exit_code
+# The xharness alias
+function xharness() {
+    dotnet exec "$XHARNESS_CLI_PATH" "$@"
+}
+
+function report_infrastructure_failure() {
+    echo "Infrastructural problem reported by the user, requesting retry+reboot: $1"
+
+    echo "$1" > "$HELIX_WORKITEM_ROOT/.retry"
+    echo "$1" > "$HELIX_WORKITEM_ROOT/.reboot"
+}
+
+# Act out the actual commands (and time constrain them to create buffer for the end of this script)
+source command.sh & PID=$! ; (sleep "$command_timeout" && kill $PID 2> /dev/null & ) ; wait $PID
+
+exit $?
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.apple.sh b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.apple.sh
index 3a654aeb38f..ed6b5b81b1c 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.apple.sh
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.apple.sh
@@ -6,21 +6,63 @@
 ### GUI rendering capabilities.
 ###
 
+app=''
+forwarded_args=''
+
+while [[ $# -gt 0 ]]; do
+    opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
+    case "$opt" in
+      --app)
+        app="$2"
+        shift
+        ;;
+      *)
+        forwarded_args="$forwarded_args $1"
+        ;;
+    esac
+    shift
+done
+
 set -x
 
+# It is important we call the script via `launchctl asuser` in order to be able to spawn
+# the simulator which needs to run in a user session with GUI rendering capabilities.
+# The problem with launchctl is that the spawned process won't share environment variables
+# so we have to set them again.
+export -p > envvars
 chmod +x xharness-runner.apple.sh
-helix_runner_uid=$(id -u)
-sudo launchctl asuser "$helix_runner_uid" sh ./xharness-runner.apple.sh "$@"
+uid=$(id -u)
+username=$(id -un)
+sudo launchctl asuser "$uid" sudo -u "$username" sh ./xharness-runner.apple.sh \
+    $forwarded_args                                                            \
+    --app "$HELIX_WORKITEM_ROOT/$app"                                          \
+    --output-directory "$HELIX_WORKITEM_UPLOAD_ROOT"                           \
+
 exit_code=$?
 
-# This handles an issue where Simulators get reeaally slow and they start failing to install apps
-# The only solution is to reboot the machine, so we request a work item retry + MacOS reboot when this happens
-# 123 - timeout in installation on Simulators
-installation_timeout_exit_code=123
-if [ $exit_code -eq $installation_timeout_exit_code ]; then
-    # Since we run the payload script using launchctl, env vars are not set there and we have to do this part here
-    "$HELIX_PYTHONPATH" -c "from helix.workitemutil import request_infra_retry; request_infra_retry('Retrying because iOS Simulator application install hung')"
-    "$HELIX_PYTHONPATH" -c "from helix.workitemutil import request_reboot; request_reboot('Rebooting because iOS Simulator application install hung ')"
+# For some of the issues such as Simulators get reeaally slow and they start failing to install apps,
+# the only solution is to reboot the machine.
+# We usually also ask the work item to be re-tried on a different machine
+# Since we run the payload script using launchctl, env vars such as PYTHON_PATH are not set there and we have to do this part here
+# We signal this by creating files
+if [ -f "$HELIX_WORKITEM_ROOT/.retry" ]; then
+    retry_message=$(cat "$HELIX_WORKITEM_ROOT/.retry" | tr -d "'\\\\")
+
+    if [ -z "$retry_message" ]; then
+        retry_message='Retrying because we could not enumerate all Android devices'
+    fi
+
+    "$HELIX_PYTHONPATH" -c "from helix.workitemutil import request_infra_retry; request_infra_retry('$retry_message')"
+fi
+
+if [ -f "$HELIX_WORKITEM_ROOT/.reboot" ]; then
+    reboot_message=$(cat "$HELIX_WORKITEM_ROOT/.reboot" | tr -d "'\\\\")
+
+    if [ -z "$reboot_message" ]; then
+        reboot_message='Rebooting to allow Android emulator to restart'
+    fi
+
+    "$HELIX_PYTHONPATH" -c "from helix.workitemutil import request_reboot; request_reboot('$reboot_message')"
 fi
 
 exit $exit_code
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.android.ps1 b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.android.ps1
new file mode 100644
index 00000000000..d5105ac2e2f
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.android.ps1
@@ -0,0 +1,49 @@
+<#
+This script is used as a payload of Helix jobs that execute Android workloads through XHarness on Windows systems.
+This file is a header of script that gets populated with user's custom commands.
+
+This script is separate as it is executed with a timeout in its own process.
+#>
+
+param (
+    [Parameter(Mandatory)]
+    [string]$output_directory,
+    [Parameter(Mandatory)]
+    [string]$app,
+    [Parameter(Mandatory)]
+    [string]$timeout,
+    [Parameter()]
+    [string]$package_name = $null,
+    [Parameter()]
+    [int]$expected_exit_code = 0,
+    [Parameter()]
+    [string]$device_output_path = $null,
+    [Parameter()]
+    [string]$instrumentation = $null
+)
+
+$ErrorActionPreference="Continue"
+
+# The xharness alias
+function xharness() {
+    dotnet exec $Env:XHARNESS_CLI_PATH @args
+}
+
+# User can call this when they detect a problem they think is caused by the infrastructure
+function report_infrastructure_failure($message) {
+    Write-Output "Infrastructural problem reported by the user, requesting retry+reboot: $message"
+
+    New-Item -Path "$Env:HELIX_WORKITEM_ROOT" -Name ".retry" -ItemType "file" -Force
+    New-Item -Path "$Env:HELIX_WORKITEM_ROOT" -Name ".reboot" -ItemType "file" -Force
+
+    $message -replace "['\\]" | Out-File -FilePath "$Env:HELIX_WORKITEM_ROOT\.retry"
+    $message -replace "['\\]" | Out-File -FilePath "$Env:HELIX_WORKITEM_ROOT\.reboot"
+}
+
+# User commands begin here
+
+<#%%USER COMMANDS%%#>
+
+# User commands end here
+
+exit $LASTEXITCODE
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.apple.sh b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.apple.sh
index 3fd2803a57f..30acb2569b8 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.apple.sh
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.apple.sh
@@ -7,16 +7,18 @@
 ###
 
 app=''
-output_directory=''
-targets=''
+target=''
 timeout=''
 launch_timeout=''
-xharness_cli_path=''
+command_timeout=20
 xcode_version=''
 app_arguments=''
 expected_exit_code=0
-command='test'
+includes_test_runner=false
+reset_simulator=false
 
+# Ignore shellcheck lint warning about unused variables (they can be used in the sourced script)
+# shellcheck disable=SC2034
 while [[ $# -gt 0 ]]; do
     opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
     case "$opt" in
@@ -24,24 +26,20 @@ while [[ $# -gt 0 ]]; do
         app="$2"
         shift
         ;;
-      --output-directory)
-        output_directory="$2"
-        shift
-        ;;
-      --targets)
-        targets="$2"
+      --target)
+        target="$2"
         shift
         ;;
       --timeout)
         timeout="$2"
         shift
         ;;
-      --launch-timeout)
-        launch_timeout="$2"
+      --command-timeout)
+        command_timeout="$2"
         shift
         ;;
-      --xharness-cli-path)
-        xharness_cli_path="$2"
+      --launch-timeout)
+        launch_timeout="$2"
         shift
         ;;
       --xcode-version)
@@ -56,13 +54,11 @@ while [[ $# -gt 0 ]]; do
         expected_exit_code="$2"
         shift
         ;;
-      --command)
-        command="$2"
-        shift
+      --includes-test-runner)
+        includes_test_runner=true
         ;;
-      *)
-        echo "Invalid argument: $1"
-        exit 1
+      --reset-simulator)
+        reset_simulator=true
         ;;
     esac
     shift
@@ -74,36 +70,11 @@ function die ()
     exit 1
 }
 
-if [ -z "$timeout" ]; then
-    die "Test timeout wasn't provided";
-fi
-
-if [ -z "$xharness_cli_path" ]; then
-    die "XHarness path wasn't provided";
-fi
-
-if [ -n "$app_arguments" ]; then
-    app_arguments="-- $app_arguments";
-fi
-
-if [ "$command" == "run" ]; then
-    app_arguments="--expected-exit-code=$expected_exit_code $app_arguments"
-elif [ -n "$launch_timeout" ]; then
-    # shellcheck disable=SC2089
-    app_arguments="--launch-timeout=$launch_timeout $app_arguments"
-fi
-
-if [ -z "$xcode_version" ]; then
-    xcode_path="$(dirname "$(dirname "$(xcode-select -p)")")"
-else
-    xcode_path="/Applications/Xcode${xcode_version/./}.app"
-fi
-
-# Signing
-if [ "$targets" == 'ios-device' ] || [ "$targets" == 'tvos-device' ]; then
-    echo "Real device target detected, application will be signed"
+function sign ()
+{
+    echo "Signing $1"
 
-    provisioning_profile="$app/embedded.mobileprovision"
+    provisioning_profile="$1/embedded.mobileprovision"
     if [ ! -f "$provisioning_profile" ]; then
         echo "No embedded provisioning profile found at $provisioning_profile! Failed to sign the app!"
         exit 21
@@ -134,60 +105,78 @@ if [ "$targets" == 'ios-device' ] || [ "$targets" == 'tvos-device' ]; then
     /usr/libexec/PlistBuddy -x -c 'Print :Entitlements' provision.plist > entitlements.plist
 
     # Sign the app
-    /usr/bin/codesign -v --force --sign "Apple Development" --keychain "$keychain_name" --entitlements entitlements.plist "$app"
-elif [[ "$targets" =~ "simulator" ]]; then
-    # Start the simulator if it is not running already
-    simulator_app="$xcode_path/Contents/Developer/Applications/Simulator.app"
-    open -a "$simulator_app"
-fi
-
-export XHARNESS_DISABLE_COLORED_OUTPUT=true
-export XHARNESS_LOG_WITH_TIMESTAMPS=true
-
-# We include $app_arguments non-escaped and not arrayed because it might contain several extra arguments
-# which come from outside and are appeneded behind "--" and forwarded to the iOS application from XHarness.
-# shellcheck disable=SC2086,SC2090
-dotnet exec "$xharness_cli_path" apple $command \
-    --app="$app"                                \
-    --output-directory="$output_directory"      \
-    --targets="$targets"                        \
-    --timeout="$timeout"                        \
-    --xcode="$xcode_path"                       \
-    -v                                          \
-    $app_arguments
+    /usr/bin/codesign -v --force --sign "Apple Development" --keychain "$keychain_name" --entitlements entitlements.plist "$1"
+}
 
-exit_code=$?
+if [ -z "$app" ]; then
+    die "App bundle path wasn't provided";
+fi
 
-# Kill the simulator just in case when we fail to launch the app
-# 80 - app crash
-if [ $exit_code -eq 80 ]; then
-    sudo pkill -9 -f "$simulator_app"
+if [ -z "$target" ]; then
+    die "No target was provided";
 fi
 
-# If we have a launch failure AND we are on simulators, we need to signal that we want a reboot+retry
-# The script that is running this one will notice and request Helix to do it
-if [ $exit_code -eq 83 ] && [[ "$targets" =~ "simulator" ]]; then
-    exit_code=123
+if [ -z "$xcode_version" ]; then
+    xcode_path="$(dirname "$(dirname "$(xcode-select -p)")")"
+else
+    xcode_path="/Applications/Xcode${xcode_version/./}.app"
 fi
 
-# The simulator logs comming from the sudo-spawned Simulator.app are not readable by the helix uploader
-chmod 0644 "$output_directory"/*.log
+# First we need to revive env variables since they were erased by launchctl
+# This file already has the expressions in the `export name=value` format
+# shellcheck disable=SC1091
+. ./envvars
 
-if [ "$command" == 'test' ]; then
-    test_results=$(ls "$output_directory"/xunit-*.xml)
+output_directory=$HELIX_WORKITEM_UPLOAD_ROOT
 
-    if [ ! -f "$test_results" ]; then
-        echo "Failed to find xUnit tests results in the output directory. Existing files:"
-        ls -la "$output_directory"
+# Signing
+if [ "$target" == 'ios-device' ] || [ "$target" == 'tvos-device' ]; then
+    if [ -d "$app" ]; then
+        sign "$app"
+    else
+        echo 'Device target detected but app not found, skipping signing..'
+    fi
+elif [[ "$target" =~ "simulator" ]]; then
+    # Start the simulator if it is not running already
+    export SIMULATOR_APP="$xcode_path/Contents/Developer/Applications/Simulator.app"
+    open -a "$SIMULATOR_APP"
+fi
+
+# The xharness alias
+function xharness() {
+    dotnet exec "$XHARNESS_CLI_PATH" "$@"
+}
 
-        if [ $exit_code -eq 0 ]; then
-            exit_code=5
-        fi
+function report_infrastructure_failure() {
+    echo "Infrastructural problem reported by the user, requesting retry+reboot: $1"
 
-        exit $exit_code
+    echo "$1" > "$HELIX_WORKITEM_ROOT/.retry"
+
+    if [[ "$2" -ne "--no-reboot" ]]; then
+        echo "$1" > "$HELIX_WORKITEM_ROOT/.reboot"
     fi
+}
+
+# Used to grep sys logs later in case of crashes
+start_time="$(date '+%Y-%m-%d %H:%M:%S')"
+
+# Act out the actual commands (and time constrain them to create buffer for the end of this script)
+# shellcheck disable=SC1091
+source command.sh & PID=$! ; (sleep "$command_timeout" && kill $PID 2> /dev/null & ) ; wait $PID
+exit_code=$?
+
+# In case of issues, include the syslog (last 2 MB from the time this work item has been running)
+if [ $exit_code -ne 0 ]; then
+    sudo log show --style syslog --start "$start_time" --end "$(date '+%Y-%m-%d %H:%M:%S')" | tail -c 2097152 > "$output_directory/system.log"
+fi
+
+echo "Removing empty log files:"
+find "$output_directory" -name "*.log" -maxdepth 1 -size 0 -print -delete
 
-    echo "Found test results in $output_directory/$test_results. Renaming to testResults.xml to prepare for Helix upload"
+# Rename test result XML so that AzDO reporter recognizes it
+test_results=$(ls "$output_directory"/xunit-*.xml)
+if [ -f "$test_results" ]; then
+    echo "Found test results in $test_results. Renaming to testResults.xml to prepare for Helix upload"
 
     # Prepare test results for Helix to pick up
     mv "$test_results" "$output_directory/testResults.xml"
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-reporter/xunit-reporter.py b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-reporter/xunit-reporter.py
index 3cc16f6d0b9..750909a815a 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-reporter/xunit-reporter.py
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-reporter/xunit-reporter.py
@@ -1,124 +1,10 @@
 #!/usr/bin/env python
 
-import re
-import os
-import urllib
-import helix.azure_storage
 import helix.event
 import helix.settings
-import helix.logs
-
-log = helix.logs.get_logger()
-
-acceptableXUnitFileNames = [
-    "testResults.xml",
-    "test-results.xml",
-    "test_results.xml",
-    "TestResults.xUnit.xml"
-]
-
-class HelixHelper:
-    def __init__(self, settings):
-        self.settings = settings
-        self.event_client = helix.event.create_from_uri(settings.event_uri)
-        self.upload_client = helix.azure_storage.get_upload_client(settings)
-
-    def error(self, error_type, message, log_uri=None):
-        self.event_client.error(self.settings, error_type, message, log_uri)
-
-    def xunit_event(self, results_uri, test_count, file_name):
-        self.event_client.send(
-            {
-                'Type': 'XUnitTestResult',
-                'WorkItemId': self.settings.workitem_id,
-                'WorkItemFriendlyName': self.settings.workitem_friendly_name,
-                'CorrelationId': self.settings.correlation_id,
-                'ResultsXmlUri': results_uri,
-                'TestCount': test_count,
-            }
-        )
-
-    def file_event(self, results_uri, file_name):
-        self.event_client.send(
-            {
-                'Type': 'File',
-                'Uri': results_uri,
-                'FileName': file_name,
-                'WorkItemId': self.settings.workitem_id,
-                'WorkItemFriendlyName': self.settings.workitem_friendly_name,
-                'CorrelationId': self.settings.correlation_id,
-            }
-        )
-
-    def upload_file_to_storage(self, file_path):
-        """ Copy file specified to azure storage account using Helix infrastructure
-        :param file_path: Path to file to be copied to Azure storage
-        :type file_path:string
-        """
-        try:
-            return self.upload_client.upload(file_path, os.path.basename(file_path))
-        except ValueError:
-            self.error("FailedUpload", "Failed to upload "+file_path+"after retry")
-
-def findXUnitResults(search_dir):
-    for root, dirs, files in os.walk(search_dir):
-        for file_name in files:
-            if file_name in acceptableXUnitFileNames:
-                return os.path.join(root, file_name)
-    return None
-
-def main():
-    settings = helix.settings.settings_from_env()
-
-    if settings.output_uri is None or settings.event_uri is None:
-        log.error("Unable to report xunit results: output_uri and/or event_uri are not set.")
-        return 1
-
-    helper = HelixHelper(settings)
-    working_dir = settings.workitem_working_dir
-    upload_dir = settings.workitem_upload_dir
-    need_to_upload_results = True
-
-    results_path = findXUnitResults(working_dir)
-
-    if results_path is None:
-        log.info("Didn't find test results in working directory, trying upload folder")
-        results_path = findXUnitResults(upload_dir)
-        need_to_upload_results = False
-
-    if results_path is None:
-        log.error("Unable to report xunit results: no test results xml file found.")
-        return 2
-
-    log.info("Uploading results from {}".format(results_path))
-
-    with open(results_path, encoding="utf-8") as result_file:
-        test_count = 0
-        total_regex = re.compile(r'total="(\d+)"')
-        for line in result_file:
-            if '<assembly ' in line:
-                match = total_regex.search(line)
-                if match is not None:
-                    test_count = int(match.groups()[0])
-                break
-
-    log.info("Sending XUnit test result events")
-    if need_to_upload_results:
-        result_url = helper.upload_file_to_storage(results_path)
-        helper.file_event(result_url, os.path.basename(results_path))
-    else:
-        # Will be uploaded, but we still need to send events.
-        # This prevents duplicate uploads and errors from them in logs
-        result_url = '{container}/{file}{sas}'.format(
-            container=settings.output_uri,
-            file=os.path.basename(results_path),
-            sas=settings.output_read_token)
-    
-    helper.xunit_event(result_url, test_count, os.path.basename(results_path))
-
-    return 0
-
 
 if __name__ == '__main__':
-    import sys
-    sys.exit(main())
+    settings = helix.settings.settings_from_env()
+    event_client = helix.event.create_from_uri(settings.event_uri)
+    event_client.warning(settings, "Obsolete", "xunit-reporter.py is deprecated, please remove 'EnableXUnitReporter' from your build and use 'EnableAzurePipelinesReporter' instead.")
+    print("This reporter is deprecated")
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets
index 4dc2c244878..c188051bc85 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets
@@ -3,7 +3,7 @@
     <XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">netcoreapp3.1</XUnitPublishTargetFramework>
     <XUnitRuntimeTargetFramework Condition="'$(XUnitRuntimeTargetFramework)' == ''">netcoreapp2.0</XUnitRuntimeTargetFramework>
 
-    <XUnitRunnerVersion Condition="'$(XUnitRunnerVersion)' == ''">2.4.1</XUnitRunnerVersion>
+    <XUnitRunnerVersion Condition="'$(XUnitRunnerVersion)' == ''">2.4.2-pre.9</XUnitRunnerVersion>
 
     <_XUnitPublishTargetsPath>$(MSBuildThisFileDirectory)XUnitPublish.targets</_XUnitPublishTargetsPath>
 
@@ -12,7 +12,7 @@
 
   <ItemGroup Condition="'@(XUnitProject)' != ''">
     <HelixCorrelationPayload Include="xunit-runner">
-      <Uri>https://api.nuget.org/v3-flatcontainer/xunit.runner.console/$(XUnitRunnerVersion)/xunit.runner.console.$(XUnitRunnerVersion).nupkg</Uri>
+      <Uri>https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xunit.runner.console/$(XUnitRunnerVersion)/xunit.runner.console.$(XUnitRunnerVersion).nupkg</Uri>
       <Destination>xunit-runner</Destination>
     </HelixCorrelationPayload>
   </ItemGroup>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj
index 6a1cee07932..d00c49a4d0b 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj
+++ b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj
@@ -1,8 +1,8 @@
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworks>
 
     <IsPackable>true</IsPackable>
     <PackageType>MSBuildSdk</PackageType>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetUtils.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetUtils.cs
index d985a9e8440..260befb6ef1 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetUtils.cs
+++ b/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetUtils.cs
@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 
diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs
index ba7ce8bb7ec..e2dc7c007f4 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs
+++ b/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs
@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs
index 6f7045be7ae..0d9d22ec6a5 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs
+++ b/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs
@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 using System.Collections.Generic;
@@ -22,7 +23,7 @@ public sealed class ReplacePackageParts : AppDomainIsolatedTask
     {
         static ReplacePackageParts() => AssemblyResolution.Initialize();
 #else
-    public sealed class ReplacePackageParts : Task
+    public sealed class ReplacePackageParts : Microsoft.Build.Utilities.Task
     {
 #endif
         /// <summary>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs
index 15731be682d..8f922025d15 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs
+++ b/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs
@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 using System.Collections.Generic;
@@ -15,7 +16,7 @@ public sealed class UpdatePackageVersionTask : AppDomainIsolatedTask
     {
         static UpdatePackageVersionTask() => AssemblyResolution.Initialize();
 #else
-    public class UpdatePackageVersionTask : Task
+    public class UpdatePackageVersionTask : Microsoft.Build.Utilities.Task
     {
 #endif
         public string VersionKind { get; set; }
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
index 98f73d71421..ad1d93e7128 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
@@ -1,4 +1,4 @@
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -17,59 +17,59 @@
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\A.1.0.0-beta-12345-01.nupkg">
-      <LogicalName>A.1.0.0-beta-12345-01.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageA.1.0.0-beta-12345-01.nupkg">
+      <LogicalName>TestPackageA.1.0.0-beta-12345-01.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\B.1.0.0-beta-12345-01.nupkg">
-      <LogicalName>B.1.0.0-beta-12345-01.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageB.1.0.0-beta-12345-01.nupkg">
+      <LogicalName>TestPackageB.1.0.0-beta-12345-01.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\C.1.0.0-beta-12345-01.nupkg">
-      <LogicalName>C.1.0.0-beta-12345-01.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageC.1.0.0-beta-12345-01.nupkg">
+      <LogicalName>TestPackageC.1.0.0-beta-12345-01.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\D.1.0.0-beta-12345-01.nupkg">
-      <LogicalName>D.1.0.0-beta-12345-01.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageD.1.0.0-beta-12345-01.nupkg">
+      <LogicalName>TestPackageD.1.0.0-beta-12345-01.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\E.1.0.0-beta.12345.1.nupkg">
-      <LogicalName>E.1.0.0-beta.12345.1.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageE.1.0.0-beta.12345.1.nupkg">
+      <LogicalName>TestPackageE.1.0.0-beta.12345.1.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\F.1.0.0-beta.12345.1.nupkg">
-      <LogicalName>F.1.0.0-beta.12345.1.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageF.1.0.0-beta.12345.1.nupkg">
+      <LogicalName>TestPackageF.1.0.0-beta.12345.1.nupkg</LogicalName>
     </EmbeddedResource>    
-    <EmbeddedResource Include="Resources\A.1.0.0-beta-final.nupkg">
-      <LogicalName>A.1.0.0-beta-final.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageA.1.0.0-beta-final.nupkg">
+      <LogicalName>TestPackageA.1.0.0-beta-final.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\B.1.0.0-beta-final.nupkg">
-      <LogicalName>B.1.0.0-beta-final.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageB.1.0.0-beta-final.nupkg">
+      <LogicalName>TestPackageB.1.0.0-beta-final.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\C.1.0.0-beta-final.nupkg">
-      <LogicalName>C.1.0.0-beta-final.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageC.1.0.0-beta-final.nupkg">
+      <LogicalName>TestPackageC.1.0.0-beta-final.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\D.1.0.0-beta-final.nupkg">
-      <LogicalName>D.1.0.0-beta-final.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageD.1.0.0-beta-final.nupkg">
+      <LogicalName>TestPackageD.1.0.0-beta-final.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\E.1.0.0-beta.final.nupkg">
-      <LogicalName>E.1.0.0-beta.final.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageE.1.0.0-beta.final.nupkg">
+      <LogicalName>TestPackageE.1.0.0-beta.final.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\F.1.0.0-beta.final.nupkg">
-      <LogicalName>F.1.0.0-beta.final.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageF.1.0.0-beta.final.nupkg">
+      <LogicalName>TestPackageF.1.0.0-beta.final.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\A.1.0.0.nupkg">
-      <LogicalName>A.1.0.0.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageA.1.0.0.nupkg">
+      <LogicalName>TestPackageA.1.0.0.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\B.1.0.0.nupkg">
-      <LogicalName>B.1.0.0.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageB.1.0.0.nupkg">
+      <LogicalName>TestPackageB.1.0.0.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\C.1.0.0.nupkg">
-      <LogicalName>C.1.0.0.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageC.1.0.0.nupkg">
+      <LogicalName>TestPackageC.1.0.0.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\D.1.0.0.nupkg">
-      <LogicalName>D.1.0.0.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageD.1.0.0.nupkg">
+      <LogicalName>TestPackageD.1.0.0.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\E.1.0.0.nupkg">
-      <LogicalName>E.1.0.0.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageE.1.0.0.nupkg">
+      <LogicalName>TestPackageE.1.0.0.nupkg</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\F.1.0.0.nupkg">
-      <LogicalName>F.1.0.0.nupkg</LogicalName>
+    <EmbeddedResource Include="Resources\TestPackageF.1.0.0.nupkg">
+      <LogicalName>TestPackageF.1.0.0.nupkg</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\Signed.1.2.3.nupkg">
       <LogicalName>Signed.1.2.3.nupkg</LogicalName>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/ReplacePackagePartsTests.cs b/src/Microsoft.DotNet.NuGetRepack/tests/ReplacePackagePartsTests.cs
index b873e8b1ba5..c03085f75c2 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/ReplacePackagePartsTests.cs
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/ReplacePackagePartsTests.cs
@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 using System.IO;
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-12345-01.nupkg
deleted file mode 100644
index a2e3ef151bf..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-12345-01.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-final.nupkg
deleted file mode 100644
index a3c92f002a2..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-final.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0.nupkg
deleted file mode 100644
index 63d2d6be922..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-12345-01.nupkg
deleted file mode 100644
index e21edfc8917..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-12345-01.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-final.nupkg
deleted file mode 100644
index 637db00b52c..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-final.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0.nupkg
deleted file mode 100644
index cbfb9f546b2..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-12345-01.nupkg
deleted file mode 100644
index 120efff7730..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-12345-01.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-final.nupkg
deleted file mode 100644
index e5a0ea88689..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-final.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0.nupkg
deleted file mode 100644
index deb0a83f316..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-final.nupkg
deleted file mode 100644
index a6abf5ad54f..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-final.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0.nupkg
deleted file mode 100644
index 2bf6d1b97ae..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.12345.1.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.12345.1.nupkg
deleted file mode 100644
index 496961df29f..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.12345.1.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.final.nupkg
deleted file mode 100644
index 236d751762e..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.final.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0.nupkg
deleted file mode 100644
index 89c8ebc0d36..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.12345.1.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.12345.1.nupkg
deleted file mode 100644
index 61beec88f0d..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.12345.1.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.final.nupkg
deleted file mode 100644
index 61d6966a103..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.final.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0.nupkg
deleted file mode 100644
index 067a6628796..00000000000
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0.nupkg and /dev/null differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-12345-01.nupkg
new file mode 100644
index 00000000000..b29de22c148
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-12345-01.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-final.nupkg
new file mode 100644
index 00000000000..264246e25d8
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-final.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0.nupkg
new file mode 100644
index 00000000000..8a18159ef66
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.nuspec
similarity index 100%
rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.nuspec
rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.nuspec
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-12345-01.nupkg
new file mode 100644
index 00000000000..be1d2e6ca87
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-12345-01.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-final.nupkg
new file mode 100644
index 00000000000..92b4838a3dc
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-final.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0.nupkg
new file mode 100644
index 00000000000..986b8475ad3
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.nuspec
similarity index 97%
rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.nuspec
rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.nuspec
index 4a4623ef80f..c539d9a04b6 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.nuspec
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
-    <id>B</id>
+    <id>TestPackageB</id>
     <version>1.0.0-beta-12345-01</version>
     <authors>Microsoft</authors>
     <description>B</description>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-12345-01.nupkg
new file mode 100644
index 00000000000..542115db341
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-12345-01.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-final.nupkg
new file mode 100644
index 00000000000..4eeb80d214b
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-final.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0.nupkg
new file mode 100644
index 00000000000..70f339197a2
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.nuspec
similarity index 75%
rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.nuspec
rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.nuspec
index f0af0e95a34..f103ca36638 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.nuspec
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.nuspec
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
-    <id>C</id>
+    <id>TestPackageC</id>
     <version>1.0.0-beta-12345-01</version>
     <authors>Microsoft</authors>
     <description>C</description>
     <dependencies>
-      <dependency id="B" version="[1.0.0-beta-12345-01]" />
+      <dependency id="TestPackageB" version="[1.0.0-beta-12345-01]" />
     </dependencies>
   </metadata>
   <files/>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-12345-01.nupkg
similarity index 52%
rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-12345-01.nupkg
rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-12345-01.nupkg
index 733f0104b88..d9da05951bb 100644
Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-12345-01.nupkg and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-12345-01.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-final.nupkg
new file mode 100644
index 00000000000..1ab385c9760
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-final.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0.nupkg
new file mode 100644
index 00000000000..3d1cc80b76e
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.nuspec
similarity index 94%
rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.nuspec
rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.nuspec
index 74e7d79486e..d2ae177685e 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.nuspec
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
-    <id>D</id>
+    <id>TestPackageD</id>
     <version>1.0.0-beta-12345-01</version>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.12345.1.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.12345.1.nupkg
new file mode 100644
index 00000000000..bb87ec205e1
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.12345.1.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.final.nupkg
new file mode 100644
index 00000000000..a9e1659ebab
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.final.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0.nupkg
new file mode 100644
index 00000000000..d22ced5cf64
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.nuspec
similarity index 81%
rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.nuspec
rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.nuspec
index a5de09b9f5f..5c4c9eebd18 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.nuspec
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.nuspec
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
-    <id>E</id>
+    <id>TestPackageE</id>
     <version>1.0.0-beta.12345.1+abcdef</version>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>E</description>
     <dependencies>
-      <dependency id="F" version="1.0.0-beta.12345.1" />
+      <dependency id="TestPackageF" version="1.0.0-beta.12345.1" />
     </dependencies>
   </metadata>
   <files/>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.12345.1.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.12345.1.nupkg
new file mode 100644
index 00000000000..9c0ae331719
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.12345.1.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.final.nupkg
new file mode 100644
index 00000000000..cad51365635
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.final.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0.nupkg
new file mode 100644
index 00000000000..4694a53d0b8
Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0.nupkg differ
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.nuspec
similarity index 94%
rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.nuspec
rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.nuspec
index 3c7f4db748e..a624831c797 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.nuspec
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
-    <id>F</id>
+    <id>TestPackageF</id>
     <version>1.0.0-beta.12345.1+abcdef</version>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/AssertEx.cs b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/AssertEx.cs
index c254b131cfb..5ae86b144ab 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/AssertEx.cs
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/AssertEx.cs
@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 using System.Collections;
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/DiffUtil.cs b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/DiffUtil.cs
index cc7fd418a7d..62a12cd0a7c 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/DiffUtil.cs
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/DiffUtil.cs
@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/ResourceLoader.cs b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/ResourceLoader.cs
index 011005dde01..c0c34a41840 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/ResourceLoader.cs
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/ResourceLoader.cs
@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 using System.IO;
@@ -45,4 +46,4 @@ public static byte[] GetOrCreateResource(ref byte[] resource, string name)
             return resource;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs
index 27308dcb611..82ef8e8fe9d 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs
@@ -1,4 +1,5 @@
- // Copyright(c) Microsoft.All Rights Reserved.Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 namespace TestResources
 {
@@ -7,28 +8,28 @@ public static class ReleasePackages
         public const string Version = "1.0.0";
 
         private static byte[] s_A;
-        public static byte[] A => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
-        public const string NameA = nameof(A) + "." + Version + ".nupkg";
+        public static byte[] TestPackageA => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
+        public const string NameA = nameof(TestPackageA) + "." + Version + ".nupkg";
 
         private static byte[] s_B;
-        public static byte[] B => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
-        public const string NameB = nameof(B) + "." + Version + ".nupkg";
+        public static byte[] TestPackageB => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
+        public const string NameB = nameof(TestPackageB) + "." + Version + ".nupkg";
 
         private static byte[] s_C;
-        public static byte[] C => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
-        public const string NameC = nameof(C) + "." + Version + ".nupkg";
+        public static byte[] TestPackageC => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
+        public const string NameC = nameof(TestPackageC) + "." + Version + ".nupkg";
 
         private static byte[] s_D;
-        public static byte[] D => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
-        public const string NameD = nameof(D) + "." + Version + ".nupkg";
+        public static byte[] TestPackageD => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
+        public const string NameD = nameof(TestPackageD) + "." + Version + ".nupkg";
 
         private static byte[] s_E;
-        public static byte[] E => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
-        public const string NameE = nameof(E) + "." + Version + ".nupkg";
+        public static byte[] TestPackageE => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
+        public const string NameE = nameof(TestPackageE) + "." + Version + ".nupkg";
 
         private static byte[] s_F;
-        public static byte[] F => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
-        public const string NameF = nameof(F) + "." + Version + ".nupkg";
+        public static byte[] TestPackageF => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
+        public const string NameF = nameof(TestPackageF) + "." + Version + ".nupkg";
     }
 
     public static class PreReleasePackages
@@ -37,28 +38,28 @@ public static class PreReleasePackages
         public const string SemVer2 = "1.0.0-beta.final";
 
         private static byte[] s_A;
-        public static byte[] A => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
-        public const string NameA = nameof(A) + "." + SemVer1 + ".nupkg";
+        public static byte[] TestPackageA => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
+        public const string NameA = nameof(TestPackageA) + "." + SemVer1 + ".nupkg";
 
         private static byte[] s_B;
-        public static byte[] B => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
-        public const string NameB = nameof(B) + "." + SemVer1 + ".nupkg";
+        public static byte[] TestPackageB => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
+        public const string NameB = nameof(TestPackageB) + "." + SemVer1 + ".nupkg";
 
         private static byte[] s_C;
-        public static byte[] C => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
-        public const string NameC = nameof(C) + "." + SemVer1 + ".nupkg";
+        public static byte[] TestPackageC => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
+        public const string NameC = nameof(TestPackageC) + "." + SemVer1 + ".nupkg";
 
         private static byte[] s_D;
-        public static byte[] D => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
-        public const string NameD = nameof(D) + "." + SemVer1 + ".nupkg";
+        public static byte[] TestPackageD => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
+        public const string NameD = nameof(TestPackageD) + "." + SemVer1 + ".nupkg";
 
         private static byte[] s_E;
-        public static byte[] E => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
-        public const string NameE = nameof(E) + "." + SemVer2 + ".nupkg";
+        public static byte[] TestPackageE => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
+        public const string NameE = nameof(TestPackageE) + "." + SemVer2 + ".nupkg";
 
         private static byte[] s_F;
-        public static byte[] F => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
-        public const string NameF = nameof(F) + "." + SemVer2 + ".nupkg";
+        public static byte[] TestPackageF => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
+        public const string NameF = nameof(TestPackageF) + "." + SemVer2 + ".nupkg";
     }
 
     public static class DailyBuildPackages
@@ -67,28 +68,28 @@ public static class DailyBuildPackages
         public const string SemVer2 = "1.0.0-beta.12345.1";
 
         private static byte[] s_A;
-        public static byte[] A => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
-        public const string NameA = nameof(A) + "." + SemVer1 + ".nupkg";
+        public static byte[] TestPackageA => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
+        public const string NameA = nameof(TestPackageA) + "." + SemVer1 + ".nupkg";
 
         private static byte[] s_B;
-        public static byte[] B => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
-        public const string NameB = nameof(B) + "." + SemVer1 + ".nupkg";
+        public static byte[] TestPackageB => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
+        public const string NameB = nameof(TestPackageB) + "." + SemVer1 + ".nupkg";
 
         private static byte[] s_C;
-        public static byte[] C => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
-        public const string NameC = nameof(C) + "." + SemVer1 + ".nupkg";
+        public static byte[] TestPackageC => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
+        public const string NameC = nameof(TestPackageC) + "." + SemVer1 + ".nupkg";
 
         private static byte[] s_D;
-        public static byte[] D => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
-        public const string NameD = nameof(D) + "." + SemVer1 + ".nupkg";
+        public static byte[] TestPackageD => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
+        public const string NameD = nameof(TestPackageD) + "." + SemVer1 + ".nupkg";
 
         private static byte[] s_E;
-        public static byte[] E => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
-        public const string NameE = nameof(E) + "." + SemVer2 + ".nupkg";
+        public static byte[] TestPackageE => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
+        public const string NameE = nameof(TestPackageE) + "." + SemVer2 + ".nupkg";
 
         private static byte[] s_F;
-        public static byte[] F => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
-        public const string NameF = nameof(F) + "." + SemVer2 + ".nupkg";
+        public static byte[] TestPackageF => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
+        public const string NameF = nameof(TestPackageF) + "." + SemVer2 + ".nupkg";
     }
 
     public static class MiscPackages
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs b/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs
index 60d4f84c97d..900c55775a1 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs
@@ -1,4 +1,5 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 using System.IO;
@@ -59,10 +60,10 @@ public void TestPackagesSemVer1()
             Directory.CreateDirectory(dir);
 
             string a_daily, b_daily, c_daily, d_daily;
-            File.WriteAllBytes(a_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameA), TestResources.DailyBuildPackages.A);
-            File.WriteAllBytes(b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.B);
-            File.WriteAllBytes(c_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameC), TestResources.DailyBuildPackages.C);
-            File.WriteAllBytes(d_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameD), TestResources.DailyBuildPackages.D);
+            File.WriteAllBytes(a_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameA), TestResources.DailyBuildPackages.TestPackageA);
+            File.WriteAllBytes(b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.TestPackageB);
+            File.WriteAllBytes(c_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameC), TestResources.DailyBuildPackages.TestPackageC);
+            File.WriteAllBytes(d_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameD), TestResources.DailyBuildPackages.TestPackageD);
 
             var a_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameA);
             var b_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameB);
@@ -77,15 +78,15 @@ public void TestPackagesSemVer1()
             NuGetVersionUpdater.Run(new[] { a_daily, b_daily, c_daily, d_daily }, dir, VersionTranslation.Release, exactVersions: false);
             NuGetVersionUpdater.Run(new[] { a_daily, b_daily, c_daily, d_daily }, dir, VersionTranslation.PreRelease, exactVersions: false);
 
-            AssertPackagesEqual(TestResources.ReleasePackages.A, File.ReadAllBytes(a_rel));
-            AssertPackagesEqual(TestResources.ReleasePackages.B, File.ReadAllBytes(b_rel));
-            AssertPackagesEqual(TestResources.ReleasePackages.C, File.ReadAllBytes(c_rel));
-            AssertPackagesEqual(TestResources.ReleasePackages.D, File.ReadAllBytes(d_rel));
+            AssertPackagesEqual(TestResources.ReleasePackages.TestPackageA, File.ReadAllBytes(a_rel));
+            AssertPackagesEqual(TestResources.ReleasePackages.TestPackageB, File.ReadAllBytes(b_rel));
+            AssertPackagesEqual(TestResources.ReleasePackages.TestPackageC, File.ReadAllBytes(c_rel));
+            AssertPackagesEqual(TestResources.ReleasePackages.TestPackageD, File.ReadAllBytes(d_rel));
 
-            AssertPackagesEqual(TestResources.PreReleasePackages.A, File.ReadAllBytes(a_pre));
-            AssertPackagesEqual(TestResources.PreReleasePackages.B, File.ReadAllBytes(b_pre));
-            AssertPackagesEqual(TestResources.PreReleasePackages.C, File.ReadAllBytes(c_pre));
-            AssertPackagesEqual(TestResources.PreReleasePackages.D, File.ReadAllBytes(d_pre));
+            AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageA, File.ReadAllBytes(a_pre));
+            AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageB, File.ReadAllBytes(b_pre));
+            AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageC, File.ReadAllBytes(c_pre));
+            AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageD, File.ReadAllBytes(d_pre));
 
             Directory.Delete(dir, recursive: true);
         }
@@ -97,8 +98,8 @@ public void TestPackagesSemVer2()
             Directory.CreateDirectory(dir);
 
             string e_daily, f_daily;
-            File.WriteAllBytes(e_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameE), TestResources.DailyBuildPackages.E);
-            File.WriteAllBytes(f_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameF), TestResources.DailyBuildPackages.F);
+            File.WriteAllBytes(e_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameE), TestResources.DailyBuildPackages.TestPackageE);
+            File.WriteAllBytes(f_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameF), TestResources.DailyBuildPackages.TestPackageF);
 
             var e_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameE);
             var f_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameF);
@@ -109,11 +110,11 @@ public void TestPackagesSemVer2()
             NuGetVersionUpdater.Run(new[] { e_daily, f_daily }, dir, VersionTranslation.Release, exactVersions: true);
             NuGetVersionUpdater.Run(new[] { e_daily, f_daily }, dir, VersionTranslation.PreRelease, exactVersions: true);
 
-            AssertPackagesEqual(TestResources.ReleasePackages.E, File.ReadAllBytes(e_rel));
-            AssertPackagesEqual(TestResources.ReleasePackages.F, File.ReadAllBytes(f_rel));
+            AssertPackagesEqual(TestResources.ReleasePackages.TestPackageE, File.ReadAllBytes(e_rel));
+            AssertPackagesEqual(TestResources.ReleasePackages.TestPackageF, File.ReadAllBytes(f_rel));
 
-            AssertPackagesEqual(TestResources.PreReleasePackages.E, File.ReadAllBytes(e_pre));
-            AssertPackagesEqual(TestResources.PreReleasePackages.F, File.ReadAllBytes(f_pre));
+            AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageE, File.ReadAllBytes(e_pre));
+            AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageF, File.ReadAllBytes(f_pre));
 
             Directory.Delete(dir, recursive: true);
         }
@@ -125,33 +126,33 @@ public void TestValidation()
             Directory.CreateDirectory(dir);
 
             string a_daily, b_daily, c_daily;
-            File.WriteAllBytes(a_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameA), TestResources.DailyBuildPackages.A);
-            File.WriteAllBytes(b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.B);
-            File.WriteAllBytes(c_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameC), TestResources.DailyBuildPackages.C);
+            File.WriteAllBytes(a_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameA), TestResources.DailyBuildPackages.TestPackageA);
+            File.WriteAllBytes(b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.TestPackageB);
+            File.WriteAllBytes(c_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameC), TestResources.DailyBuildPackages.TestPackageC);
 
             var e1 = Assert.Throws<InvalidOperationException>(() => NuGetVersionUpdater.Run(new[] { c_daily }, outDirectoryOpt: null, VersionTranslation.Release, exactVersions: false));
-            AssertEx.AreEqual("Package 'C' depends on a pre-release package 'B, [1.0.0-beta-12345-01]'", e1.Message);
+            AssertEx.AreEqual("Package 'TestPackageC' depends on a pre-release package 'TestPackageB, [1.0.0-beta-12345-01]'", e1.Message);
 
             var e2 = Assert.Throws<AggregateException>(() => NuGetVersionUpdater.Run(new[] { a_daily }, outDirectoryOpt: null, VersionTranslation.Release, exactVersions: false));
             AssertEx.Equal(new[]
             {
-                "System.InvalidOperationException: Package 'A' depends on a pre-release package 'B, 1.0.0-beta-12345-01'",
-                "System.InvalidOperationException: Package 'A' depends on a pre-release package 'C, (, 1.0.0-beta-12345-01]'",
-                "System.InvalidOperationException: Package 'A' depends on a pre-release package 'C, 1.0.0-beta-12345-01'"
+                "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageB, 1.0.0-beta-12345-01'",
+                "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageC, (, 1.0.0-beta-12345-01]'",
+                "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageC, 1.0.0-beta-12345-01'"
             }, e2.InnerExceptions.Select(i => i.ToString()));
 
             var e3 = Assert.Throws<AggregateException>(() => NuGetVersionUpdater.Run(new[] { a_daily, b_daily }, outDirectoryOpt: null, VersionTranslation.Release, exactVersions: false));
             AssertEx.Equal(new[]
             {
-                "System.InvalidOperationException: Package 'A' depends on a pre-release package 'C, (, 1.0.0-beta-12345-01]'",
-                "System.InvalidOperationException: Package 'A' depends on a pre-release package 'C, 1.0.0-beta-12345-01'"
+                "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageC, (, 1.0.0-beta-12345-01]'",
+                "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageC, 1.0.0-beta-12345-01'"
             }, e3.InnerExceptions.Select(i => i.ToString()));
 
             var e4 = Assert.Throws<AggregateException>(() => NuGetVersionUpdater.Run(new[] { a_daily, c_daily }, outDirectoryOpt: null, VersionTranslation.Release, exactVersions: false));
             AssertEx.Equal(new[]
             {
-                "System.InvalidOperationException: Package 'A' depends on a pre-release package 'B, 1.0.0-beta-12345-01'",
-                "System.InvalidOperationException: Package 'C' depends on a pre-release package 'B, [1.0.0-beta-12345-01]'"
+                "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageB, 1.0.0-beta-12345-01'",
+                "System.InvalidOperationException: Package 'TestPackageC' depends on a pre-release package 'TestPackageB, [1.0.0-beta-12345-01]'"
             }, e4.InnerExceptions.Select(i => i.ToString()));
 
             Directory.Delete(dir, recursive: true);
@@ -167,12 +168,12 @@ public void TestDotnetToolValidation()
             string dotnet_tool;
             File.WriteAllBytes(dotnet_tool = Path.Combine(dir, TestResources.MiscPackages.NameDotnetTool), TestResources.MiscPackages.DotnetTool);
             string normal_package_b_daily;
-            File.WriteAllBytes(normal_package_b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.B);
+            File.WriteAllBytes(normal_package_b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.TestPackageB);
 
             NuGetVersionUpdater.Run(new[] { dotnet_tool, normal_package_b_daily }, outDirectoryOpt: outputDir, VersionTranslation.Release, exactVersions: false);
 
             // Only contain normal package. dotnet tool package is skipped
-            Assert.Single(Directory.EnumerateFiles(outputDir), fullPath => Path.GetFileNameWithoutExtension(fullPath) == "B.1.0.0");
+            Assert.Single(Directory.EnumerateFiles(outputDir), fullPath => Path.GetFileNameWithoutExtension(fullPath) == "TestPackageB.1.0.0");
 
             Directory.Delete(dir, recursive: true);
             Directory.Delete(outputDir, recursive: true);
diff --git a/src/Microsoft.DotNet.PackageTesting.Tests/GetCompatibilePackageTargetFrameworksTests.cs b/src/Microsoft.DotNet.PackageTesting.Tests/GetCompatibilePackageTargetFrameworksTests.cs
new file mode 100644
index 00000000000..1fbcc5ff995
--- /dev/null
+++ b/src/Microsoft.DotNet.PackageTesting.Tests/GetCompatibilePackageTargetFrameworksTests.cs
@@ -0,0 +1,182 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using NuGet.Frameworks;
+using Xunit;
+
+namespace Microsoft.DotNet.PackageTesting.Tests
+{
+    public class GetCompatibilePackageTargetFrameworksTests
+    {
+        public GetCompatibilePackageTargetFrameworksTests()
+        {
+            GetCompatiblePackageTargetFrameworks.Initialize("netcoreapp3.1;net5.0;net6.0;net461;net462;net471;net472;netstandard2.0;netstandard2.1");
+        }
+
+        public static IEnumerable<object[]> PackageTfmData => new List<object[]>
+        {
+            // single target framework in package
+            new object[]
+            {  
+                new List<string> 
+                { 
+                    @"lib/netstandard2.0/TestPackage.dll"
+                },
+                new List<NuGetFramework> 
+                { 
+                    FrameworkConstants.CommonFrameworks.NetStandard20, 
+                    FrameworkConstants.CommonFrameworks.Net461, 
+                    FrameworkConstants.CommonFrameworks.Net462,
+                    FrameworkConstants.CommonFrameworks.NetCoreApp31
+                } 
+            },
+            new object[]
+            {
+                new List<string>
+                {
+                    @"runtimes/win/lib/netstandard2.0/TestPackage.dll",
+                },
+                new List<NuGetFramework>
+                {
+                    FrameworkConstants.CommonFrameworks.NetStandard20,
+                    FrameworkConstants.CommonFrameworks.Net461,
+                    FrameworkConstants.CommonFrameworks.Net462,
+                    FrameworkConstants.CommonFrameworks.NetCoreApp31
+                }
+            },
+            new object[]
+            {
+                new List<string>
+                {
+                    @"lib/net5.0/TestPackage.dll",
+                    @"runtimes/win/lib/netstandard2.0/TestPackage.dll"
+                },
+                new List<NuGetFramework>
+                {
+                    FrameworkConstants.CommonFrameworks.NetStandard20,
+                    FrameworkConstants.CommonFrameworks.Net461,
+                    FrameworkConstants.CommonFrameworks.Net462,
+                    FrameworkConstants.CommonFrameworks.NetCoreApp31,
+                    FrameworkConstants.CommonFrameworks.Net50
+                }
+            },
+            new object[]
+            {
+                new List<string>
+                {
+                    @"lib/netcoreapp3.1/TestPackage.dll"
+                },
+                new List<NuGetFramework>
+                {
+                    FrameworkConstants.CommonFrameworks.NetCoreApp31
+                }
+            },
+            new object[]
+            {
+                new List<string>
+                {
+                    @"lib/netcoreapp3.1/TestPackage.dll",
+                    @"lib/net461/TestPackage.dll"
+                },
+                new List<NuGetFramework>
+                {
+                    FrameworkConstants.CommonFrameworks.NetCoreApp31,
+                    FrameworkConstants.CommonFrameworks.Net461
+                }
+            },
+            new object[]
+            {
+                new List<string>
+                {
+                    @"runtimes/unix/lib/netcoreapp3.1/TestPackage.dll",
+                    @"runtimes/win/lib/netstandard2.0/TestPackage.dll"
+                },
+                new List<NuGetFramework>
+                {
+                    FrameworkConstants.CommonFrameworks.NetCoreApp31,
+                    FrameworkConstants.CommonFrameworks.NetStandard20,
+                    FrameworkConstants.CommonFrameworks.Net461,
+                    FrameworkConstants.CommonFrameworks.Net462
+                }
+            },
+            new object[]
+            {
+                new List<string>
+                {
+                    @"lib/net5.0/TestPackage.dll",
+                    @"lib/net472/TestPackage.dll",
+                    @"runtimes/win/lib/netstandard2.0/TestPackage.dll"
+                },
+                new List<NuGetFramework>
+                {
+                    FrameworkConstants.CommonFrameworks.NetStandard20,
+                    FrameworkConstants.CommonFrameworks.Net461,
+                    FrameworkConstants.CommonFrameworks.Net462,
+                    NuGetFramework.Parse("net472"),
+                    FrameworkConstants.CommonFrameworks.NetCoreApp31,
+                    FrameworkConstants.CommonFrameworks.Net50
+                }
+            },
+            new object[]
+            {
+                new List<string>
+                {
+                    @"lib/net461/TestPackage.dll"
+                },
+                new List<NuGetFramework>
+                {
+                    FrameworkConstants.CommonFrameworks.Net461,
+                }
+            },
+        };
+
+        [Theory]
+        [MemberData(nameof(PackageTfmData))]
+        public void GetCompatibleFrameworks(List<string> filePaths, List<NuGetFramework> expectedTestFrameworks)
+        {
+            Package package = new("TestPackage", "1.0.0", filePaths, Enumerable.Empty<NuGetFramework>());
+            IEnumerable<NuGetFramework> actualTestFrameworks = GetCompatiblePackageTargetFrameworks.GetTestFrameworks(package, "netcoreapp3.1");
+            CollectionsEqual(expectedTestFrameworks, actualTestFrameworks);
+        }
+
+        [Fact]
+        public void GetCompatibleFrameworksFromDependencies()
+        {
+            var dependencyFrameworks = new[]
+            {
+                FrameworkConstants.CommonFrameworks.NetCoreApp21,
+                FrameworkConstants.CommonFrameworks.NetCoreApp31,
+                FrameworkConstants.CommonFrameworks.NetStandard20,
+                FrameworkConstants.CommonFrameworks.NetStandard21,
+                NuGetFramework.Parse("net6.0"),
+            };
+            Package package = new("TestPackage", "1.0.0", Enumerable.Empty<string>(), dependencyFrameworks);
+            IEnumerable<NuGetFramework> actualTestFrameworks = GetCompatiblePackageTargetFrameworks.GetTestFrameworks(package, "netcoreapp3.1");
+
+            var expectedTestFrameworks = new[]
+            {
+                NuGetFramework.Parse("net6.0"),
+                FrameworkConstants.CommonFrameworks.NetCoreApp31,
+                FrameworkConstants.CommonFrameworks.Net461,
+                FrameworkConstants.CommonFrameworks.Net462,
+                FrameworkConstants.CommonFrameworks.NetStandard20,
+                FrameworkConstants.CommonFrameworks.NetStandard21
+            };
+            CollectionsEqual(expectedTestFrameworks, actualTestFrameworks);
+        }
+
+        private static void CollectionsEqual<T>(IEnumerable<T> T1, IEnumerable<T> T2)
+        {
+            foreach (var item in T1)
+            {
+                Assert.Contains(item, T2);
+            }
+            foreach (var item in T2)
+            {
+                Assert.Contains(item, T1);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj b/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj
similarity index 53%
rename from src/Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj
rename to src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj
index f69b97f4a64..6fde42f0d79 100644
--- a/src/Microsoft.DotNet.PackageValidation.Tests/Microsoft.DotNet.PackageValidation.Tests.csproj
+++ b/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
@@ -8,10 +8,13 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
     <PackageReference Include="NuGet.Frameworks" Version="$(NuGetVersion)" />
+    <PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />
+    <!-- Remove when targeting >= net5.0. -->
+    <PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj" />
+    <ProjectReference Include="..\Microsoft.DotNet.PackageTesting\Microsoft.DotNet.PackageTesting.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.DotNet.PackageTesting/GetCompatiblePackageTargetFrameworks.cs b/src/Microsoft.DotNet.PackageTesting/GetCompatiblePackageTargetFrameworks.cs
new file mode 100644
index 00000000000..4fa94bfe4c8
--- /dev/null
+++ b/src/Microsoft.DotNet.PackageTesting/GetCompatiblePackageTargetFrameworks.cs
@@ -0,0 +1,123 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.DotNet.Build.Tasks;
+using NuGet.Frameworks;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.DotNet.PackageTesting
+{
+    public class GetCompatiblePackageTargetFrameworks : BuildTask
+    {
+        private static List<NuGetFramework> allTargetFrameworks = new();
+        private static Dictionary<NuGetFramework, HashSet<NuGetFramework>> packageTfmMapping = new();
+
+        [Required]
+        public string[] PackagePaths { get; set; }
+
+        [Required]
+        public string SupportedTestFrameworks { get; set; }
+
+        [Output]
+        public ITaskItem[] TestProjects { get; set; }
+
+        public override bool Execute()
+        {
+            List<ITaskItem> testProjects = new();
+
+            try
+            {
+                Initialize(SupportedTestFrameworks);
+                string minDotnetTargetFramework = allTargetFrameworks.Where(t => t.Framework == ".NETCoreApp")
+                    .OrderBy(t => t.Version)
+                    .FirstOrDefault()?
+                    .GetShortFolderName();
+
+                foreach (var packagePath in PackagePaths)
+                {
+                    Package package = NupkgParser.CreatePackageObject(packagePath);
+
+                    IEnumerable<NuGetFramework> testFrameworks = GetTestFrameworks(package, minDotnetTargetFramework);
+                    testProjects.AddRange(CreateItemFromTestFramework(package.PackageId, package.Version, testFrameworks));
+                }
+
+                // Removing empty items.
+                TestProjects = testProjects.Where(tfm => tfm.ItemSpec != "").ToArray();
+            }
+            catch (Exception e)
+            {
+                Log.LogErrorFromException(e, showStackTrace: false);
+            }
+
+            return !Log.HasLoggedErrors;
+        }
+
+        public static IEnumerable<NuGetFramework> GetTestFrameworks(Package package, string minDotnetTargetFramework)
+        {
+            List<NuGetFramework> frameworksToTest= new();
+            IEnumerable<NuGetFramework> packageTargetFrameworks = package.FrameworksInPackage;
+
+            // Testing the package installation on all tfms linked with package targetframeworks.
+            foreach (var item in packageTargetFrameworks)
+            {
+                if (packageTfmMapping.ContainsKey(item))
+                {
+                    frameworksToTest.AddRange(packageTfmMapping[item]);
+                }
+
+                // Adding the frameworks in the packages to the test matrix.
+                frameworksToTest.Add(item);
+            }
+
+            if (!string.IsNullOrEmpty(minDotnetTargetFramework) && frameworksToTest.Any(t => t.Framework == ".NETStandard"))
+            {
+                frameworksToTest.Add(NuGetFramework.Parse(minDotnetTargetFramework));
+            }
+
+            return frameworksToTest.Where(tfm => allTargetFrameworks.Contains(tfm)).Distinct();
+        }
+
+        public static void Initialize(string targetFrameworks)
+        {
+            // Defining the set of known frameworks that we care to test
+            foreach (var tfm in targetFrameworks.Split(';'))
+            {
+                allTargetFrameworks.Add(NuGetFramework.Parse(tfm));
+            }
+
+            // creating a map framework in package => frameworks to test based on default compatibilty mapping.
+            foreach (var item in DefaultFrameworkMappings.Instance.CompatibilityMappings)
+            {
+                NuGetFramework forwardTfm = item.SupportedFrameworkRange.Max;
+                NuGetFramework reverseTfm = item.TargetFrameworkRange.Min;
+                if (packageTfmMapping.ContainsKey(forwardTfm))
+                {
+                    packageTfmMapping[forwardTfm].Add(reverseTfm);
+                }
+                else
+                {
+                    packageTfmMapping.Add(forwardTfm, new HashSet<NuGetFramework> { reverseTfm });
+                }
+            }
+        }
+
+        private static List<ITaskItem> CreateItemFromTestFramework(string packageId, string version, IEnumerable<NuGetFramework> testFrameworks)
+        {
+            List<ITaskItem> testprojects = new();
+            foreach (var framework in testFrameworks)
+            {
+                TaskItem supportedPackage = new(packageId);
+                supportedPackage.SetMetadata("Version", version);
+                supportedPackage.SetMetadata("TargetFramework", framework.ToString());
+                supportedPackage.SetMetadata("TargetFrameworkShort", framework.GetShortFolderName());
+                testprojects.Add(supportedPackage);
+            }
+
+            return testprojects;
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
similarity index 90%
rename from src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
rename to src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
index 2f35e4aa96f..824dc8b66c1 100644
--- a/src/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
+++ b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
-    <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworks>
     <PackageType>MSBuildSdk</PackageType>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsPackable>true</IsPackable>
diff --git a/src/Microsoft.DotNet.PackageTesting/NupkgParser.cs b/src/Microsoft.DotNet.PackageTesting/NupkgParser.cs
new file mode 100644
index 00000000000..d2d94dd9790
--- /dev/null
+++ b/src/Microsoft.DotNet.PackageTesting/NupkgParser.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using System.Collections.Generic;
+using NuGet.Frameworks;
+using NuGet.Packaging;
+
+namespace Microsoft.DotNet.PackageTesting
+{
+    class NupkgParser
+    {
+        public static Package CreatePackageObject(string packagePath)
+        {
+            PackageArchiveReader nupkgReader = new(packagePath);
+            NuspecReader nuspecReader = nupkgReader.NuspecReader;
+
+            string packageId = nuspecReader.GetId();
+            string version = nuspecReader.GetVersion().ToString();
+
+            NuGetFramework[] dependencyFrameworks = nuspecReader.GetDependencyGroups()
+                .Select(dg => dg.TargetFramework)
+                .Where(tfm => tfm != null)
+                .ToArray();
+            IEnumerable<string> files = nupkgReader.GetFiles()?.Where(t => t.EndsWith(packageId + ".dll"));
+
+            return new Package(packageId, version, files, dependencyFrameworks);
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.PackageTesting/Package.cs b/src/Microsoft.DotNet.PackageTesting/Package.cs
new file mode 100644
index 00000000000..3c6b7a1b845
--- /dev/null
+++ b/src/Microsoft.DotNet.PackageTesting/Package.cs
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using NuGet.Client;
+using NuGet.ContentModel;
+using NuGet.Frameworks;
+
+namespace Microsoft.DotNet.PackageTesting
+{
+    public class Package
+    {
+        public IEnumerable<NuGetFramework> FrameworksInPackage { get; }
+        public string PackageId { get; }
+        public string Version { get; }
+
+        public Package(string packageId, string version, IEnumerable<string> packageAssetPaths, IEnumerable<NuGetFramework> dependencyFrameworks)
+        {
+            PackageId = packageId;
+            Version = version;
+
+            ContentItemCollection packageAssets = new();
+            packageAssets.Load(packageAssetPaths);
+            ManagedCodeConventions conventions = new(null);
+
+            IEnumerable<ContentItem> RefAssets = packageAssets.FindItems(conventions.Patterns.CompileRefAssemblies);
+            IEnumerable<ContentItem> LibAssets = packageAssets.FindItems(conventions.Patterns.CompileLibAssemblies);
+            IEnumerable<ContentItem> CompileAssets = RefAssets.Any() ? RefAssets : LibAssets;
+            List<NuGetFramework> FrameworksInPackageList = CompileAssets.Select(t => (NuGetFramework)t.Properties["tfm"]).ToList();
+
+            IEnumerable<ContentItem> RuntimeAssets = packageAssets.FindItems(conventions.Patterns.RuntimeAssemblies);
+            FrameworksInPackageList.AddRange(RuntimeAssets.Select(t => (NuGetFramework)t.Properties["tfm"]).Distinct());
+            FrameworksInPackageList.AddRange(dependencyFrameworks);
+            FrameworksInPackage = FrameworksInPackageList.Distinct();
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/VerifyClosure.cs b/src/Microsoft.DotNet.PackageTesting/VerifyClosure.cs
similarity index 98%
rename from src/Microsoft.DotNet.Build.Tasks.Packaging/src/VerifyClosure.cs
rename to src/Microsoft.DotNet.PackageTesting/VerifyClosure.cs
index 8182b27a985..f64f2bf9347 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/VerifyClosure.cs
+++ b/src/Microsoft.DotNet.PackageTesting/VerifyClosure.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Build.Framework;
+using Microsoft.DotNet.Build.Tasks;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -12,7 +13,7 @@
 using System.Text;
 using System.Xml.Linq;
 
-namespace Microsoft.DotNet.Build.Tasks.Packaging
+namespace Microsoft.DotNet.PackageTesting
 {
     /// <summary>
     /// Verifies the closure of a set of DLLs, making sure all files are present and no cycles exist
@@ -125,7 +126,9 @@ private void AddSourceFile(string file)
 
         private void LoadIgnoredReferences()
         {
-            foreach (var ignoredReference in IgnoredReferences.NullAsEmpty())
+            if (IgnoredReferences == null || IgnoredReferences.Length == 0) return;
+        
+            foreach (var ignoredReference in IgnoredReferences)
             {
                 var name = ignoredReference.ItemSpec;
                 var versionString = ignoredReference.GetMetadata("Version");
@@ -173,9 +176,9 @@ void CheckDependencies(Stack<AssemblyInfo> depStack)
             AssemblyInfo assm = depStack.Peek();
 
             // check module references
-            if (assm.State == CheckState.Unchecked && CheckModuleReferences)
+            if (assm.State == CheckState.Unchecked && CheckModuleReferences && assm.ModuleReferences != null)
             {
-                foreach(var moduleReference in assm.ModuleReferences.NullAsEmpty())
+                foreach(var moduleReference in assm.ModuleReferences)
                 {
                     if (ShouldIgnore(moduleReference))
                     {
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/VerifyTypes.cs b/src/Microsoft.DotNet.PackageTesting/VerifyTypes.cs
similarity index 97%
rename from src/Microsoft.DotNet.Build.Tasks.Packaging/src/VerifyTypes.cs
rename to src/Microsoft.DotNet.PackageTesting/VerifyTypes.cs
index 02e8b16a160..772a766b275 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/VerifyTypes.cs
+++ b/src/Microsoft.DotNet.PackageTesting/VerifyTypes.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Build.Framework;
+using Microsoft.DotNet.Build.Tasks;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,14 +10,13 @@
 using System.Reflection.Metadata;
 using System.Reflection.PortableExecutable;
 
-namespace Microsoft.DotNet.Build.Tasks.Packaging
+namespace Microsoft.DotNet.PackageTesting
 {
     /// <summary>
     /// Verifies no type overlap in a set of DLLs
     /// </summary>
     public class VerifyTypes : BuildTask
     {
-
         /// <summary>
         /// Sources to scan.  Items can be directories or files.
         /// </summary>
@@ -124,7 +124,9 @@ private void AddSourceFile(string file)
 
         private void LoadIgnoredTypes()
         {
-            foreach(var ignoredType in IgnoredTypes.NullAsEmpty())
+            if (IgnoredTypes == null || IgnoredTypes.Length == 0) return;
+
+            foreach(var ignoredType in IgnoredTypes)
             {
                 ignoredTypes.Add(ignoredType.ItemSpec);
             }
diff --git a/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props b/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props
new file mode 100644
index 00000000000..f568f711c5e
--- /dev/null
+++ b/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props
@@ -0,0 +1,29 @@
+<Project>
+  <PropertyGroup>
+    <DotNetPackageTestingAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.PackageTesting.dll</DotNetPackageTestingAssembly>
+    <DotNetPackageTestingAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.PackageTesting.dll</DotNetPackageTestingAssembly>
+  </PropertyGroup>
+
+  <UsingTask TaskName="GetCompatiblePackageTargetFrameworks" AssemblyFile="$(DotNetPackageTestingAssembly)" />
+  <UsingTask TaskName="VerifyClosure" AssemblyFile="$(DotNetPackageTestingAssembly)" />
+  <UsingTask TaskName="VerifyTypes" AssemblyFile="$(DotNetPackageTestingAssembly)"/>
+
+  <ItemGroup>
+    <SupportedTestFramework Include="netcoreapp3.1" />
+    <SupportedTestFramework Include="net5.0" />
+    <SupportedTestFramework Include="net6.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <SupportedTestFramework Include="netstandard2.0" />
+    <SupportedTestFramework Include="netstandard2.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <SupportedTestFramework Include="net461" />
+    <SupportedTestFramework Include="net462" />
+    <SupportedTestFramework Include="net471" />
+    <SupportedTestFramework Include="net472" />
+    <SupportedTestFramework Include="net48" />
+  </ItemGroup>
+</Project>
diff --git a/src/Microsoft.DotNet.PackageValidation.Tests/GetCompatibilePackageTargetFrameworksTests.cs b/src/Microsoft.DotNet.PackageValidation.Tests/GetCompatibilePackageTargetFrameworksTests.cs
deleted file mode 100644
index fa37f0ad158..00000000000
--- a/src/Microsoft.DotNet.PackageValidation.Tests/GetCompatibilePackageTargetFrameworksTests.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using NuGet.Frameworks;
-using System.Collections.Generic;
-using Xunit;
-
-namespace Microsoft.DotNet.PackageValidation.Tests
-{
-    public class GetCompatibilePackageTargetFrameworksTests
-    {
-        public GetCompatibilePackageTargetFrameworksTests()
-        {
-            GetCompatiblePackageTargetFrameworks.Initialize();
-        }
-
-        public static IEnumerable<object[]> PackageTFMData => new List<object[]>
-        {
-            // single target framework in package
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetStandard20}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetStandard20, FrameworkConstants.CommonFrameworks.NetCoreApp20, FrameworkConstants.CommonFrameworks.Net463, FrameworkConstants.CommonFrameworks.Net461, FrameworkConstants.CommonFrameworks.Net462} },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp20}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp20} },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp21}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp21} },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.Net461}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.Net461} },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.Net45}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.Net45} },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp30}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp30} },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp31}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp31} },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetStandard21}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetStandard21, FrameworkConstants.CommonFrameworks.NetCoreApp30 } },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetStandard12}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetStandard12, FrameworkConstants.CommonFrameworks.Net451 } },
-
-            // two target frameworks in package
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetStandard20, FrameworkConstants.CommonFrameworks.Net461}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetStandard20, FrameworkConstants.CommonFrameworks.NetCoreApp20, FrameworkConstants.CommonFrameworks.Net463, FrameworkConstants.CommonFrameworks.Net461, FrameworkConstants.CommonFrameworks.Net462} },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetStandard20, FrameworkConstants.CommonFrameworks.NetCoreApp30}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetStandard20, FrameworkConstants.CommonFrameworks.NetCoreApp30, FrameworkConstants.CommonFrameworks.NetCoreApp20, FrameworkConstants.CommonFrameworks.Net463, FrameworkConstants.CommonFrameworks.Net461, FrameworkConstants.CommonFrameworks.Net462} },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp30, FrameworkConstants.CommonFrameworks.Net461}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp30, FrameworkConstants.CommonFrameworks.Net461} },
-            new object[] {  new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp30, FrameworkConstants.CommonFrameworks.Net50}, new List<NuGetFramework> { FrameworkConstants.CommonFrameworks.NetCoreApp30, FrameworkConstants.CommonFrameworks.Net50} },
-        };
-
-        [Theory]
-        [MemberData(nameof(PackageTFMData))]
-        public void GetCompatibleFrameworks(List<NuGetFramework> packageFrameworks, List<NuGetFramework> expectedTestFrameworks)
-        {
-            List<NuGetFramework> actualTestFrameworks = GetCompatiblePackageTargetFrameworks.GetTestFrameworks(packageFrameworks);
-            CollectionsEqual(expectedTestFrameworks, actualTestFrameworks);
-        }
-
-        private static void CollectionsEqual<T>(IEnumerable<T> T1, IEnumerable<T> T2)
-        {
-            foreach (var item in T1)
-            {
-                Assert.Contains(item, T2);
-            }
-            foreach (var item in T2)
-            {
-                Assert.Contains(item, T1);
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs b/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs
deleted file mode 100644
index 4a8bc4377ea..00000000000
--- a/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.DotNet.Build.Tasks;
-using NuGet.Frameworks;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.DotNet.PackageValidation
-{
-    public class GetCompatiblePackageTargetFrameworks : BuildTask
-    {
-        private static List<NuGetFramework> allTargetFrameworks = allTargetFrameworks = new();
-        private static Dictionary<NuGetFramework, HashSet<NuGetFramework>> packageTfmMapping = new();
-
-        [Required]
-        public string[] PackagePaths { get; set; }
-
-        [Output]
-        public ITaskItem[] TestProjects { get; set; }
-
-        public override bool Execute()
-        {
-            bool result = true;
-            List<ITaskItem> testProjects = new List<ITaskItem>();
-
-            try
-            {
-                Initialize();
-                foreach (var packagePath in PackagePaths)
-                {
-                    Package package = NupkgParser.CreatePackageObject(packagePath);
-                    List<NuGetFramework> packageTargetFrameworks = package.PackageAssets.Where(t => t.AssetType != AssetType.RuntimeAsset).Select(t => t.TargetFramework).Distinct().ToList();
-
-                    List<NuGetFramework> frameworksToTest = GetTestFrameworks(packageTargetFrameworks);
-                    testProjects.AddRange(CreateItemFromTestFramework(package.Title, package.Version, frameworksToTest, GetRidsFromPackage(package)));
-                }
-                
-                // Removing empty items.
-                TestProjects = testProjects.Where(tfm => tfm.ItemSpec != "").ToArray();
-            }
-            catch (Exception e)
-            {
-                Log.LogErrorFromException(e, showStackTrace: false);
-            }
-            
-            return result && !Log.HasLoggedErrors;
-        }
-
-        public static List<NuGetFramework> GetTestFrameworks(List<NuGetFramework> packageTargetFrameworks)
-        {
-            List<NuGetFramework> frameworksToTest = new List<NuGetFramework>();
-
-            // Testing the package installation on all tfms linked with package targetframeworks.
-            foreach (var item in packageTargetFrameworks)
-            {
-                if (packageTfmMapping.ContainsKey(item))
-                    frameworksToTest.AddRange(packageTfmMapping[item].ToList());
-            }
-
-            // Pruning the test matrix by removing the frameworks we dont want to test.
-            frameworksToTest = frameworksToTest.Where(tfm => allTargetFrameworks.Contains(tfm)).ToList();
-
-            // Adding the frameworks in the packages to the test matrix;
-            frameworksToTest.AddRange(packageTargetFrameworks);
-            frameworksToTest = frameworksToTest.Distinct().ToList();
-            return frameworksToTest;
-        }
-
-        public static void Initialize()
-        {
-            // Defining the set of known frameworks that we care to test
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetCoreApp20);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetCoreApp21);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetCoreApp30);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetCoreApp31);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.Net50);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.Net45);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.Net451);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.Net452);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.Net46);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.Net461);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.Net462);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.Net463);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetStandard10);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetStandard11);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetStandard12);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetStandard13);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetStandard14);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetStandard15);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetStandard16);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetStandard17);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetStandard20);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.NetStandard21);
-            allTargetFrameworks.Add(FrameworkConstants.CommonFrameworks.UAP10);
-
-            // creating a map framework in package => frameworks to test based on default compatibilty mapping.
-            foreach (var item in DefaultFrameworkMappings.Instance.CompatibilityMappings)
-            {
-                NuGetFramework forwardTfm = item.SupportedFrameworkRange.Max;
-                NuGetFramework reverseTfm = item.TargetFrameworkRange.Min;
-                if (packageTfmMapping.ContainsKey(forwardTfm))
-                {
-                    packageTfmMapping[forwardTfm].Add(reverseTfm);
-                }
-                else
-                {
-                    packageTfmMapping.Add(forwardTfm, new HashSet<NuGetFramework> { reverseTfm });
-                }
-            }
-        }
-    
-        public List<ITaskItem> CreateItemFromTestFramework(string title, string version, List<NuGetFramework> testFrameworks, string rids)
-        {
-            List<ITaskItem> testprojects = new List<ITaskItem>();
-            foreach (var framework in testFrameworks)
-            {
-                var supportedPackage = new TaskItem(title);
-                supportedPackage.SetMetadata("Version", version);
-                supportedPackage.SetMetadata("TargetFramework", framework.ToString());
-                supportedPackage.SetMetadata("TargetFrameworkShort", framework.GetShortFolderName());
-
-                if (!String.IsNullOrEmpty(rids))
-                {
-                    supportedPackage.SetMetadata("RuntimeIdentifiers", rids);
-                }
-                testprojects.Add(supportedPackage);
-            }
-
-            return testprojects;
-        }
-    
-        public string GetRidsFromPackage(Package package)
-        {
-            List<string> rids = new List<string>();
-            foreach (var item in package.PackageAssets)
-            {
-                if (item.AssetType == AssetType.RuntimeAsset)
-                {
-                    string testRid = item.Rid;
-                    string testArch = "-x64";
-                    if (testRid == "unix")
-                    {
-                        if (!rids.Contains("linux" + testArch))
-                            rids.Add("linux" + testArch);
-                        
-                        if (!rids.Contains("osx" + testArch))
-                            rids.Add("osx" + testArch);
-                    }
-                    else
-                    {
-                        if (!rids.Contains(testRid + testArch))
-                            rids.Add(testRid + testArch);
-                    }             
-                }
-            }
-            return string.Join(";", rids);
-        }
-    }    
-}
diff --git a/src/Microsoft.DotNet.PackageValidation/NupkgParser.cs b/src/Microsoft.DotNet.PackageValidation/NupkgParser.cs
deleted file mode 100644
index 77d73bb0c69..00000000000
--- a/src/Microsoft.DotNet.PackageValidation/NupkgParser.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using NuGet.Frameworks;
-using NuGet.Packaging;
-using NuGet.Packaging.Core;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.DotNet.PackageValidation
-{
-    public class NupkgParser
-    {
-        public static Package CreatePackageObject(string packagePath)
-        {
-            List<PackageAsset> packageAssets = new List<PackageAsset>();
-            Dictionary<NuGetFramework, List<PackageDependency>> packageDependencies = new Dictionary<NuGetFramework, List<PackageDependency>>();
-             
-            PackageArchiveReader nupkgReader = new PackageArchiveReader(packagePath);
-            NuspecReader nuspecReader = nupkgReader.NuspecReader;
-
-            string title = nuspecReader.GetTitle();
-            string version = nuspecReader.GetVersion().ToString();
-            IEnumerable<PackageDependencyGroup> dependencyGroups = nuspecReader.GetDependencyGroups();
-
-            foreach (var item in dependencyGroups)
-            {
-                packageDependencies.Add(item.TargetFramework, item.Packages.ToList());
-            }
-
-            var files = nupkgReader.GetFiles().ToList().Where(t => t.EndsWith(".dll")).Where(t => t.Contains(title + ".dll"));
-            foreach (var file in files)
-            {
-                packageAssets.Add(ExtractAssetFromFile(file));
-            }
-
-            return new Package(title, version, packageAssets, packageDependencies);
-        }
-
-        public static PackageAsset ExtractAssetFromFile(string filePath)
-        {
-            PackageAsset asset = null;
-            if (filePath.StartsWith("ref"))
-            {
-                var stringParts = filePath.Split('/');
-                asset = new PackageAsset(NuGetFramework.Parse(stringParts[1]), null, filePath, AssetType.RefAsset);
-            }
-            else if (filePath.StartsWith("lib"))
-            {
-                var stringParts = filePath.Split('/');
-                asset = new PackageAsset(NuGetFramework.Parse(stringParts[1]), null, filePath, AssetType.LibAsset);
-
-            }
-            else if (filePath.StartsWith("runtimes"))
-            {
-                var stringParts = filePath.Split('/');
-                asset = new PackageAsset(NuGetFramework.Parse(stringParts[3]), stringParts[1], filePath, AssetType.RuntimeAsset);
-            }
-
-            return asset;
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.PackageValidation/Package.cs b/src/Microsoft.DotNet.PackageValidation/Package.cs
deleted file mode 100644
index c24624de1dd..00000000000
--- a/src/Microsoft.DotNet.PackageValidation/Package.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using NuGet.Frameworks;
-using NuGet.Packaging.Core;
-using System.Collections.Generic;
-
-namespace Microsoft.DotNet.PackageValidation
-{
-    public class Package
-    {
-        public List<PackageAsset> PackageAssets { get; set; }
-        public string Title { get; set; }
-        public string Version { get; set; }
-        public Dictionary<NuGetFramework, List<PackageDependency>> PackageDependencies { get; set; }
-        public Package(string title, string version, List<PackageAsset> packageAssets, Dictionary<NuGetFramework, List<PackageDependency>> packageDependencies)
-        {
-            Title = title;
-            Version = version;
-            PackageAssets = packageAssets;
-            PackageDependencies = packageDependencies;
-        }
-    }
-}
diff --git a/src/Microsoft.DotNet.PackageValidation/PackageAsset.cs b/src/Microsoft.DotNet.PackageValidation/PackageAsset.cs
deleted file mode 100644
index b5eff60fea3..00000000000
--- a/src/Microsoft.DotNet.PackageValidation/PackageAsset.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using NuGet.Frameworks;
-
-namespace Microsoft.DotNet.PackageValidation
-{
-    public class PackageAsset
-    {
-        public NuGetFramework TargetFramework { get; set; }
-        public string Rid { get; set; }
-        public string PackagePath { get; set; }
-        public AssetType AssetType { get; set; }
-
-        public PackageAsset(NuGetFramework targetFramework, string runtimeIdentifier, string packagePath, AssetType assetType)
-        {
-            TargetFramework = targetFramework;
-            Rid = runtimeIdentifier;
-            PackagePath = packagePath;
-            AssetType = assetType;
-        }
-    }
-
-    public enum AssetType
-    {
-        RefAsset = 0,
-        LibAsset = 1,
-        RuntimeAsset = 2
-    }
-}
diff --git a/src/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.props b/src/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.props
deleted file mode 100644
index 08703d1bd38..00000000000
--- a/src/Microsoft.DotNet.PackageValidation/build/Microsoft.DotNet.PackageValidation.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <DotNetPackageValidationAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.PackageValidation.dll</DotNetPackageValidationAssembly>
-    <DotNetPackageValidationAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.PackageValidation.dll</DotNetPackageValidationAssembly>
-  </PropertyGroup>
-</Project>
diff --git a/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj b/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj
index 4665c0973dd..8da0c48f81d 100644
--- a/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj
+++ b/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <!-- On .NET Framework and .NET Core we use this assembly as both a library and as an executable. -->
     <OutputType>Exe</OutputType>
+    <!-- Since RemoteExecutor is a standalone library, we can target a lower version of .NET than the rest of arcade. -->
     <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
     <Description>This package provides support for running tests out-of-process.</Description>
     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
diff --git a/src/Microsoft.DotNet.RemoteExecutor/src/Program.cs b/src/Microsoft.DotNet.RemoteExecutor/src/Program.cs
index c5708bda243..6eb7775f461 100644
--- a/src/Microsoft.DotNet.RemoteExecutor/src/Program.cs
+++ b/src/Microsoft.DotNet.RemoteExecutor/src/Program.cs
@@ -41,7 +41,7 @@ private static int Main(string[] args)
             Type t = null;
             MethodInfo mi = null;
             object instance = null;
-            int exitCode = 0;
+            int exitCode = RemoteExecutor.SuccessExitCode;
             try
             {
                 // Create the test class if necessary
diff --git a/src/Microsoft.DotNet.RemoteExecutor/src/RemoteExecutor.cs b/src/Microsoft.DotNet.RemoteExecutor/src/RemoteExecutor.cs
index 0674423d61d..42a7ff81e10 100644
--- a/src/Microsoft.DotNet.RemoteExecutor/src/RemoteExecutor.cs
+++ b/src/Microsoft.DotNet.RemoteExecutor/src/RemoteExecutor.cs
@@ -10,6 +10,7 @@
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Xunit;
+using IOPath = System.IO.Path;
 
 namespace Microsoft.DotNet.RemoteExecutor
 {
@@ -51,17 +52,44 @@ static RemoteExecutor()
                 return;
             }
 
-            HostRunnerName = System.IO.Path.GetFileName(processFileName);
             Path = typeof(RemoteExecutor).Assembly.Location;
 
             if (IsNetCore())
             {
                 HostRunner = processFileName;
+
+                string hostName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "dotnet.exe" : "dotnet";
+
+                // Partially addressing https://github.com/dotnet/arcade/issues/6371
+                // We expect to run tests with dotnet. However in certain scenarios we may have a different apphost (e.g. Visual Studio testhost).
+                // Attempt to find and use dotnet.
+                if (!IOPath.GetFileName(HostRunner).Equals(hostName, StringComparison.OrdinalIgnoreCase))
+                {
+                    string runtimePath = IOPath.GetDirectoryName(typeof(object).Assembly.Location);
+
+                    // In case we are running the app via a runtime, dotnet.exe is located 3 folders above the runtime. Example:
+                    // runtime    ->  C:\Program Files\dotnet\shared\Microsoft.NETCore.App\5.0.6\
+                    // dotnet.exe ->  C:\Program Files\dotnet\shared\dotnet.exe
+                    // This should also work on Unix and locally built runtime/testhost.
+                    string directory = GetDirectoryName(GetDirectoryName(GetDirectoryName(runtimePath)));
+                    if (directory != string.Empty)
+                    {
+                        string dotnetExe = IOPath.Combine(directory, hostName);
+                        if (File.Exists(dotnetExe))
+                        {
+                            HostRunner = dotnetExe;
+                        }
+                    }
+                }
             }
             else if (RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase))
             {
                 HostRunner = Path;
             }
+
+            HostRunnerName = IOPath.GetFileName(HostRunner);
+
+            static string GetDirectoryName(string path) => string.IsNullOrEmpty(path) ? string.Empty : IOPath.GetDirectoryName(path);
         }
 
         private static bool IsNetCore() =>
@@ -72,6 +100,7 @@ private static bool IsNetCore() =>
             !RuntimeInformation.IsOSPlatform(OSPlatform.Create("IOS")) &&
             !RuntimeInformation.IsOSPlatform(OSPlatform.Create("ANDROID")) &&
             !RuntimeInformation.IsOSPlatform(OSPlatform.Create("TVOS")) &&
+            !RuntimeInformation.IsOSPlatform(OSPlatform.Create("MACCATALYST")) &&
             !RuntimeInformation.IsOSPlatform(OSPlatform.Create("WATCHOS")) &&
             !RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER")) &&
             // The current RemoteExecutor design is not compatible with single file
@@ -82,10 +111,6 @@ private static bool IsNetCore() =>
         /// <param name="options">Options to use for the invocation.</param>
         public static RemoteInvokeHandle Invoke(Action method, RemoteInvokeOptions options = null)
         {
-            // There's no exit code to check
-            options = options ?? new RemoteInvokeOptions();
-            options.CheckExitCode = false;
-
             return Invoke(GetMethodInfo(method), Array.Empty<string>(), options);
         }
 
@@ -95,10 +120,6 @@ public static RemoteInvokeHandle Invoke(Action method, RemoteInvokeOptions optio
         /// <param name="options">Options to use for the invocation.</param>
         public static RemoteInvokeHandle Invoke(Action<string> method, string arg, RemoteInvokeOptions options = null)
         {
-            // There's no exit code to check
-            options = options ?? new RemoteInvokeOptions();
-            options.CheckExitCode = false;
-
             return Invoke(GetMethodInfo(method), new[] { arg }, options);
         }
 
@@ -108,10 +129,6 @@ public static RemoteInvokeHandle Invoke(Action<string> method, string arg, Remot
         public static RemoteInvokeHandle Invoke(Action<string, string> method, string arg1, string arg2,
             RemoteInvokeOptions options = null)
         {
-            // There's no exit code to check
-            options = options ?? new RemoteInvokeOptions();
-            options.CheckExitCode = false;
-
             return Invoke(GetMethodInfo(method), new[] { arg1, arg2 }, options);
         }
 
@@ -121,10 +138,6 @@ public static RemoteInvokeHandle Invoke(Action<string, string> method, string ar
         public static RemoteInvokeHandle Invoke(Action<string, string, string> method, string arg1, string arg2,
             string arg3, RemoteInvokeOptions options = null)
         {
-            // There's no exit code to check
-            options = options ?? new RemoteInvokeOptions();
-            options.CheckExitCode = false;
-
             return Invoke(GetMethodInfo(method), new[] { arg1, arg2, arg3 }, options);
         }
 
@@ -134,10 +147,6 @@ public static RemoteInvokeHandle Invoke(Action<string, string, string> method, s
         public static RemoteInvokeHandle Invoke(Action<string, string, string, string> method, string arg1,
             string arg2, string arg3, string arg4, RemoteInvokeOptions options = null)
         {
-            // There's no exit code to check
-            options = options ?? new RemoteInvokeOptions();
-            options.CheckExitCode = false;
-
             return Invoke(GetMethodInfo(method), new[] { arg1, arg2, arg3, arg4 }, options);
         }
 
@@ -187,10 +196,6 @@ public static RemoteInvokeHandle Invoke(Func<string, string, string, Task<int>>
         /// <param name="options">Options to use for the invocation.</param>
         public static RemoteInvokeHandle Invoke(Func<Task> method, RemoteInvokeOptions options = null)
         {
-            // There's no exit code to check
-            options = options ?? new RemoteInvokeOptions();
-            options.CheckExitCode = false;
-
             return Invoke(GetMethodInfo(method), Array.Empty<string>(), options);
         }
 
@@ -201,10 +206,6 @@ public static RemoteInvokeHandle Invoke(Func<Task> method, RemoteInvokeOptions o
         public static RemoteInvokeHandle Invoke(Func<string, Task> method, string arg,
             RemoteInvokeOptions options = null)
         {
-            // There's no exit code to check
-            options = options ?? new RemoteInvokeOptions();
-            options.CheckExitCode = false;
-
             return Invoke(GetMethodInfo(method), new[] { arg }, options);
         }
 
@@ -216,10 +217,6 @@ public static RemoteInvokeHandle Invoke(Func<string, Task> method, string arg,
         public static RemoteInvokeHandle Invoke(Func<string, string, Task> method, string arg1, string arg2,
             RemoteInvokeOptions options = null)
         {
-            // There's no exit code to check
-            options = options ?? new RemoteInvokeOptions();
-            options.CheckExitCode = false;
-
             return Invoke(GetMethodInfo(method), new[] { arg1, arg2 }, options);
         }
 
@@ -232,10 +229,6 @@ public static RemoteInvokeHandle Invoke(Func<string, string, Task> method, strin
         public static RemoteInvokeHandle Invoke(Func<string, string, string, Task> method, string arg1,
             string arg2, string arg3, RemoteInvokeOptions options = null)
         {
-            // There's no exit code to check
-            options = options ?? new RemoteInvokeOptions();
-            options.CheckExitCode = false;
-
             return Invoke(GetMethodInfo(method), new[] { arg1, arg2, arg3 }, options);
         }
 
diff --git a/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj b/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj
index 75c2b5bdfc5..207a463532f 100644
--- a/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj
+++ b/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <LangVersion>Latest</LangVersion>
     <SignAssembly>false</SignAssembly>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.DotNet.RemoteExecutor.csproj" />
diff --git a/src/Microsoft.DotNet.RemoteExecutor/tests/RemoteExecutorTests.cs b/src/Microsoft.DotNet.RemoteExecutor/tests/RemoteExecutorTests.cs
index d2237d1c2b9..89c5039954e 100644
--- a/src/Microsoft.DotNet.RemoteExecutor/tests/RemoteExecutorTests.cs
+++ b/src/Microsoft.DotNet.RemoteExecutor/tests/RemoteExecutorTests.cs
@@ -1,17 +1,25 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.DotNet.RemoteExecutor;
+using System;
 using System.Threading.Tasks;
-
 using Xunit;
-using Xunit.Abstractions;
 using Xunit.Sdk;
 
 namespace Microsoft.DotNet.RemoteExecutor.Tests
 {
     public class RemoteExecutorTests
     {
+        [Fact]
+        public void Action()
+        {
+            RemoteInvokeHandle h = RemoteExecutor.Invoke(() => { }, new RemoteInvokeOptions { RollForward = "Major" });
+            using (h)
+            {
+                Assert.Equal(RemoteExecutor.SuccessExitCode, h.ExitCode);
+            }
+        }
+
         [Fact]
         public void AsyncAction_ThrowException()
         {
@@ -27,10 +35,14 @@ public void AsyncAction_ThrowException()
         [Fact]
         public void AsyncAction()
         {
-            RemoteExecutor.Invoke(async () =>
+            RemoteInvokeHandle h = RemoteExecutor.Invoke(async () =>
             {
                 await Task.Delay(1);
-            }, new RemoteInvokeOptions { RollForward = "Major" }).Dispose();
+            }, new RemoteInvokeOptions { RollForward = "Major" });
+            using (h)
+            {
+                Assert.Equal(RemoteExecutor.SuccessExitCode, h.ExitCode);
+            }
         }
 
         [Fact]
@@ -67,5 +79,72 @@ public void AsyncFunc_NoThrow_ValidReturnCode()
                 return RemoteExecutor.SuccessExitCode;
             }, new RemoteInvokeOptions { RollForward = "Major" }).Dispose();
         }
+
+        [Fact]
+        public static void AsyncAction_FatalError_AV()
+        {
+            // Invocation should report as failing on AV
+            Assert.Throws<TrueException>(() =>
+                RemoteExecutor.Invoke(async () =>
+                {
+                    await Task.Delay(1);
+                    unsafe
+                    {
+                        *(int*)0x10000 = 0;
+                    }
+                }, new RemoteInvokeOptions { RollForward = "Major" }).Dispose()
+            );
+        }
+
+        [Fact]
+        public static void AsyncAction_FatalError_Runtime()
+        {
+            // Invocation should report as failing on fatal runtime error
+            Assert.Throws<TrueException>(() =>
+                RemoteExecutor.Invoke(async () =>
+                {
+                    await Task.Delay(1);
+                    System.Runtime.InteropServices.Marshal.StructureToPtr(1, new IntPtr(1), true);
+                }, new RemoteInvokeOptions { RollForward = "Major" }).Dispose()
+            );
+        }
+
+        [Fact]
+        public static unsafe void FatalError_AV()
+        {
+            // Invocation should report as failing on AV
+            Assert.Throws<TrueException>(() =>
+                RemoteExecutor.Invoke(() =>
+                {
+                    *(int*)0x10000 = 0;
+                }, new RemoteInvokeOptions { RollForward = "Major" }).Dispose()
+            );
+        }
+
+        [Fact]
+        public static void FatalError_Runtime()
+        {
+            // Invocation should report as failing on fatal runtime error
+            Assert.Throws<TrueException>(() =>
+                RemoteExecutor.Invoke(() =>
+                {
+                    System.Runtime.InteropServices.Marshal.StructureToPtr(1, new IntPtr(1), true);
+                }, new RemoteInvokeOptions { RollForward = "Major" }).Dispose()
+            );
+        }
+
+        [Fact]
+        public static void IgnoreExitCode()
+        {
+            int exitCode = 1;
+            RemoteInvokeHandle h = RemoteExecutor.Invoke(
+                s => int.Parse(s),
+                exitCode.ToString(),
+                new RemoteInvokeOptions { RollForward = "Major", CheckExitCode = false, ExpectedExitCode = 0 });
+            using(h)
+            {
+                Assert.Equal(exitCode, h.ExitCode);
+            }
+        }
     }
 }
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj
index 4405a1fecaa..9627a033768 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj
@@ -1,7 +1,8 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworks>
     <LangVersion>preview</LangVersion>
     <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
 
@@ -41,8 +42,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.DotNet.Build.Tasks.Packaging\src\VerifyClosure.cs" Link="src/Packaging/VerifyClosure.cs" />
-    <Compile Include="..\Microsoft.DotNet.Build.Tasks.Packaging\src\VerifyTypes.cs" Link="src/Packaging/VerifyTypes.cs" />
+    <Compile Include="..\Microsoft.DotNet.PackageTesting\VerifyClosure.cs" Link="src/Packaging/VerifyClosure.cs" />
+    <Compile Include="..\Microsoft.DotNet.PackageTesting\VerifyTypes.cs" Link="src/Packaging/VerifyTypes.cs" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
index e3c505824d9..deee11c08b3 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
@@ -8,7 +8,9 @@
   -->
 
   <PropertyGroup Condition="'$(DotNetSharedFrameworkTaskDir)' == ''">
-    <DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)../tools/netcoreapp3.1/</DotNetSharedFrameworkTaskDir>
+    <!-- Workaround for https://github.com/dotnet/arcade/issues/7413 -->
+    <DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core' and Exists('$(MSBuildThisFileDirectory)../tools/net6.0/')">$(MSBuildThisFileDirectory)../tools/net6.0/</DotNetSharedFrameworkTaskDir>
+    <DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core' and '$(DotNetSharedFrameworkTaskDir)' == ''">$(MSBuildThisFileDirectory)../tools/netcoreapp3.1/</DotNetSharedFrameworkTaskDir>
     <DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' != 'core'">$(MSBuildThisFileDirectory)../tools/net472/</DotNetSharedFrameworkTaskDir>
   </PropertyGroup>
 
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/CreateFrameworkListFile.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/CreateFrameworkListFile.cs
index 90bd96b13af..68a1af12c73 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/CreateFrameworkListFile.cs
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/CreateFrameworkListFile.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 using Microsoft.DotNet.Build.Tasks;
@@ -88,12 +87,13 @@ public override bool Execute()
                     FileVersion = FileUtilities.GetFileVersion(item.ItemSpec),
                     IsNative = item.GetMetadata("IsNative") == "true",
                     IsSymbolFile = item.GetMetadata("IsSymbolFile") == "true",
+                    IsPgoData = item.GetMetadata("IsPgoData") == "true",
                     IsResourceFile = item.ItemSpec
                         .EndsWith(".resources.dll", StringComparison.OrdinalIgnoreCase)
                 })
                 .Where(f =>
                     !f.IsSymbolFile &&
-                    (f.Filename.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) || f.IsNative))
+                    (f.Filename.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) || f.IsNative || f.IsPgoData))
                 // Remove duplicate files this task is given.
                 .GroupBy(f => f.Item.ItemSpec)
                 .Select(g => g.First())
@@ -111,6 +111,10 @@ public override bool Execute()
                 {
                     type = "Resources";
                 }
+                else if (f.IsPgoData)
+                {
+                    type = "PgoData";
+                }
 
                 string path = Path.Combine(f.TargetPath, f.Filename).Replace('\\', '/');
 
@@ -126,18 +130,53 @@ public override bool Execute()
                     }
                 }
 
+                string analyzerLanguage = null;
+
+                if (path.StartsWith("analyzers/"))
+                {
+                    type = "Analyzer";
+
+                    if (path.EndsWith(".resources.dll"))
+                    {
+                        // omit analyzer resources
+                        continue;
+                    }
+
+                    var pathParts = path.Split('/');
+
+                    if (pathParts.Length < 3 || !pathParts[1].Equals("dotnet", StringComparison.Ordinal) || pathParts.Length > 4)
+                    {
+                        Log.LogError($"Unexpected analyzer path format {path}.  Expected  'analyzers/dotnet(/language)/analyzer.dll");
+                    }
+
+                    if (pathParts.Length > 3)
+                    {
+                        analyzerLanguage = pathParts[2];
+                    }
+                }
+
                 var element = new XElement(
                     "File",
                     new XAttribute("Type", type),
                     new XAttribute("Path", path));
 
+                if (analyzerLanguage != null)
+                {
+                    element.Add(new XAttribute("Language", analyzerLanguage));
+                }
+
                 if (f.IsResourceFile)
                 {
                     element.Add(
                         new XAttribute("Culture", Path.GetFileName(Path.GetDirectoryName(path))));
                 }
 
-                if (f.AssemblyName != null)
+                if (f.IsPgoData)
+                {
+                    // Pgo data is never carried with single file images
+                    element.Add(new XAttribute("DropFromSingleFile", "true"));
+                }
+                else if (f.AssemblyName != null)
                 {
                     byte[] publicKeyToken = f.AssemblyName.GetPublicKeyToken();
                     string publicKeyTokenHex;
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/FileUtilities.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/FileUtilities.cs
index 97ab8b182c8..b8d9348bf98 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/FileUtilities.cs
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/FileUtilities.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromFileList.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromFileList.cs
index 20ea4a12316..2e4ba8dd5a9 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromFileList.cs
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromFileList.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromTemplate.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromTemplate.cs
index fc798d6e028..73f032a2d39 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromTemplate.cs
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromTemplate.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
@@ -30,7 +29,7 @@ public class GeneratePlatformManifestEntriesFromTemplate : BuildTask
         public override bool Execute()
         {
             List<PlatformManifestEntry> entries = new List<PlatformManifestEntry>();
-            var files = Files.ToDictionary(file => Path.GetFileName(file.ItemSpec));
+            var files = Files.ToLookup(file => Path.GetFileName(file.ItemSpec)).ToDictionary(l => l.Key, l=> l.First());
             foreach (var entryTemplate in PlatformManifestEntryTemplates)
             {
                 if (files.TryGetValue(entryTemplate.ItemSpec, out ITaskItem existingFile))
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GenerateSharedFrameworkDepsFile.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GenerateSharedFrameworkDepsFile.cs
index 84f7eda188b..76b1c22d9de 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GenerateSharedFrameworkDepsFile.cs
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GenerateSharedFrameworkDepsFile.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/Packaging/Extensions.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/Packaging/Extensions.cs
deleted file mode 100644
index f8da82b1198..00000000000
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/Packaging/Extensions.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Build.Framework;
-using NuGet;
-using NuGet.Frameworks;
-using NuGet.Versioning;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Runtime.Versioning;
-
-// This file implements a subset of the Extensions class in the
-// Microsoft.DotNet.Build.Tasks.Packaging project to support
-// the Shared Framework SDK's usage of the VerifyClosure and
-// VerifyTypes tasks used in shared framework validation.
-
-namespace Microsoft.DotNet.Build.Tasks.Packaging
-{
-    public static class Extensions
-    {
-        public static IEnumerable<T> NullAsEmpty<T>(this IEnumerable<T> source)
-        {
-            if (source == null)
-            {
-                return Enumerable.Empty<T>();
-            }
-
-            return source;
-        }
-    }
-}
-
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/PlatformManifestEntry.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/PlatformManifestEntry.cs
index cf54a35ef06..74cb71351a9 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/PlatformManifestEntry.cs
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/PlatformManifestEntry.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 namespace Microsoft.DotNet.SharedFramework.Sdk
 {
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/ValidateFileVersions.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/ValidateFileVersions.cs
index 7942a4bb7be..19681d9d82a 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/ValidateFileVersions.cs
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/ValidateFileVersions.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 using Microsoft.Build.Construction;
 using Microsoft.Build.Framework;
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.targets b/src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.targets
index 860db8a71ff..511214ae5e7 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.targets
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.targets
@@ -3,9 +3,11 @@
     <PackageLicenseFile Condition="'$(PackageLicenseExpression)' == ''">$([System.IO.Path]::GetFileName('$(LicenseFile)'))</PackageLicenseFile>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <PublishReadyToRun Condition="'$(PublishReadyToRun)' == '' and '$(PlatformPackageType)' == 'RuntimePack' and '$(Configuration)' == 'Release'">true</PublishReadyToRun>
+    <!-- For .NET 6 and higher, default to using Crossgen2 in non-composite mode if PublishReadyToRun == true -->
+    <PublishReadyToRunUseCrossgen2 Condition="'$(PublishReadyToRunUseCrossgen2)' == '' and '$(PublishReadyToRun)' == 'true' and '$(_TargetFrameworkVersionWithoutV)' >= '6.0'">true</PublishReadyToRunUseCrossgen2>
     <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
     <PublishReadyToRunShowWarnings>true</PublishReadyToRunShowWarnings>
-    <AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>$(AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder);.map;.dbg;.debug;.dwarf</AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>
+    <AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>$(AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder);.map;.r2rmap;.dbg;.debug;.dwarf</AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>
     <_DefaultHostJsonTargetPath>runtimes/$(RuntimeIdentifier)/lib/$(TargetFramework)</_DefaultHostJsonTargetPath>
     <HostJsonTargetPath Condition="'$(HostJsonTargetPath)' == ''">$(_DefaultHostJsonTargetPath)</HostJsonTargetPath>
     <IncludeFallbacksInDepsFile Condition="'$(IncludeFallbacksInDepsFile)' == ''">false</IncludeFallbacksInDepsFile>
@@ -75,15 +77,19 @@
       <FilesToPackage Include="@(ResolvedFileToPublish)" Exclude="@(RuntimePackAsset)" />
       <FilesToPackage Condition="'%(FilesToPackage.AssetType)' == 'native'" IsNative="true" />
       <_r2rSymbolFiles Include="@(ResolvedFileToPublish->'%(RootDir)%(Directory)%(FileName).ni.pdb')" />
+      <!-- This accounts for perfmaps generated by crossgen2 when specifying perfmap-format-version:1, which is the new default. -->
+      <_r2rV1MapFiles Include="@(ResolvedFileToPublish->'%(RootDir)%(Directory)%(FileName).ni.r2rmap')" />
     </ItemGroup>
     <!-- MSBuild does not resolve globs from item transformations,
          so round-trip through a property to activate glob resolution. -->
     <PropertyGroup>
+      <!-- This accounts for legagy-named perfmaps generated by crossgen2 when specifying perfmap-format-version:0. -->
       <_r2rSymbolFilePattern>@(ResolvedFileToPublish->'%(RootDir)%(Directory)%(FileName).ni.*.map')</_r2rSymbolFilePattern>
     </PropertyGroup>
     <ItemGroup>
       <FilesToPackage Include="@(_r2rSymbolFiles)" Condition="Exists('%(Identity)')" IsSymbolFile="true" />
       <FilesToPackage Include="$(_r2rSymbolFilePattern)" IsSymbolFile="true" />
+      <FilesToPackage Include="@(_r2rV1MapFiles)" Condition="Exists('%(Identity)')" IsSymbolFile="true" />
     </ItemGroup>
   </Target>
 
@@ -130,11 +136,20 @@
       <FilesToPackage Condition="'%(Extension)' == '.pdb' or '%(Extension)' == '.dbg' or '%(Extension)' == '.dwarf'">
         <IsSymbolFile>true</IsSymbolFile>
       </FilesToPackage>
+      <FilesToPackage Condition="'%(Extension)' == '.mibc'">
+        <IsPgoData>true</IsPgoData>
+        <TargetPath>PgoData</TargetPath>
+      </FilesToPackage>
+      <!-- Legacy crossgen perf map files. Supported by crossgen2 using perfmap-format-version:0. -->
       <FilesToPackage Condition="$([System.String]::new('%(Filename)').Contains('.ni.{')) and 
                                  $([System.String]::new('%(Filename)').EndsWith('}')) and
                                  '%(Extension)' == '.map'">
         <IsSymbolFile>true</IsSymbolFile>
       </FilesToPackage>
+      <!-- crossgen2 v1 perf map files. -->
+      <FilesToPackage Condition="'%(Extension)' == '.r2rmap'">
+        <IsSymbolFile>true</IsSymbolFile>
+      </FilesToPackage>
     </ItemGroup>
 
     <ItemGroup Condition="'$(PlatformPackageType)' == 'TargetingPack'">
@@ -379,7 +394,8 @@
       <_FrameworkListRootAttribute Include="TargetFrameworkVersion" Value="$(TargetFrameworkVersion.TrimStart('vV'))" />
       <_FrameworkListRootAttribute Include="FrameworkName" Value="$(SharedFrameworkName)" />
       <_FrameworkListRootAttribute Include="Name" Value="$(SharedFrameworkFriendlyName)" />
-      <_FrameworkListTargetFilePrefix Include="ref/;runtimes/" />
+      <_FrameworkListTargetFilePrefix Include="ref/;runtimes/;analyzers/" />
+      <_FrameworkListTargetFilePrefix Condition="'$(PlatformPackageType)' == 'RuntimePack'" Include="PgoData" />
     </ItemGroup>
 
     <CreateFrameworkListFile
@@ -441,7 +457,7 @@
     <ItemGroup>
       <_closureFiles
         Include="@(FilesToPackage)"
-        Condition="('%(Extension)' == '.dll' or '%(Extension)' == '$(LibraryFileExtension)') and '%(FilesToPackage.Culture)' == ''" />
+        Condition="('%(Extension)' == '.dll' or '%(Extension)' == '$(LibraryFileExtension)') and '%(FilesToPackage.Culture)' == '' and '%(FilesToPackage.ExcludeFromValidation)' != 'true'" />
       <_closureFileNames Include="@(_closureFiles->'%(FileName)')" Original="%(Identity)" />
 
       <_closureFileNamesFiltered Include="@(_closureFileNames)" Exclude="@(ExcludeFromClosure)"/>
@@ -471,7 +487,7 @@
     <ItemGroup>
       <_dupTypeFiles
          Include="@(FilesToPackage)"
-        Condition="('%(Extension)' == '.dll' or '%(Extension)' == '$(LibraryFileExtension)') and '%(FilesToPackage.Culture)' == ''" />
+         Condition="('%(Extension)' == '.dll' or '%(Extension)' == '$(LibraryFileExtension)') and '%(FilesToPackage.Culture)' == '' and '%(FilesToPackage.ExcludeFromValidation)' != 'true'" />
       <_dupTypeFileName Include="@(_dupTypeFiles->'%(FileName)')" Original="%(Identity)" />
 
       <_dupTypeFileNamesFiltered Include="@(_dupTypeFileName)" Exclude="@(ExcludeFromDuplicateTypes)"/>
diff --git a/src/Microsoft.DotNet.SignTool.Tests/SignToolTests.cs b/src/Microsoft.DotNet.SignTool.Tests/SignToolTests.cs
index 44462959ff6..a5756b01790 100644
--- a/src/Microsoft.DotNet.SignTool.Tests/SignToolTests.cs
+++ b/src/Microsoft.DotNet.SignTool.Tests/SignToolTests.cs
@@ -786,7 +786,7 @@ public void DoubleNestedContainer()
 $@"<FilesToSign Include=""{Uri.EscapeDataString(Path.Combine(_tmpDir, "ContainerSigning", "4", "ABCDEFG/MsiSetup.msi"))}"">
   <Authenticode>Microsoft400</Authenticode>
 </FilesToSign>",
-$@"<FilesToSign Include=""{Uri.EscapeDataString(Path.Combine(_tmpDir, "engines\\MsiBootstrapper.exe-engine.exe"))}"">
+$@"<FilesToSign Include=""{Uri.EscapeDataString(Path.Combine(_tmpDir, "engines\\0\\MsiBootstrapper.exe-engine.exe"))}"">
   <Authenticode>Microsoft400</Authenticode>
 </FilesToSign>",
 $@"<FilesToSign Include=""{Uri.EscapeDataString(Path.Combine(_tmpDir, "ContainerSigning", "4", "MsiBootstrapper.exe"))}"">
@@ -1195,7 +1195,7 @@ public void SignMsiEngine()
 $@"<FilesToSign Include=""{Uri.EscapeDataString(Path.Combine(_tmpDir, "ContainerSigning", "0", "ABCDEFG/MsiSetup.msi"))}"">
   <Authenticode>Microsoft400</Authenticode>
 </FilesToSign>",
- $@"<FilesToSign Include=""{Uri.EscapeDataString(Path.Combine(_tmpDir, "engines", "MsiBootstrapper.exe-engine.exe"))}"">
+ $@"<FilesToSign Include=""{Uri.EscapeDataString(Path.Combine(_tmpDir, "engines", "0", "MsiBootstrapper.exe-engine.exe"))}"">
   <Authenticode>Microsoft400</Authenticode>
 </FilesToSign>",
  $@"<FilesToSign Include=""{Uri.EscapeDataString(Path.Combine(_tmpDir, "MsiBootstrapper.exe"))}"">
diff --git a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj
index 8ec571aeb81..7a89dfe9dfc 100644
--- a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj
+++ b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>Latest</LangVersion>
     <IsPackable>true</IsPackable>
diff --git a/src/Microsoft.DotNet.SignTool/src/BatchSignUtil.cs b/src/Microsoft.DotNet.SignTool/src/BatchSignUtil.cs
index c1161aa7911..29d183eb271 100644
--- a/src/Microsoft.DotNet.SignTool/src/BatchSignUtil.cs
+++ b/src/Microsoft.DotNet.SignTool/src/BatchSignUtil.cs
@@ -153,12 +153,13 @@ bool signEngines(IEnumerable<FileSignInfo> files, out int signedCount)
 
                 _log.LogMessage(MessageImportance.High, $"Round {round}: Signing {enginesToSign.Length} engines.");
 
-                Dictionary<string, FileSignInfo> engines = new Dictionary<string, FileSignInfo>();
+                Dictionary<SignedFileContentKey, FileSignInfo> engines = new Dictionary<SignedFileContentKey, FileSignInfo>();
                 var workingDirectory = Path.Combine(_signTool.TempDir, "engines");
+                int engineContainer = 0;
                 // extract engines
                 foreach (var file in enginesToSign)
                 {
-                    string engineFileName = $"{Path.Combine(workingDirectory, file.FileName)}{SignToolConstants.MsiEngineExtension}";
+                    string engineFileName = $"{Path.Combine(workingDirectory, $"{engineContainer}", file.FileName)}{SignToolConstants.MsiEngineExtension}";
                     _log.LogMessage(MessageImportance.Normal, $"Extracting engine from {file.FullPath}");
                     if (!RunWixTool("insignia.exe", $"-ib {file.FullPath} -o {engineFileName}",
                         workingDirectory, _signTool.WixToolsPath, _log))
@@ -166,12 +167,16 @@ bool signEngines(IEnumerable<FileSignInfo> files, out int signedCount)
                         _log.LogError($"Failed to extract engine from {file.FullPath}");
                         return false;
                     }
-                    engines.Add(engineFileName, file);
+
+                    var fileUniqueKey = new SignedFileContentKey(file.ContentHash, engineFileName);
+
+                    engines.Add(fileUniqueKey, file);
+                    engineContainer++;
                 }
 
                 // sign engines
                 bool signResult = _signTool.Sign(_buildEngine, round, engines.Select(engine =>
-                    new FileSignInfo(new PathWithHash(engine.Key, engine.Value.ContentHash), engine.Value.SignInfo)));
+                    new FileSignInfo(new PathWithHash(engine.Key.FileName, engine.Value.ContentHash), engine.Value.SignInfo)));
                 if(!signResult)
                 {
                     _log.LogError($"Failed to sign engines");
@@ -181,12 +186,12 @@ bool signEngines(IEnumerable<FileSignInfo> files, out int signedCount)
                 // attach engines
                 foreach (var engine in engines)
                 {
-                    _log.LogMessage(MessageImportance.Normal, $"Attaching engine {engine.Key} to {engine.Value.FullPath}");
+                    _log.LogMessage(MessageImportance.Normal, $"Attaching engine {engine.Key.FileName} to {engine.Value.FullPath}");
 
                     try
                     {
                         if (!RunWixTool("insignia.exe",
-                            $"-ab {engine.Key} {engine.Value.FullPath} -o {engine.Value.FullPath}", workingDirectory,
+                            $"-ab {engine.Key.FileName} {engine.Value.FullPath} -o {engine.Value.FullPath}", workingDirectory,
                             _signTool.WixToolsPath, _log))
                         {
                             _log.LogError($"Failed to attach engine to {engine.Value.FullPath}");
@@ -196,7 +201,7 @@ bool signEngines(IEnumerable<FileSignInfo> files, out int signedCount)
                     finally
                     {
                         // cleanup engines (they fail signing verification if they stay in the drop
-                        File.Delete(engine.Key);
+                        File.Delete(engine.Key.FileName);
                     }
                 }
                 return true;
diff --git a/src/Microsoft.DotNet.SignTool/src/Telemetry.cs b/src/Microsoft.DotNet.SignTool/src/Telemetry.cs
index 7faf1af06d4..1910970a318 100644
--- a/src/Microsoft.DotNet.SignTool/src/Telemetry.cs
+++ b/src/Microsoft.DotNet.SignTool/src/Telemetry.cs
@@ -20,26 +20,35 @@ internal class Telemetry
             { "BUILD_SOURCEVERSION", Environment.GetEnvironmentVariable("BUILD_SOURCEVERSION") }
         };
 
+        private readonly bool _disableTelemetry ;
+
         public Telemetry()
         {
             _metrics = new Dictionary<string, double>();
+            _disableTelemetry =
+                (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("SIGNTOOL_DISABLE_TELEMETRY")));
         }
 
         internal void AddMetric(string name, double value)
         {
-            _metrics.Add(name, value);
+            if (!_disableTelemetry)
+            {
+                _metrics.Add(name, value);
+            }
         }
 
         internal void SendEvents()
         {
-            // set APPINSIGHTS_INSTRUMENTATIONKEY environment variable to begin tracking telemetry
-            TelemetryConfiguration configuration = TelemetryConfiguration.CreateDefault();
-
-            TelemetryClient telemetryClient = new TelemetryClient(configuration);
+            if (!_disableTelemetry)
+            {
+                // set APPINSIGHTS_INSTRUMENTATIONKEY environment variable to begin tracking telemetry
+                TelemetryConfiguration configuration = TelemetryConfiguration.CreateDefault();
+                TelemetryClient telemetryClient = new TelemetryClient(configuration);
 
-            telemetryClient.TrackEvent(s_sendEventName, properties: s_properties, metrics: _metrics);
-            telemetryClient.Flush();
-            _metrics = null;
+                telemetryClient.TrackEvent(s_sendEventName, properties: s_properties, metrics: _metrics);
+                telemetryClient.Flush();
+                _metrics = null;
+            }
         }
     }
 }
diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/src/ReadNuGetPackageInfos.cs b/src/Microsoft.DotNet.SourceBuild/tasks/src/ReadNuGetPackageInfos.cs
index 4df9c4df567..bcb95bf3191 100644
--- a/src/Microsoft.DotNet.SourceBuild/tasks/src/ReadNuGetPackageInfos.cs
+++ b/src/Microsoft.DotNet.SourceBuild/tasks/src/ReadNuGetPackageInfos.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.DotNet.SourceBuild.Tasks
 {
-    public class ReadNuGetPackageInfos : Task
+    public class ReadNuGetPackageInfos : Microsoft.Build.Utilities.Task
     {
         [Required]
         public string[] PackagePaths { get; set; }
diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/ValidateUsageAgainstBaseline.cs b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/ValidateUsageAgainstBaseline.cs
index 5cb140d023d..f8b389b5268 100644
--- a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/ValidateUsageAgainstBaseline.cs
+++ b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/ValidateUsageAgainstBaseline.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport
 {
-    public class ValidateUsageAgainstBaseline : Task
+    public class ValidateUsageAgainstBaseline : Microsoft.Build.Utilities.Task
     {
         [Required]
         public string DataFile { get; set; }
diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WritePackageUsageData.cs b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WritePackageUsageData.cs
index 15b504d0112..caf7252a163 100644
--- a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WritePackageUsageData.cs
+++ b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WritePackageUsageData.cs
@@ -17,7 +17,7 @@
 
 namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport
 {
-    public class WritePackageUsageData : Task
+    public class WritePackageUsageData : Microsoft.Build.Utilities.Task
     {
         public string[] RestoredPackageFiles { get; set; }
         public string[] TarballPrebuiltPackageFiles { get; set; }
diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WriteUsageReports.cs b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WriteUsageReports.cs
index 784919651f9..e44e94f30be 100644
--- a/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WriteUsageReports.cs
+++ b/src/Microsoft.DotNet.SourceBuild/tasks/src/UsageReport/WriteUsageReports.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport
 {
-    public class WriteUsageReports : Task
+    public class WriteUsageReports : Microsoft.Build.Utilities.Task
     {
         private const string SnapshotPrefix = "PackageVersions.props.pre.";
         private const string SnapshotSuffix = ".xml";
diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/src/WriteBuildOutputProps.cs b/src/Microsoft.DotNet.SourceBuild/tasks/src/WriteBuildOutputProps.cs
index 4ac4cbcf166..1b32c5f1112 100644
--- a/src/Microsoft.DotNet.SourceBuild/tasks/src/WriteBuildOutputProps.cs
+++ b/src/Microsoft.DotNet.SourceBuild/tasks/src/WriteBuildOutputProps.cs
@@ -13,7 +13,7 @@
 
 namespace Microsoft.DotNet.SourceBuild.Tasks
 {
-    public class WriteBuildOutputProps : Task
+    public class WriteBuildOutputProps : Microsoft.Build.Utilities.Task
     {
         private static readonly Regex InvalidElementNameCharRegex = new Regex(@"(^|[^A-Za-z0-9])(?<FirstPartChar>.)");
 
diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/GenerateSwaggerCode.cs b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/GenerateSwaggerCode.cs
index 6482632531c..2c03502ec39 100644
--- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/GenerateSwaggerCode.cs
+++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/GenerateSwaggerCode.cs
@@ -13,7 +13,7 @@
 
 namespace Microsoft.DotNet.SwaggerGenerator.MSBuild
 {
-    public class GenerateSwaggerCode : Task
+    public class GenerateSwaggerCode : Microsoft.Build.Utilities.Task
     {
         [Required]
         public string SwaggerDocumentUri { get; set; }
diff --git a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj
index 7d9fb9a13a9..8486e254162 100644
--- a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj
+++ b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj
@@ -7,6 +7,8 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
+    <!-- This is here so that we agree with the project's transitive references to NewtonSoft.Json -->
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="NuGet.Frameworks" Version="$(NuGetVersion)" />
   </ItemGroup>
 
diff --git a/src/Microsoft.DotNet.VersionTools/lib/src/BuildManifest/VersionIdentifier.cs b/src/Microsoft.DotNet.VersionTools/lib/src/BuildManifest/VersionIdentifier.cs
index 39d44ed7a95..0f010d83037 100644
--- a/src/Microsoft.DotNet.VersionTools/lib/src/BuildManifest/VersionIdentifier.cs
+++ b/src/Microsoft.DotNet.VersionTools/lib/src/BuildManifest/VersionIdentifier.cs
@@ -87,14 +87,19 @@ private static string GetVersionForSingleSegment(string assetPathSegment)
             // then look for a minor.patch, completing the major.minor.patch.  Continue to do so until we get
             // to something that is NOT major.minor.patch (this is necessary because we sometimes see things like:
             // VS.Redist.Common.NetCore.Templates.x86.2.2.3.0.101-servicing-014320.nupkg
+            // Continue iterating until we find ALL potential versions. Return the one that is the latest in the segment
+            // This is to deal with files with multiple major.minor.patchs in the file name, for example:
+            // Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100.Msi.x64.6.0.0-rc.1.21380.2.symbols.nupkg
 
             int currentIndex = 0;
             // Stack of major.minor.patch.
-            Stack<int> majorMinorPatchStack = new Stack<int>(3);
+            Stack<(int versionNumber, int index)> majorMinorPatchStack = new Stack<(int,int)>(3);
             string majorMinorPatch = null;
+            int majorMinorPatchIndex = 0;
             StringBuilder versionSuffix = new StringBuilder();
             char prevDelimiterCharacter = char.MinValue;
             char nextDelimiterCharacter = char.MinValue;
+            Dictionary<int,string> majorMinorPatchDictionary = new Dictionary<int, string>();
             while (true)
             {
                 string nextSegment;
@@ -124,7 +129,7 @@ private static string GetVersionForSingleSegment(string assetPathSegment)
                     if ((majorMinorPatchStack.Count == 0 && isNumber) ||
                         (majorMinorPatchStack.Count > 0 && prevDelimiterCharacter == '.' && isNumber))
                     {
-                        majorMinorPatchStack.Push(potentialVersionSegment);
+                        majorMinorPatchStack.Push((potentialVersionSegment, currentIndex));
                     }
                     // Check for partial major.minor.patch cases, like: 2.2.bar or 2.2-100.bleh
                     else if (majorMinorPatchStack.Count > 0 && majorMinorPatchStack.Count < 3 &&
@@ -137,10 +142,11 @@ private static string GetVersionForSingleSegment(string assetPathSegment)
                     if (majorMinorPatchStack.Count >= 3 && (prevDelimiterCharacter != '.' || !isNumber || nextDelimiterIndex == -1))
                     {
                         // Done with major.minor.patch, found. Pop the top 3 elements off the stack.
-                        int patch = majorMinorPatchStack.Pop();
-                        int minor = majorMinorPatchStack.Pop();
-                        int major = majorMinorPatchStack.Pop();
+                        (int patch, int patchIndex) = majorMinorPatchStack.Pop();
+                        (int minor, int minorIndex) = majorMinorPatchStack.Pop();
+                        (int major, int majorIndex) = majorMinorPatchStack.Pop();
                         majorMinorPatch = $"{major}.{minor}.{patch}";
+                        majorMinorPatchIndex = majorIndex;
                     }
                 }
                 
@@ -160,11 +166,15 @@ private static string GetVersionForSingleSegment(string assetPathSegment)
                     if (versionSuffix.Length == 0 &&
                         (prevDelimiterCharacter != '-' || !_knownTags.Any(tag => nextSegment.StartsWith(tag, StringComparison.OrdinalIgnoreCase))))
                     {
-                        return majorMinorPatch;
+                        majorMinorPatchDictionary.Add(majorMinorPatchIndex, majorMinorPatch);
+                        majorMinorPatch = null;
+                        versionSuffix = new StringBuilder();
                     }
                     else if (versionSuffix.Length != 0 && !int.TryParse(nextSegment, out int potentialVersionSegment) && nextSegment != _finalSuffix)
                     {
-                        return $"{majorMinorPatch}{versionSuffix.ToString()}";
+                        majorMinorPatchDictionary.Add(majorMinorPatchIndex, $"{majorMinorPatch}{versionSuffix.ToString()}");
+                        majorMinorPatch = null;
+                        versionSuffix = new StringBuilder();
                     }
                     else
                     {
@@ -184,12 +194,18 @@ private static string GetVersionForSingleSegment(string assetPathSegment)
                 }
             }
 
-            if (string.IsNullOrEmpty(majorMinorPatch))
+            if(majorMinorPatch != null)
+            {
+                majorMinorPatchDictionary.Add(majorMinorPatchIndex, $"{majorMinorPatch}{versionSuffix.ToString()}");
+            }
+
+            if (!majorMinorPatchDictionary.Any())
             {
                 return null;
             }
 
-            return $"{majorMinorPatch}{versionSuffix.ToString()}";
+            int maxKey = majorMinorPatchDictionary.Keys.Max();
+            return majorMinorPatchDictionary[maxKey];
         }
 
         /// <summary>
diff --git a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj
index 208ffb033a2..2dfa124f05b 100644
--- a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj
+++ b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworks>
     <PackageType>MSBuildSdk</PackageType>
   </PropertyGroup>
 
diff --git a/src/Microsoft.DotNet.VersionTools/tasks/src/BaseDependenciesTask.cs b/src/Microsoft.DotNet.VersionTools/tasks/src/BaseDependenciesTask.cs
index c5e114065dc..936c37fbe8b 100644
--- a/src/Microsoft.DotNet.VersionTools/tasks/src/BaseDependenciesTask.cs
+++ b/src/Microsoft.DotNet.VersionTools/tasks/src/BaseDependenciesTask.cs
@@ -23,7 +23,7 @@
 
 namespace Microsoft.DotNet.Build.Tasks.VersionTools
 {
-    public abstract class BaseDependenciesTask : Task
+    public abstract class BaseDependenciesTask : Microsoft.Build.Utilities.Task
     {
         internal const string RawUrlMetadataName = "RawUrl";
         internal const string RawVersionsBaseUrlMetadataName = "RawVersionsBaseUrl";
diff --git a/src/Microsoft.DotNet.VersionTools/tasks/src/SubmitPullRequest.cs b/src/Microsoft.DotNet.VersionTools/tasks/src/SubmitPullRequest.cs
index f3ea2050c83..7072b49765d 100644
--- a/src/Microsoft.DotNet.VersionTools/tasks/src/SubmitPullRequest.cs
+++ b/src/Microsoft.DotNet.VersionTools/tasks/src/SubmitPullRequest.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.DotNet.Build.Tasks.VersionTools
 {
-    public class SubmitPullRequest : Task
+    public class SubmitPullRequest : Microsoft.Build.Utilities.Task
     {
         [Required]
         public string PullRequestServiceType { get; set; }
diff --git a/src/Microsoft.DotNet.VersionTools/tests/BuildManifest/VersionIdentiferTests.cs b/src/Microsoft.DotNet.VersionTools/tests/BuildManifest/VersionIdentiferTests.cs
index eaa6ad85c8d..4982b09128a 100644
--- a/src/Microsoft.DotNet.VersionTools/tests/BuildManifest/VersionIdentiferTests.cs
+++ b/src/Microsoft.DotNet.VersionTools/tests/BuildManifest/VersionIdentiferTests.cs
@@ -34,6 +34,7 @@ public class VersionTests
         [InlineData("What-Is-A.FooPackage.2.2.10.0.1", "10.0.1")]
         [InlineData("What-Is-A.FooPackage.2.2.10.0.1-beta.final", "10.0.1-beta.final")]
         [InlineData("What-Is-A.FooPackage.2.2.10.0.1-preview1.12345.1", "10.0.1-preview1.12345.1")]
+        [InlineData("What-Is-A.FooPackage.2.2.0.Extra.Stuff.10.0.1-preview1.12345.1", "10.0.1-preview1.12345.1")]
         [InlineData("What-Is-A.FooPackage", null)]
         [InlineData("What-Is-A.FooPackage-2.2-64", null)]
         [InlineData("What-Is-A.FooPackage-2.2.nupkg", null)]
diff --git a/src/Microsoft.DotNet.VersionTools/tests/BuildManifest/VersionIdentifierTestsAssets.csv b/src/Microsoft.DotNet.VersionTools/tests/BuildManifest/VersionIdentifierTestsAssets.csv
index b059326b8fa..0a98976aafc 100644
--- a/src/Microsoft.DotNet.VersionTools/tests/BuildManifest/VersionIdentifierTestsAssets.csv
+++ b/src/Microsoft.DotNet.VersionTools/tests/BuildManifest/VersionIdentifierTestsAssets.csv
@@ -4960,3 +4960,4 @@ Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.7.nupkg,2.2.7,Microsoft.DotNet.Web
 Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.2.2.7.nupkg,2.2.7,Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.nupkg
 runtime.win-x64.Microsoft.AspNetCore.All.2.2.7.nupkg,2.2.7,runtime.win-x64.Microsoft.AspNetCore.All.nupkg
 runtime.win-x64.Microsoft.AspNetCore.App.2.2.7.nupkg,2.2.7,runtime.win-x64.Microsoft.AspNetCore.App.nupkg
+assets/symbols/Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100.Msi.x64.6.0.0-preview.7.21377.20.symbols.nupkg,6.0.0-preview.7.21377.20,assets/symbols/Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100.Msi.x64.symbols.nupkg
diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj
index 0cc8dc7f7d6..310c1f2ab72 100644
--- a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj
+++ b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PackageId>Microsoft.DotNet.XUnitConsoleRunner</PackageId>
@@ -24,6 +24,7 @@
     <PackageReference Include="xunit.runner.reporters" Version="$(XUnitVersion)" />
     <PackageReference Include="xunit.runner.utility" Version="$(XUnitVersion)" />
     <PackageReference Include="xunit.abstractions" Version="$(XUnitAbstractionsVersion)" />
+    <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
   </ItemGroup>
 
   <Import Project="$(RepoRoot)eng\BuildTask.targets" />
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/Attributes/OuterLoopAttribute.cs b/src/Microsoft.DotNet.XUnitExtensions/src/Attributes/OuterLoopAttribute.cs
index 753c4531876..a444463bc22 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/src/Attributes/OuterLoopAttribute.cs
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/Attributes/OuterLoopAttribute.cs
@@ -13,7 +13,19 @@ namespace Xunit
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true)]
     public class OuterLoopAttribute : Attribute, ITraitAttribute
     {
+        public Type CalleeType { get; private set; }
+        public string[] ConditionMemberNames { get; private set; }
+
         public OuterLoopAttribute() { }
         public OuterLoopAttribute(string reason) { }
+        public OuterLoopAttribute(string reason, TestPlatforms platforms) { }
+        public OuterLoopAttribute(string reason, TargetFrameworkMonikers framework) { }
+        public OuterLoopAttribute(string reason, TestRuntimes runtimes) { }
+        public OuterLoopAttribute(string reason, TestPlatforms platforms = TestPlatforms.Any, TargetFrameworkMonikers framework = TargetFrameworkMonikers.Any, TestRuntimes runtimes = TestRuntimes.Any) { }
+        public OuterLoopAttribute(string reason, Type calleeType, params string[] conditionMemberNames)
+        {
+            CalleeType = calleeType;
+            ConditionMemberNames = conditionMemberNames;
+        }
     }
 }
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/Attributes/SkipOnCoreClrAttribute.cs b/src/Microsoft.DotNet.XUnitExtensions/src/Attributes/SkipOnCoreClrAttribute.cs
index a2d5b933eb9..ef527b206ec 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/src/Attributes/SkipOnCoreClrAttribute.cs
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/Attributes/SkipOnCoreClrAttribute.cs
@@ -7,7 +7,7 @@
 namespace Xunit
 {
     [TraitDiscoverer("Microsoft.DotNet.XUnitExtensions.SkipOnCoreClrDiscoverer", "Microsoft.DotNet.XUnitExtensions")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
     public class SkipOnCoreClrAttribute : Attribute, ITraitAttribute
     {
         internal SkipOnCoreClrAttribute() { }
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/CoreClrConfigurationDetection.cs b/src/Microsoft.DotNet.XUnitExtensions/src/CoreClrConfigurationDetection.cs
new file mode 100644
index 00000000000..73f87efea8c
--- /dev/null
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/CoreClrConfigurationDetection.cs
@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+//
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Text;
+
+namespace Xunit
+{
+    public static class CoreClrConfigurationDetection
+    {
+        public static bool IsJitStress => !string.Equals(GetEnvironmentVariableValue("JitStress"), "0", StringComparison.InvariantCulture);
+        public static bool IsJitStressRegs => !string.Equals(GetEnvironmentVariableValue("JitStressRegs"), "0", StringComparison.InvariantCulture);
+        public static bool IsJitMinOpts => string.Equals(GetEnvironmentVariableValue("JITMinOpts"), "1", StringComparison.InvariantCulture);
+        public static bool IsTailCallStress => string.Equals(GetEnvironmentVariableValue("TailcallStress"), "1", StringComparison.InvariantCulture);
+        public static bool IsZapDisable => string.Equals(GetEnvironmentVariableValue("ZapDisable"), "1", StringComparison.InvariantCulture);
+        public static bool IsGCStress3 => CompareGCStressModeAsLower(GetEnvironmentVariableValue("GCStress"), "0x3", "3");
+        public static bool IsGCStressC => CompareGCStressModeAsLower(GetEnvironmentVariableValue("GCStress"), "0xC", "C");
+
+        public static bool IsGCStress => !string.Equals(GetEnvironmentVariableValue("GCStress"), "0", StringComparison.InvariantCulture);
+
+        public static bool IsCheckedRuntime => AssemblyConfigurationEquals("Checked");
+        public static bool IsReleaseRuntime => AssemblyConfigurationEquals("Release");
+        public static bool IsDebugRuntime => AssemblyConfigurationEquals("Debug");
+
+        public static bool IsStressTest =>
+            IsGCStress ||
+            IsZapDisable ||
+            IsTailCallStress ||
+            IsJitStressRegs ||
+            IsJitStress ||
+            IsJitMinOpts;
+
+        private static string GetEnvironmentVariableValue(string name) =>
+            Environment.GetEnvironmentVariable("DOTNET_" + name) ?? Environment.GetEnvironmentVariable("COMPlus_" + name) ?? "0";
+
+        private static bool AssemblyConfigurationEquals(string configuration)
+        {
+            AssemblyConfigurationAttribute assemblyConfigurationAttribute = typeof(string).Assembly.GetCustomAttribute<AssemblyConfigurationAttribute>();
+
+            return assemblyConfigurationAttribute != null &&
+                string.Equals(assemblyConfigurationAttribute.Configuration, configuration, StringComparison.InvariantCulture);
+        }
+
+        private static bool CompareGCStressModeAsLower(string value, string first, string second)
+        {
+            value = value.ToLowerInvariant();
+            return string.Equals(value, first.ToLowerInvariant(), StringComparison.InvariantCulture) ||
+                string.Equals(value, second.ToLowerInvariant(), StringComparison.InvariantCulture) ||
+                string.Equals(value, "0xf", StringComparison.InvariantCulture) ||
+                string.Equals(value, "f", StringComparison.InvariantCulture);
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/DiscovererHelpers.cs b/src/Microsoft.DotNet.XUnitExtensions/src/DiscovererHelpers.cs
index dbb0dfd1459..6adc2ba7f36 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/src/DiscovererHelpers.cs
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/DiscovererHelpers.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using Xunit;
 
@@ -15,7 +14,7 @@ internal static class DiscovererHelpers
     {
         private static readonly Lazy<bool> s_isMonoRuntime = new Lazy<bool>(() => Type.GetType("Mono.RuntimeStructs") != null);
         public static bool IsMonoRuntime => s_isMonoRuntime.Value;
-        public static bool IsRunningOnNetCoreApp { get; } = (Environment.Version.Major >= 5 || RuntimeInformation.FrameworkDescription.StartsWith(".NET Core", StringComparison.OrdinalIgnoreCase));
+        public static bool IsRunningOnNetCoreApp { get; } = (Environment.Version.Major >= 5 || !RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase));
         public static bool IsRunningOnNetFramework { get; } = RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase);
 
         public static bool TestPlatformApplies(TestPlatforms platforms) =>
@@ -26,7 +25,7 @@ public static bool TestPlatformApplies(TestPlatforms platforms) =>
                 (platforms.HasFlag(TestPlatforms.OSX) && RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) ||
                 (platforms.HasFlag(TestPlatforms.illumos) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("ILLUMOS"))) ||
                 (platforms.HasFlag(TestPlatforms.Solaris) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("SOLARIS"))) ||
-                (platforms.HasFlag(TestPlatforms.iOS) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("IOS"))) ||
+                (platforms.HasFlag(TestPlatforms.iOS) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("IOS")) && !RuntimeInformation.IsOSPlatform(OSPlatform.Create("MACCATALYST"))) ||
                 (platforms.HasFlag(TestPlatforms.tvOS) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("TVOS"))) ||
                 (platforms.HasFlag(TestPlatforms.MacCatalyst) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("MACCATALYST"))) ||
                 (platforms.HasFlag(TestPlatforms.Android) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("ANDROID"))) ||
@@ -59,5 +58,54 @@ internal static bool Evaluate(Type calleeType, string[] conditionMemberNames)
 
             return true;
         }
+
+        internal static IEnumerable<KeyValuePair<string, string>> EvaluateArguments(IEnumerable<object> ctorArgs,string category, int skipFirst=1)
+        {
+            Debug.Assert(ctorArgs.Count() >= 2);
+
+            TestPlatforms platforms = TestPlatforms.Any;
+            TargetFrameworkMonikers frameworks = TargetFrameworkMonikers.Any;
+            TestRuntimes runtimes = TestRuntimes.Any;
+            Type calleeType = null;
+            string[] conditionMemberNames = null;
+            
+            foreach (object arg in ctorArgs.Skip(skipFirst)) // First argument is the issue number or reason.
+            {
+                if (arg is TestPlatforms)
+                {
+                    platforms = (TestPlatforms)arg;
+                }
+                else if (arg is TargetFrameworkMonikers)
+                {
+                    frameworks = (TargetFrameworkMonikers)arg;
+                }
+                else if (arg is TestRuntimes)
+                {
+                    runtimes = (TestRuntimes)arg;
+                }
+                else if (arg is Type)
+                {
+                    calleeType = (Type)arg;
+                }
+                else if (arg is string[])
+                {
+                    conditionMemberNames = (string[])arg;
+                }
+            }
+
+            if (calleeType != null && conditionMemberNames != null)
+            {
+                if (DiscovererHelpers.Evaluate(calleeType, conditionMemberNames))
+                {
+                    yield return new KeyValuePair<string, string>(XunitConstants.Category, category);
+                }
+            }
+            else if (DiscovererHelpers.TestPlatformApplies(platforms) &&
+                DiscovererHelpers.TestRuntimeApplies(runtimes) &&
+                DiscovererHelpers.TestFrameworkApplies(frameworks))
+            {
+                yield return new KeyValuePair<string, string>(XunitConstants.Category, category);
+            }
+        }        
     }
 }
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/ActiveIssueDiscoverer.cs b/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/ActiveIssueDiscoverer.cs
index 201df537d14..8e9ec7fc725 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/ActiveIssueDiscoverer.cs
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/ActiveIssueDiscoverer.cs
@@ -1,11 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
@@ -25,52 +21,7 @@ public class ActiveIssueDiscoverer : ITraitDiscoverer
         public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute)
         {
             IEnumerable<object> ctorArgs = traitAttribute.GetConstructorArguments();
-            Debug.Assert(ctorArgs.Count() >= 2);
-
-            string issue = ctorArgs.First().ToString();
-            TestPlatforms platforms = TestPlatforms.Any;
-            TargetFrameworkMonikers frameworks = TargetFrameworkMonikers.Any;
-            TestRuntimes runtimes = TestRuntimes.Any;
-            Type calleeType = null;
-            string[] conditionMemberNames = null;
-            
-            foreach (object arg in ctorArgs.Skip(1)) // First argument is the issue number.
-            {
-                if (arg is TestPlatforms)
-                {
-                    platforms = (TestPlatforms)arg;
-                }
-                else if (arg is TargetFrameworkMonikers)
-                {
-                    frameworks = (TargetFrameworkMonikers)arg;
-                }
-                else if (arg is TestRuntimes)
-                {
-                    runtimes = (TestRuntimes)arg;
-                }
-                else if (arg is Type)
-                {
-                    calleeType = (Type)arg;
-                }
-                else if (arg is string[])
-                {
-                    conditionMemberNames = (string[])arg;
-                }
-            }
-
-            if (calleeType != null && conditionMemberNames != null)
-            {
-                if (DiscovererHelpers.Evaluate(calleeType, conditionMemberNames))
-                {
-                    yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.Failing);
-                }
-            }
-            else if (DiscovererHelpers.TestPlatformApplies(platforms) &&
-                DiscovererHelpers.TestRuntimeApplies(runtimes) &&
-                DiscovererHelpers.TestFrameworkApplies(frameworks))
-            {
-                yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.Failing);
-            }
+            return DiscovererHelpers.EvaluateArguments(ctorArgs, XunitConstants.Failing);
         }
     }
 }
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/OuterLoopTestsDiscoverer.cs b/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/OuterLoopTestsDiscoverer.cs
index b7672c43c96..22c829fb0e4 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/OuterLoopTestsDiscoverer.cs
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/OuterLoopTestsDiscoverer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
+using System.Linq;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
@@ -20,7 +21,12 @@ public class OuterLoopTestsDiscoverer : ITraitDiscoverer
         /// <returns>The trait values.</returns>
         public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute)
         {
-            yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.OuterLoop);
+            IEnumerable<object> ctorArgs = traitAttribute.GetConstructorArguments();
+            if (ctorArgs.Count() < 2)
+            {
+                return new[] { new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.OuterLoop) };
+            }
+            return DiscovererHelpers.EvaluateArguments(ctorArgs, XunitConstants.OuterLoop);
         }
     }
 }
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/SkipOnCoreClrDiscoverer.cs b/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/SkipOnCoreClrDiscoverer.cs
index 24443a347a5..f4739b157bc 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/SkipOnCoreClrDiscoverer.cs
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/SkipOnCoreClrDiscoverer.cs
@@ -13,16 +13,17 @@ namespace Microsoft.DotNet.XUnitExtensions
 {
     public class SkipOnCoreClrDiscoverer : ITraitDiscoverer
     {
-        private static readonly Lazy<bool> s_isJitStress = new Lazy<bool>(() => !string.Equals(GetEnvironmentVariableValue("COMPlus_JitStress"), "0", StringComparison.InvariantCulture));
-        private static readonly Lazy<bool> s_isJitStressRegs = new Lazy<bool>(() => !string.Equals(GetEnvironmentVariableValue("COMPlus_JitStressRegs"), "0", StringComparison.InvariantCulture));
-        private static readonly Lazy<bool> s_isJitMinOpts = new Lazy<bool>(() => string.Equals(GetEnvironmentVariableValue("COMPlus_JITMinOpts"), "1", StringComparison.InvariantCulture));
-        private static readonly Lazy<bool> s_isTailCallStress = new Lazy<bool>(() => string.Equals(GetEnvironmentVariableValue("COMPlus_TailcallStress"), "1", StringComparison.InvariantCulture));
-        private static readonly Lazy<bool> s_isZapDisable = new Lazy<bool>(() => string.Equals(GetEnvironmentVariableValue("COMPlus_ZapDisable"), "1", StringComparison.InvariantCulture));
-        private static readonly Lazy<bool> s_isGCStress3 = new Lazy<bool>(() => CompareGCStressModeAsLower(GetEnvironmentVariableValue("COMPlus_GCStress"), "0x3", "3"));
-        private static readonly Lazy<bool> s_isGCStressC = new Lazy<bool>(() => CompareGCStressModeAsLower(GetEnvironmentVariableValue("COMPlus_GCStress"), "0xC", "C"));
-        private static readonly Lazy<bool> s_isCheckedRuntime = new Lazy<bool>(() => IsCheckedRuntime());
-        private static readonly Lazy<bool> s_isReleaseRuntime = new Lazy<bool>(() => IsReleaseRuntime());
-        private static readonly Lazy<bool> s_isDebugRuntime = new Lazy<bool>(() => IsDebugRuntime());
+        private static readonly Lazy<bool> s_isJitStress = new Lazy<bool>(() => CoreClrConfigurationDetection.IsJitStress);
+        private static readonly Lazy<bool> s_isJitStressRegs = new Lazy<bool>(() => CoreClrConfigurationDetection.IsJitStressRegs);
+        private static readonly Lazy<bool> s_isJitMinOpts = new Lazy<bool>(() => CoreClrConfigurationDetection.IsJitMinOpts);
+        private static readonly Lazy<bool> s_isTailCallStress = new Lazy<bool>(() => CoreClrConfigurationDetection.IsTailCallStress);
+        private static readonly Lazy<bool> s_isZapDisable = new Lazy<bool>(() => CoreClrConfigurationDetection.IsZapDisable);
+        private static readonly Lazy<bool> s_isGCStress3 = new Lazy<bool>(() => CoreClrConfigurationDetection.IsGCStress3);
+        private static readonly Lazy<bool> s_isGCStressC = new Lazy<bool>(() => CoreClrConfigurationDetection.IsGCStressC);
+        private static readonly Lazy<bool> s_isCheckedRuntime = new Lazy<bool>(() => CoreClrConfigurationDetection.IsCheckedRuntime);
+        private static readonly Lazy<bool> s_isReleaseRuntime = new Lazy<bool>(() => CoreClrConfigurationDetection.IsReleaseRuntime);
+        private static readonly Lazy<bool> s_isDebugRuntime = new Lazy<bool>(() => CoreClrConfigurationDetection.IsDebugRuntime);
+        private static readonly Lazy<bool> s_isStressTest = new Lazy<bool>(() =>  CoreClrConfigurationDetection.IsStressTest);
 
         public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute)
         {
@@ -63,7 +64,7 @@ private static bool RuntimeConfigurationApplies(RuntimeConfiguration runtimeConf
 
         // Order here matters as some env variables may appear in multiple modes
         private static bool StressModeApplies(RuntimeTestModes stressMode) =>
-            (stressMode.HasFlag(RuntimeTestModes.RegularRun) && !IsStressTest) ||
+            (stressMode.HasFlag(RuntimeTestModes.RegularRun) && !s_isStressTest.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.GCStress3) && s_isGCStress3.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.GCStressC) && s_isGCStressC.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.ZapDisable) && s_isZapDisable.Value) ||
@@ -71,39 +72,5 @@ private static bool StressModeApplies(RuntimeTestModes stressMode) =>
             (stressMode.HasFlag(RuntimeTestModes.JitStressRegs) && s_isJitStressRegs.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.JitStress) && s_isJitStress.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.JitMinOpts) && s_isJitMinOpts.Value);
-
-        private static bool IsStressTest =>
-            s_isGCStress3.Value ||
-            s_isGCStressC.Value ||
-            s_isZapDisable.Value ||
-            s_isTailCallStress.Value ||
-            s_isJitStressRegs.Value ||
-            s_isJitStress.Value ||
-            s_isJitMinOpts.Value;
-
-        private static string GetEnvironmentVariableValue(string name) => Environment.GetEnvironmentVariable(name) ?? "0";
-
-        private static bool IsCheckedRuntime() => AssemblyConfigurationEquals("Checked");
-
-        private static bool IsReleaseRuntime() => AssemblyConfigurationEquals("Release");
-
-        private static bool IsDebugRuntime() => AssemblyConfigurationEquals("Debug");
-
-        private static bool AssemblyConfigurationEquals(string configuration)
-        {
-            AssemblyConfigurationAttribute assemblyConfigurationAttribute = typeof(string).Assembly.GetCustomAttribute<AssemblyConfigurationAttribute>();
-
-            return assemblyConfigurationAttribute != null &&
-                string.Equals(assemblyConfigurationAttribute.Configuration, configuration, StringComparison.InvariantCulture);
-        }
-
-        private static bool CompareGCStressModeAsLower(string value, string first, string second)
-        {
-            value = value.ToLowerInvariant();
-            return string.Equals(value, first.ToLowerInvariant(), StringComparison.InvariantCulture) ||
-                string.Equals(value, second.ToLowerInvariant(), StringComparison.InvariantCulture) ||
-                string.Equals(value, "0xf", StringComparison.InvariantCulture) ||
-                string.Equals(value, "f", StringComparison.InvariantCulture);
-        }
     }
 }
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/RuntimeConfiguration.cs b/src/Microsoft.DotNet.XUnitExtensions/src/RuntimeConfiguration.cs
index 74f3da88fa4..f4d78367ee8 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/src/RuntimeConfiguration.cs
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/RuntimeConfiguration.cs
@@ -11,6 +11,7 @@ public enum RuntimeConfiguration
         Any = ~0,
         Checked = 1,
         Debug = 1 << 1,
-        Release = 1 << 2
+        Release = 1 << 2,
+        NotRelease = ~Release
     }
 }
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/RuntimeTestModes.cs b/src/Microsoft.DotNet.XUnitExtensions/src/RuntimeTestModes.cs
index b8c32c93654..f64318dd4d2 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/src/RuntimeTestModes.cs
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/RuntimeTestModes.cs
@@ -17,22 +17,22 @@ public enum RuntimeTestModes
         // JitStress, JitStressRegs, JitMinOpts and TailcallStress enable
         // various modes in the JIT that cause us to exercise more code paths,
         // and generate different kinds of code
-        JitStress = 1 << 1, // COMPlus_JitStress is set.
-        JitStressRegs = 1 << 2, // COMPlus_JitStressRegs is set.
-        JitMinOpts = 1 << 3, // COMPlus_JITMinOpts is set.
-        TailcallStress = 1 << 4, // COMPlus_TailcallStress is set.
+        JitStress = 1 << 1, // DOTNET_JitStress (or COMPlus_JitStress) is set.
+        JitStressRegs = 1 << 2, // DOTNET_JitStressRegs (or COMPlus_JitStressRegs) is set.
+        JitMinOpts = 1 << 3, // DOTNET_JITMinOpts (or COMPlus_JITMinOpts) is set.
+        TailcallStress = 1 << 4, // DOTNET_TailcallStress (or COMPlus_TailcallStress) is set.
 
         // ZapDisable says to not use NGEN or ReadyToRun images.
         // This means we JIT everything.
-        ZapDisable = 1 << 5, // COMPlus_ZapDisable is set.
+        ZapDisable = 1 << 5, // DOTNET_ZapDisable (or COMPlus_ZapDisable) is set.
 
         // GCStress3 forces a GC at various locations, typically transitions
         // to/from the VM from managed code. 
-        GCStress3 = 1 << 6,  // COMPlus_GCStress includes mode 0x3.
+        GCStress3 = 1 << 6,  // DOTNET_GCStress (or COMPlus_GCStress) includes mode 0x3.
 
         // GCStressC forces a GC at every JIT-generated code instruction,
         // including in NGEN/ReadyToRun code.
-        GCStressC = 1 << 7, // COMPlus_GCStress includes mode 0xC.
+        GCStressC = 1 << 7, // DOTNET_GCStress (or COMPlus_GCStress) includes mode 0xC.
         AnyGCStress = GCStress3 | GCStressC // Disable when any GCStress is exercised.
     }
 }
diff --git a/src/Microsoft.DotNet.XUnitExtensions/tests/ConditionalAttributeTests.cs b/src/Microsoft.DotNet.XUnitExtensions/tests/ConditionalAttributeTests.cs
index 4981ba5d643..3624a069c9c 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/tests/ConditionalAttributeTests.cs
+++ b/src/Microsoft.DotNet.XUnitExtensions/tests/ConditionalAttributeTests.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Xunit;
+using Xunit.Sdk;
 
 namespace Microsoft.DotNet.XUnitExtensions.Tests
 {
@@ -24,6 +25,38 @@ public void ConditionalAttributeA()
             s_conditionalFactExecuted = true;
         }
 
+        [Fact]
+        [OuterLoop("never outer loop", TestPlatforms.Any & ~TestPlatforms.Any)]
+        public void NeverConditionalOuterLoopAttribute()
+        {
+            var method = System.Reflection.MethodBase.GetCurrentMethod();
+            var res = TraitHelper.GetTraits(method);
+
+            Assert.Empty(res);
+        }
+
+        [Fact]
+        [OuterLoop("always outer loop", TestPlatforms.Any)]
+        public void AlwaysConditionalOuterLoopAttribute()
+        {
+            var method = System.Reflection.MethodBase.GetCurrentMethod();
+            var res = TraitHelper.GetTraits(method);
+
+            Assert.Single(res);
+            Assert.Equal("outerloop", res[0].Value);
+        }
+
+        [Fact]
+        [OuterLoop("always outer loop")]
+        public void AlwaysOuterLoopAttribute()
+        {
+            var method = System.Reflection.MethodBase.GetCurrentMethod();
+            var res = TraitHelper.GetTraits(method);
+
+            Assert.Single(res);
+            Assert.Equal("outerloop", res[0].Value);
+        }
+
         [ConditionalTheory(nameof(AlwaysTrue))]
         [InlineData(1)]
         [InlineData(2)]
diff --git a/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj b/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj
index 6d04e47d39f..3413aedb76e 100644
--- a/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj
+++ b/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj
@@ -15,7 +15,7 @@
     <IsTool>true</IsTool>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LZMA-SDK" Version="18.1.0" />
+    <PackageReference Include="LZMA-SDK" Version="19.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6071" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="NuGet.Common" Version="4.7.0" />
diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/AuthentiCode.cs b/src/SignCheck/Microsoft.SignCheck/Verification/AuthentiCode.cs
index 4c80e48c148..1a8e0086634 100644
--- a/src/SignCheck/Microsoft.SignCheck/Verification/AuthentiCode.cs
+++ b/src/SignCheck/Microsoft.SignCheck/Verification/AuthentiCode.cs
@@ -29,7 +29,7 @@ public static uint IsSigned(string path)
             WinTrustData data = new WinTrustData()
             {
                 cbStruct = (uint)Marshal.SizeOf(typeof(WinTrustData)),
-                dwProvFlags = Convert.ToUInt32(Provider.WTD_SAFER_FLAG),
+                dwProvFlags = 0,
                 dwStateAction = Convert.ToUInt32(StateAction.WTD_STATEACTION_IGNORE),
                 dwUIChoice = Convert.ToUInt32(UIChoice.WTD_UI_NONE),
                 dwUIContext = 0,
diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/LzmaVerifier.cs b/src/SignCheck/Microsoft.SignCheck/Verification/LzmaVerifier.cs
index dfab290f1d8..47f1672cc0d 100644
--- a/src/SignCheck/Microsoft.SignCheck/Verification/LzmaVerifier.cs
+++ b/src/SignCheck/Microsoft.SignCheck/Verification/LzmaVerifier.cs
@@ -8,7 +8,7 @@ namespace Microsoft.SignCheck.Verification
 {
     public class LzmaVerifier : FileVerifier
     {
-        public LzmaVerifier(Log log, Exclusions exclusions, SignatureVerificationOptions options) : base(log, exclusions, options, fileExtension: "lzma")
+        public LzmaVerifier(Log log, Exclusions exclusions, SignatureVerificationOptions options) : base(log, exclusions, options, fileExtension: ".lzma")
         {
 
         }
diff --git a/src/SignCheck/SignCheck/Microsoft.DotNet.SignCheck.csproj b/src/SignCheck/SignCheck/Microsoft.DotNet.SignCheck.csproj
index f23cb7d7794..6c7b257e95b 100644
--- a/src/SignCheck/SignCheck/Microsoft.DotNet.SignCheck.csproj
+++ b/src/SignCheck/SignCheck/Microsoft.DotNet.SignCheck.csproj
@@ -30,6 +30,10 @@
     <ProjectReference Include="..\Microsoft.SignCheck\Microsoft.DotNet.SignCheckLibrary.csproj" PrivateAssets="All" Publish="true" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\Common\Internal\AssemblyResolution.cs" Link="src\AssemblyResolution.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="System.Net" Pack="false" />
   </ItemGroup>
diff --git a/src/SignCheck/SignCheck/SignCheckTask.cs b/src/SignCheck/SignCheck/SignCheckTask.cs
index 99a4d7776a9..1b40fd98456 100644
--- a/src/SignCheck/SignCheck/SignCheckTask.cs
+++ b/src/SignCheck/SignCheck/SignCheckTask.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
 using Microsoft.SignCheck.Logging;
 using System;
 using System.Collections.Generic;
@@ -10,8 +11,12 @@
 
 namespace SignCheck
 {
-    public class SignCheckTask : Microsoft.Build.Utilities.Task
+    [Microsoft.Build.Framework.LoadInSeparateAppDomain]
+    [RunInSTA]
+    public class SignCheckTask : AppDomainIsolatedTask
     {
+        static SignCheckTask() => Microsoft.DotNet.AssemblyResolution.Initialize();
+
         public bool EnableJarSignatureVerification
         {
             get;
@@ -85,6 +90,7 @@ public string ArtifactFolder
 
         public override bool Execute()
         {
+            Microsoft.DotNet.AssemblyResolution.Log = Log;
             Options options = new Options();
             options.EnableJarSignatureVerification = EnableJarSignatureVerification;
             options.EnableXmlSignatureVerification = EnableXmlSignatureVerification;
@@ -143,6 +149,7 @@ public override bool Execute()
             
             var sc = new SignCheck(options);
             int result = sc.Run();
+            Microsoft.DotNet.AssemblyResolution.Log = null;
             return (result == 0 && !Log.HasLoggedErrors);
         }
     }
diff --git a/tests/AspNetVersionCheck/aspnet-versioncheck.ps1 b/tests/AspNetVersionCheck/aspnet-versioncheck.ps1
new file mode 100644
index 00000000000..5c754f1f342
--- /dev/null
+++ b/tests/AspNetVersionCheck/aspnet-versioncheck.ps1
@@ -0,0 +1,29 @@
+Param(
+  [string] $aspNetCoreVersion
+)
+
+$versionRegex = "(?<version>\d+\.\d+)\.\d+(?:-(?<preview>\w+\.\d+)\.\d+\.\d+)?"
+
+$dotnetVersion = & dotnet --version
+$dotNetSdkMatch = $dotnetVersion -Match $versionRegex
+if ($dotNetSdkMatch -eq $false) {
+  Write-Host ".NET SDK version '$dotnetVersion' did not match regex!"
+  exit 2
+}
+$dotnetMajorVersion = $Matches.version
+$dotnetPreviewVersion = $Matches.preview
+Write-Host ".NET SDK '$dotnetVersion' -- major version: '$dotnetMajorVersion'; preview: '$dotnetPreviewVersion'"
+
+$aspNetCoreMatch = $aspNetCoreVersion -Match $versionRegex
+if ($aspNetCoreMatch -eq $false) {
+  Write-Host "ASP.NET Core Runtime version '$aspNetCoreVersion' did not match regex!"
+  exit 3
+}
+$aspNetCoreMajorVersion = $Matches.version
+$aspNetCorePreviewVersion = $Matches.preview
+Write-Host "ASP.NET SDK '$aspNetCoreVersion' -- major version: '$aspNetCoreMajorVersion'; preview: '$aspNetCorePreviewVersion'"
+
+if ($dotnetMajorVersion -ne $aspNetCoreMajorVersion -or $dotnetPreviewVersion -ne $aspNetCorePreviewVersion) {
+    Write-Host "ASP.NET Core Runtime version and .NET Core Runtime version do not match -- update DotNetCli.props!"
+    exit 1
+}
\ No newline at end of file
diff --git a/tests/UnitTests.XHarness.Android.LinuxQueues.proj b/tests/UnitTests.XHarness.Android.LinuxQueues.proj
deleted file mode 100644
index a8d3dbcd51f..00000000000
--- a/tests/UnitTests.XHarness.Android.LinuxQueues.proj
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project DefaultTargets="Test">
-  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
-  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.props"/>
-
-  <!--
-    This is a project used in integration tests of Arcade.
-    It tests sending Android (XHarness) workloads using the Helix SDK to Linux-specific queues
-    It builds a mock project that does not build an APK directly but only downloads it from a storage account.
-   -->
-
-  <PropertyGroup>
-    <MicrosoftDotNetHelixSdkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/netcoreapp3.1/publish/Microsoft.DotNet.Helix.Sdk.dll</MicrosoftDotNetHelixSdkTasksAssembly>
-    <MicrosoftDotNetHelixSdkTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/net472/publish/Microsoft.DotNet.Helix.Sdk.dll</MicrosoftDotNetHelixSdkTasksAssembly>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <HelixType>test/product/</HelixType>
-    <TestRunNamePrefix>$(AGENT_JOBNAME)</TestRunNamePrefix>
-    <IncludeXHarnessCli>true</IncludeXHarnessCli>
-    <EnableXUnitReporter>true</EnableXUnitReporter>
-    <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
-    <HelixBaseUri>https://helix.dot.net</HelixBaseUri>
-  </PropertyGroup>
-
-  <!-- New Test Projects which build packages to run through XHarness/XHarness go here -->
-  <ItemGroup>
-    <XHarnessAndroidProject Include="$(MSBuildThisFileDirectory)XHarness/XHarness.TestApks.proj" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(HelixAccessToken)' != '' ">
-    <HelixTargetQueue Include="ubuntu.1804.amd64.android"/>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(HelixAccessToken)' == '' ">
-    <HelixTargetQueue Include="ubuntu.1804.amd64.android.open"/>
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(HelixAccessToken)' == '' ">
-    <IsExternal>true</IsExternal>
-    <Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator>
-    <Creator Condition=" '$(Creator)' == ''">anon</Creator>
-  </PropertyGroup>
-
-  <!-- Useless stuff to make Arcade SDK happy -->
-  <PropertyGroup>
-    <Language>msbuild</Language>
-  </PropertyGroup>
-  <Target Name="Pack"/>
-
-  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
-  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
-</Project>
diff --git a/tests/UnitTests.XHarness.Android.WindowsQueues.proj b/tests/UnitTests.XHarness.Android.WindowsQueues.proj
deleted file mode 100644
index 1614ac47ea5..00000000000
--- a/tests/UnitTests.XHarness.Android.WindowsQueues.proj
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project DefaultTargets="Test">
-  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
-  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.props"/>
-
-  <!--
-    This is a project used in integration tests of Arcade.
-    It tests sending Android (XHarness) workloads using the Helix SDK to Windows-specific queues
-    It builds a mock project that does not build an APK directly but only downloads it from a storage account.
-   -->
-
-  <PropertyGroup>
-    <MicrosoftDotNetHelixSdkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/netcoreapp3.1/publish/Microsoft.DotNet.Helix.Sdk.dll</MicrosoftDotNetHelixSdkTasksAssembly>
-    <MicrosoftDotNetHelixSdkTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/net472/publish/Microsoft.DotNet.Helix.Sdk.dll</MicrosoftDotNetHelixSdkTasksAssembly>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <HelixType>test/product/</HelixType>
-    <TestRunNamePrefix>$(AGENT_JOBNAME)</TestRunNamePrefix>
-    <IncludeXHarnessCli>true</IncludeXHarnessCli>
-    <EnableXUnitReporter>true</EnableXUnitReporter>
-    <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
-    <HelixBaseUri>https://helix.dot.net</HelixBaseUri>
-  </PropertyGroup>
-
-  <!-- New Test Projects which build packages to run through XHarness/XHarness go here -->
-  <ItemGroup>
-    <XHarnessAndroidProject Include="$(MSBuildThisFileDirectory)XHarness/XHarness.TestApks.proj" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(HelixAccessToken)' != '' ">
-    <HelixTargetQueue Include="windows.10.amd64.android"/>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(HelixAccessToken)' == '' ">
-    <HelixTargetQueue Include="windows.10.amd64.android.open" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(HelixAccessToken)' == '' ">
-    <IsExternal>true</IsExternal>
-    <Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator>
-    <Creator Condition=" '$(Creator)' == ''">anon</Creator>
-  </PropertyGroup>
-
-  <!-- Useless stuff to make Arcade SDK happy -->
-  <PropertyGroup>
-    <Language>msbuild</Language>
-  </PropertyGroup>
-  <Target Name="Pack"/>
-
-  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
-  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
-</Project>
diff --git a/tests/UnitTests.XHarness.iOS.IncludeCliOnly.proj b/tests/UnitTests.XHarness.iOS.IncludeCliOnly.proj
deleted file mode 100644
index 70357b5d596..00000000000
--- a/tests/UnitTests.XHarness.iOS.IncludeCliOnly.proj
+++ /dev/null
@@ -1,54 +0,0 @@
-<Project DefaultTargets="Test">
-  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
-  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.props"/>
-
-  <!--
-    This is a project used in integration tests of Arcade.
-    It tests a case where we pre-install the XHarness tool for the job and users can call it themselves.
-   -->
-
-  <PropertyGroup>
-    <MicrosoftDotNetHelixSdkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/netcoreapp3.1/publish/Microsoft.DotNet.Helix.Sdk.dll</MicrosoftDotNetHelixSdkTasksAssembly>
-    <MicrosoftDotNetHelixSdkTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/net472/publish/Microsoft.DotNet.Helix.Sdk.dll</MicrosoftDotNetHelixSdkTasksAssembly>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <HelixType>test/product/</HelixType>
-    <TestRunNamePrefix>$(AGENT_JOBNAME)</TestRunNamePrefix>
-    <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
-    <HelixBaseUri>https://helix.dot.net</HelixBaseUri>
-    <IncludeXHarnessCli>true</IncludeXHarnessCli>
-  </PropertyGroup>
-
-  <!-- We test that the XHarness CLI is pre-installed and issue the state command -->
-  <ItemGroup>
-    <HelixWorkItem Include="xharness-ios-state">
-      <Command>dotnet exec "$XHARNESS_CLI_PATH" apple state</Command>
-      <Timeout>00:03:00</Timeout>
-    </HelixWorkItem>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(HelixAccessToken)' != '' ">
-    <HelixTargetQueue Include="osx.1015.amd64"/>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(HelixAccessToken)' == '' ">
-    <HelixTargetQueue Include="osx.1015.amd64.open"/>
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(HelixAccessToken)' == '' ">
-    <IsExternal>true</IsExternal>
-    <Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator>
-    <Creator Condition=" '$(Creator)' == ''">anon</Creator>
-  </PropertyGroup>
-
-  <!-- Useless stuff to make Arcade SDK happy -->
-  <PropertyGroup>
-    <Language>msbuild</Language>
-  </PropertyGroup>
-
-  <Target Name="Pack"/>
-
-  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
-  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
-</Project>
diff --git a/tests/UnitTests.XHarness.iOS.proj b/tests/UnitTests.XHarness.iOS.proj
deleted file mode 100644
index f3232f46ad1..00000000000
--- a/tests/UnitTests.XHarness.iOS.proj
+++ /dev/null
@@ -1,54 +0,0 @@
-<Project DefaultTargets="Test">
-  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
-  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.props"/>
-
-  <!--
-    This is a project used in integration tests of Arcade.
-    It tests sending iOS (XHarness) workloads using the Helix SDK.
-    It builds two mock projects that do not build iOS apps but only downloads them from a storage account.
-   -->
-
-  <PropertyGroup>
-    <MicrosoftDotNetHelixSdkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/netcoreapp3.1/publish/Microsoft.DotNet.Helix.Sdk.dll</MicrosoftDotNetHelixSdkTasksAssembly>
-    <MicrosoftDotNetHelixSdkTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)../artifacts/bin/Microsoft.DotNet.Helix.Sdk/$(Configuration)/net472/publish/Microsoft.DotNet.Helix.Sdk.dll</MicrosoftDotNetHelixSdkTasksAssembly>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <HelixType>test/product/</HelixType>
-    <TestRunNamePrefix>$(AGENT_JOBNAME)</TestRunNamePrefix>
-    <IncludeXHarnessCli>true</IncludeXHarnessCli>
-    <EnableXUnitReporter>true</EnableXUnitReporter>
-    <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
-    <HelixBaseUri>https://helix.dot.net</HelixBaseUri>
-  </PropertyGroup>
-
-  <!-- Test project which builds app bundle to run via XHarness -->
-  <ItemGroup>
-    <XHarnessAppleProject Include="$(MSBuildThisFileDirectory)XHarness\XHarness.TestAppBundle.proj" />
-    <XHarnessAppleProject Include="$(MSBuildThisFileDirectory)XHarness\XHarness.RunAppBundle.proj" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(HelixAccessToken)' != '' ">
-    <HelixTargetQueue Include="osx.1015.amd64"/>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(HelixAccessToken)' == '' ">
-    <HelixTargetQueue Include="osx.1015.amd64.open"/>
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(HelixAccessToken)' == '' ">
-    <IsExternal>true</IsExternal>
-    <Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator>
-    <Creator Condition=" '$(Creator)' == ''">anon</Creator>
-  </PropertyGroup>
-
-  <!-- Useless stuff to make Arcade SDK happy -->
-  <PropertyGroup>
-    <Language>msbuild</Language>
-  </PropertyGroup>
-
-  <Target Name="Pack"/>
-
-  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
-  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
-</Project>
diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj
index b1e35c137b7..b200bcfd4a6 100644
--- a/tests/UnitTests.proj
+++ b/tests/UnitTests.proj
@@ -46,10 +46,22 @@
     <XUnitProject Remove="..\src\Microsoft.DotNet.Build.Tasks.VisualStudio.Tests\Microsoft.DotNet.Build.Tasks.VisualStudio.Tests.csproj"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <HelixWorkItem Include="FailingXUnitTestsTest">
+      <Command>echo 'done!'</Command>
+      <PayloadDirectory>$(MSBuildThisFileDirectory)XUnit</PayloadDirectory>
+    </HelixWorkItem>
+  </ItemGroup>
+  <!-- Exercise Helix failure reporting path for Xunit --> 
+  <ItemGroup>
+    <AzurePipelinesExpectedTestFailure Include="XunitReportingTests.ExerciseXunitCharacterFilteringFailurePath"/>
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(HelixAccessToken)' != '' ">
     <HelixTargetQueue Include="Debian.9.Amd64"/>
     <HelixTargetQueue Include="RedHat.7.Amd64"/>
     <HelixTargetQueue Include="Windows.10.Amd64"/>
+    <HelixTargetQueue Include="(Debian.10.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673"/>
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(HelixAccessToken)' == '' ">
@@ -62,6 +74,7 @@
     <HelixTargetQueue Include="Debian.9.Amd64.Open"/>
     <HelixTargetQueue Include="RedHat.7.Amd64.Open"/>
     <HelixTargetQueue Include="Windows.10.Amd64.Open"/>
+    <HelixTargetQueue Include="(Debian.10.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673"/>
   </ItemGroup>
 
   <PropertyGroup Condition="!$(HelixTargetQueue.StartsWith('Windows'))">
@@ -100,4 +113,11 @@
   <!-- <Import Sdk="Microsoft.DotNet.Helix.Sdk" Project="Sdk.targets"/> -->
   <!-- Using locally built version of the helix sdk, normal projects replace the below Import with the SDK import above-->
   <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
+
+  <ItemGroup>
+    <HelixWorkItem Condition="$(HelixTargetQueue.StartsWith('Windows'))" Include="AspNetCoreTest">
+      <Command>powershell %HELIX_WORKITEM_PAYLOAD%\aspnet-versioncheck.ps1 -aspNetCoreVersion $(AspNetCoreRuntimeVersion)</Command>
+      <PayloadDirectory>$(MSBuildThisFileDirectory)\AspNetVersionCheck</PayloadDirectory>
+    </HelixWorkItem>
+  </ItemGroup>
 </Project>
diff --git a/tests/XHarness.Android.DeviceTests.proj b/tests/XHarness.Android.DeviceTests.proj
new file mode 100644
index 00000000000..839df67cc7d
--- /dev/null
+++ b/tests/XHarness.Android.DeviceTests.proj
@@ -0,0 +1,15 @@
+<Project DefaultTargets="Test">
+  <Import Project="./XHarness.Tests.Common.props"/>
+
+  <ItemGroup>
+    <XHarnessAndroidProject Include="$(MSBuildThisFileDirectory)XHarness/XHarness.TestApks.proj">
+      <AdditionalProperties>XHarnessTestARM64_V8A=true</AdditionalProperties>
+    </XHarnessAndroidProject>
+    <HelixTargetQueue Include="windows.10.amd64.android.open" />
+  </ItemGroup>
+
+  <Target Name="Pack"/>
+
+  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
+  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
+</Project>
diff --git a/tests/XHarness.Android.SimulatorTests.proj b/tests/XHarness.Android.SimulatorTests.proj
new file mode 100644
index 00000000000..9f4e26099e2
--- /dev/null
+++ b/tests/XHarness.Android.SimulatorTests.proj
@@ -0,0 +1,21 @@
+<Project DefaultTargets="Test">
+  <Import Project="./XHarness.Tests.Common.props"/>
+
+  <!--
+    This is a project used in integration tests of Arcade.
+    It tests sending Android (XHarness) workloads using the Helix SDK to Linux-specific queues
+    It builds a mock project that does not build an APK directly but only downloads it from a storage account.
+   -->
+
+  <ItemGroup>
+    <XHarnessAndroidProject Include="$(MSBuildThisFileDirectory)XHarness/XHarness.TestApks.proj">
+      <AdditionalProperties>XHarnessTestX86=true;XHarnessTestX86_64=true</AdditionalProperties>
+    </XHarnessAndroidProject>
+    <HelixTargetQueue Include="ubuntu.1804.amd64.android.29.open"/>
+  </ItemGroup>
+
+  <Target Name="Pack"/>
+
+  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
+  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
+</Project>
diff --git a/tests/XHarness.Apple.DeviceTests.proj b/tests/XHarness.Apple.DeviceTests.proj
new file mode 100644
index 00000000000..45767b6b9cc
--- /dev/null
+++ b/tests/XHarness.Apple.DeviceTests.proj
@@ -0,0 +1,20 @@
+<Project DefaultTargets="Test">
+  <Import Project="./XHarness.Tests.Common.props"/>
+
+  <!--
+    This is a project used in integration tests of Arcade.
+    It tests sending tvOS (XHarness) workloads using the Helix SDK.
+    It builds a mock project that does not build the apps but only downloads them from a storage account.
+   -->
+
+  <!-- Test project which builds app bundle to run via XHarness -->
+  <ItemGroup>
+    <XHarnessAppleProject Include="$(MSBuildThisFileDirectory)XHarness\XHarness.Apple.Device.Archived.proj" />
+    <HelixTargetQueue Include="osx.1015.amd64.appletv.open" />
+  </ItemGroup>
+
+  <Target Name="Pack"/>
+
+  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
+  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
+</Project>
diff --git a/tests/XHarness.Apple.SimulatorTests.proj b/tests/XHarness.Apple.SimulatorTests.proj
new file mode 100644
index 00000000000..5e9a98ac97d
--- /dev/null
+++ b/tests/XHarness.Apple.SimulatorTests.proj
@@ -0,0 +1,23 @@
+<Project DefaultTargets="Test">
+  <Import Project="./XHarness.Tests.Common.props"/>
+
+  <!--
+    This is a project used in integration tests of Arcade.
+    It tests sending iOS (XHarness) workloads using the Helix SDK.
+    It builds two mock projects that do not build iOS apps but only downloads them from a storage account.
+   -->
+
+  <!-- Test project which builds app bundle to run via XHarness -->
+  <ItemGroup>
+    <XHarnessAppleProject Include="$(MSBuildThisFileDirectory)XHarness\XHarness.Apple.Simulator.Test.proj" />
+    <XHarnessAppleProject Include="$(MSBuildThisFileDirectory)XHarness\XHarness.Apple.Simulator.Run.proj" />
+    <XHarnessAppleProject Include="$(MSBuildThisFileDirectory)XHarness\XHarness.Apple.Simulator.CustomCommands.proj" />
+
+    <HelixTargetQueue Include="osx.1015.amd64.open"/>
+  </ItemGroup>
+
+  <Target Name="Pack"/>
+
+  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
+  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
+</Project>
diff --git a/tests/UnitTests.XHarness.iOS.Device.proj b/tests/XHarness.Tests.Common.props
similarity index 63%
rename from tests/UnitTests.XHarness.iOS.Device.proj
rename to tests/XHarness.Tests.Common.props
index 40172f0e4eb..616bc559992 100644
--- a/tests/UnitTests.XHarness.iOS.Device.proj
+++ b/tests/XHarness.Tests.Common.props
@@ -1,11 +1,9 @@
-<Project DefaultTargets="Test">
+<Project>
   <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
   <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.props"/>
 
   <!--
-    This is a project used in integration tests of Arcade.
-    It tests sending iOS (XHarness) workloads using the Helix SDK.
-    It builds two mock projects that do not build iOS apps but only downloads them from a storage account.
+    This is a set of common properties used in integration tests of the XHarness Helix SDK.
    -->
 
   <PropertyGroup>
@@ -17,19 +15,14 @@
     <HelixType>test/product/</HelixType>
     <TestRunNamePrefix>$(AGENT_JOBNAME)</TestRunNamePrefix>
     <IncludeXHarnessCli>true</IncludeXHarnessCli>
-    <EnableXUnitReporter>true</EnableXUnitReporter>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <HelixBaseUri>https://helix.dot.net</HelixBaseUri>
   </PropertyGroup>
 
-  <!-- Test project which builds app bundle to run via XHarness -->
-  <ItemGroup>
-    <XHarnessAppleProject Include="$(MSBuildThisFileDirectory)XHarness\XHarness.RunAppBundle.Device.proj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <HelixTargetQueue Include="osx.1015.amd64.iphone.open" />
-  </ItemGroup>
+  <!-- For non-ci local runs -->
+  <PropertyGroup Condition=" '$(AGENT_JOBNAME)' == '' ">
+    <EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
+  </PropertyGroup>
 
   <PropertyGroup Condition=" '$(HelixAccessToken)' == '' ">
     <IsExternal>true</IsExternal>
@@ -42,8 +35,4 @@
     <Language>msbuild</Language>
   </PropertyGroup>
 
-  <Target Name="Pack"/>
-
-  <!-- See UnitTests.proj in above folder for why this is included directly-from-repo -->
-  <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
 </Project>
diff --git a/tests/XHarness/.gitattributes b/tests/XHarness/.gitattributes
new file mode 100644
index 00000000000..a584c86a720
--- /dev/null
+++ b/tests/XHarness/.gitattributes
@@ -0,0 +1,2 @@
+# We need to force LF on Windows because the XML contains bash commands which will be executed on a MacOS machine
+XHarness.Apple.*.proj text eol=lf
\ No newline at end of file
diff --git a/tests/XHarness/XHarness.Apple.Device.Archived.proj b/tests/XHarness/XHarness.Apple.Device.Archived.proj
new file mode 100644
index 00000000000..5b5d7ececad
--- /dev/null
+++ b/tests/XHarness/XHarness.Apple.Device.Archived.proj
@@ -0,0 +1,33 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+
+  <PropertyGroup>
+    <XHarnessTestAppName>System.Buffers.Tests.app</XHarnessTestAppName>
+    <XHarnessTestAppUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/ios/test-app/tvos-device/zipped-apps.zip</XHarnessTestAppUrl>
+    <XHarnessTestTmpDir>$(ArtifactsTmpDir)XHarness.Apple.Device.Archived</XHarnessTestTmpDir>
+  </PropertyGroup>
+
+  <!-- We will download existing app and package it so that we have coverage for injecting of provisioning profiles into archives -->
+  <Target Name="Build" Returns="@(XHarnessAppBundleToTest)">
+    <Error Condition=" '$(ArtifactsTmpDir)' == ''" Text="Not downloading AppBundle because ArtifactsTmpDir property is unset" />
+
+    <DownloadFile SourceUrl="$(XHarnessTestAppUrl)" DestinationFolder="$(XHarnessTestTmpDir)" SkipUnchangedFiles="True" Retries="5">
+      <Output TaskParameter="DownloadedFile" ItemName="TestApp" />
+    </DownloadFile>
+
+    <ItemGroup>
+      <XHarnessAppBundleToTest Include="@(TestApp)">
+        <TestTarget>tvos-device</TestTarget>
+        <WorkItemTimeout>00:18:00</WorkItemTimeout>
+        <CustomCommands>
+          <![CDATA[
+          sign $(XHarnessTestAppName)
+          xharness apple test -a $(XHarnessTestAppName) -o $output_directory -t $target -v --timeout 00:08:50
+          ]]>
+        </CustomCommands>
+      </XHarnessAppBundleToTest>
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/tests/XHarness/XHarness.Apple.Simulator.CustomCommands.proj b/tests/XHarness/XHarness.Apple.Simulator.CustomCommands.proj
new file mode 100644
index 00000000000..94d06fdef5e
--- /dev/null
+++ b/tests/XHarness/XHarness.Apple.Simulator.CustomCommands.proj
@@ -0,0 +1,45 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+
+  <PropertyGroup>
+    <XHarnessAppBundleName>System.Numerics.Vectors.Tests</XHarnessAppBundleName>
+    <XHarnessAppBundleUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/ios/test-app/ios-simulator-64/$(XHarnessAppBundleName).app.zip</XHarnessAppBundleUrl>
+  </PropertyGroup>
+
+  <!-- We're not set up currently to build app bundles as part of normal builds, so this downloads existing ones for now -->
+  <Target Name="Build" Returns="@(XHarnessAppBundleToTest)">
+    <Error Condition=" '$(ArtifactsTmpDir)' == ''" Text="Not downloading AppBundle because ArtifactsTmpDir property is unset" />
+    <DownloadFile SourceUrl="$(XHarnessAppBundleUrl)" DestinationFolder="$(ArtifactsTmpDir)XHarness.CustomCommandsAppBundle" SkipUnchangedFiles="True" Retries="5">
+      <Output TaskParameter="DownloadedFile" ItemName="ZippedAppBundle" />
+    </DownloadFile>
+
+    <Message Text="Downloaded @(ZippedAppBundle) for XHarness Test purposes" Importance="High" />
+
+    <Exec Command="tar -xzf @(ZippedAppBundle) -C $(ArtifactsTmpDir)XHarness.CustomCommandsAppBundle" />
+
+    <ItemGroup>
+      <XHarnessAppBundleToTest Include="$(ArtifactsTmpDir)XHarness.CustomCommandsAppBundle/$(XHarnessAppBundleName).app">
+        <TestTarget>ios-simulator-64</TestTarget>
+        <WorkItemTimeout>00:15:00</WorkItemTimeout>
+        <TestTimeout>00:05:00</TestTimeout>
+        <LaunchTimeout>00:05:00</LaunchTimeout>
+        <CustomCommands>
+          <![CDATA[
+          set -ex
+          deviceId=`xharness apple device $target`
+          xharness apple install -t=$target --device="$deviceId" -o="$output_directory" --app="$app" -v
+          set +e
+          result=0
+          xharness apple just-test -t=$target --device="$deviceId" -o="$output_directory" --app="net.dot.$(XHarnessAppBundleName)" --launch-timeout=$launch_timeout --timeout=$timeout -v
+          ((result|=$?))
+          xharness apple uninstall -t=$target --device="$deviceId" -o="$output_directory" --app="net.dot.$(XHarnessAppBundleName)" -v
+          ((result|=$?))
+          exit $result
+          ]]>
+        </CustomCommands>
+      </XHarnessAppBundleToTest>
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/tests/XHarness/XHarness.RunAppBundle.proj b/tests/XHarness/XHarness.Apple.Simulator.Run.proj
similarity index 91%
rename from tests/XHarness/XHarness.RunAppBundle.proj
rename to tests/XHarness/XHarness.Apple.Simulator.Run.proj
index f7a836eb9b3..54a7b58068b 100644
--- a/tests/XHarness/XHarness.RunAppBundle.proj
+++ b/tests/XHarness/XHarness.Apple.Simulator.Run.proj
@@ -20,10 +20,9 @@
 
     <ItemGroup>
       <XHarnessAppBundleToTest Include="$(ArtifactsTmpDir)XHarness.RunAppBundle/$(XHarnessRunAppBundleName)">
-        <Targets>ios-simulator-64</Targets>
-        <WorkItemTimeout>00:10:00</WorkItemTimeout>
+        <TestTarget>ios-simulator-64</TestTarget>
+        <WorkItemTimeout>00:12:00</WorkItemTimeout>
         <TestTimeout>00:08:00</TestTimeout>
-        <LaunchTimeout>00:05:00</LaunchTimeout>
         <IncludesTestRunner>false</IncludesTestRunner>
         <ExpectedExitCode>200</ExpectedExitCode>
       </XHarnessAppBundleToTest>
diff --git a/tests/XHarness/XHarness.TestAppBundle.proj b/tests/XHarness/XHarness.Apple.Simulator.Test.proj
similarity index 82%
rename from tests/XHarness/XHarness.TestAppBundle.proj
rename to tests/XHarness/XHarness.Apple.Simulator.Test.proj
index 6225cbc254a..babce06d5da 100644
--- a/tests/XHarness/XHarness.TestAppBundle.proj
+++ b/tests/XHarness/XHarness.Apple.Simulator.Test.proj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
 
   <PropertyGroup>
-    <XHarnessTestAppBundleName>System.Numerics.Vectors.Tests.app</XHarnessTestAppBundleName>
+    <XHarnessTestAppBundleName>Microsoft.Extensions.Configuration.CommandLine.Tests.app</XHarnessTestAppBundleName>
     <XHarnessTestAppBundleUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/ios/test-app/ios-simulator-64/$(XHarnessTestAppBundleName).zip</XHarnessTestAppBundleUrl>
   </PropertyGroup>
 
@@ -20,10 +20,9 @@
 
     <ItemGroup>
       <XHarnessAppBundleToTest Include="$(ArtifactsTmpDir)XHarness.TestAppBundle/$(XHarnessTestAppBundleName)">
-        <Targets>ios-simulator-64</Targets>
-        <TestTimeout>00:30:00</TestTimeout>
-        <WorkItemTimeout>00:35:00</WorkItemTimeout>
-        <LaunchTimeout>00:20:00</LaunchTimeout>
+        <TestTarget>ios-simulator-64</TestTarget>
+        <TestTimeout>00:05:00</TestTimeout>
+        <WorkItemTimeout>00:15:00</WorkItemTimeout>
       </XHarnessAppBundleToTest>
     </ItemGroup>
   </Target>
diff --git a/tests/XHarness/XHarness.RunAppBundle.Device.proj b/tests/XHarness/XHarness.RunAppBundle.Device.proj
deleted file mode 100644
index 783e474c297..00000000000
--- a/tests/XHarness/XHarness.RunAppBundle.Device.proj
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
-
-  <PropertyGroup>
-    <XHarnessRunAppBundleName>HelloiOS.app</XHarnessRunAppBundleName>
-    <XHarnessRunAppBundleUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/ios/test-app/ios-device/$(XHarnessRunAppBundleName).unsigned.zip</XHarnessRunAppBundleUrl>
-  </PropertyGroup>
-
-  <!-- We're not set up currently to build app bundles as part of normal builds, so this downloads existing ones for now -->
-  <Target Name="Build" Returns="@(XHarnessAppBundleToTest)">
-    <Error Condition=" '$(ArtifactsTmpDir)' == ''" Text="Not downloading AppBundle because ArtifactsTmpDir property is unset" />
-    <DownloadFile SourceUrl="$(XHarnessRunAppBundleUrl)" DestinationFolder="$(ArtifactsTmpDir)XHarness.RunDeviceAppBundle" SkipUnchangedFiles="True" Retries="5">
-      <Output TaskParameter="DownloadedFile" ItemName="ZippedAppBundle" />
-    </DownloadFile>
-
-    <Message Text="Downloaded @(ZippedAppBundle) for XHarness Test purposes" Importance="High" />
-
-    <Exec Command="tar -xzf @(ZippedAppBundle) -C $(ArtifactsTmpDir)XHarness.RunDeviceAppBundle" />
-
-    <ItemGroup>
-      <XHarnessAppBundleToTest Include="$(ArtifactsTmpDir)XHarness.RunDeviceAppBundle/$(XHarnessRunAppBundleName)">
-        <Targets>ios-device</Targets>
-        <WorkItemTimeout>00:05:00</WorkItemTimeout>
-        <TestTimeout>00:04:00</TestTimeout>
-        <LaunchTimeout>00:03:00</LaunchTimeout>
-        <IncludesTestRunner>false</IncludesTestRunner>
-        <ExpectedExitCode>200</ExpectedExitCode>
-      </XHarnessAppBundleToTest>
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/tests/XHarness/XHarness.TestApks.proj b/tests/XHarness/XHarness.TestApks.proj
index b26e872c26a..5ee82fe36fa 100644
--- a/tests/XHarness/XHarness.TestApks.proj
+++ b/tests/XHarness/XHarness.TestApks.proj
@@ -8,26 +8,40 @@
     <XHarnessARM64V8TestApkUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/android/test-apk/arm64_v8a/System.Buffers.Tests-arm64-v8a.apk</XHarnessARM64V8TestApkUrl>
   </PropertyGroup>
 
+  <!-- We're not set up currently to build APK files as part of normal builds, so this downloads existing ones for now -->
   <Target Name="Build" Returns="@(XHarnessApkToTest)" >
     <Error Condition=" '$(ArtifactsTmpDir)' == ''" Text="Not downloading APK because ArtifactsTmpDir property is unset" />
 
-    <DownloadFile Condition="'$(XharnessTestX86)' == 'true'" SourceUrl="$(XHarnessX86TestApkUrl)" DestinationFolder="$(ArtifactsTmpDir)XHarness.TestApk\x86" SkipUnchangedFiles="True" Retries="5">
+    <DownloadFile Condition="'$(XHarnessTestX86)' == 'true'" SourceUrl="$(XHarnessX86TestApkUrl)" DestinationFolder="$(ArtifactsTmpDir)XHarness.TestApk\x86" SkipUnchangedFiles="True" Retries="5">
       <Output TaskParameter="DownloadedFile" ItemName="DownloadedApkFile" />
     </DownloadFile>
 
-    <DownloadFile Condition="'$(XharnessTestX86_64)' == 'true'" SourceUrl="$(XHarnessX64TestApkUrl)" DestinationFolder="$(ArtifactsTmpDir)XHarness.TestApk\x86_64" SkipUnchangedFiles="True" Retries="5">
+    <DownloadFile Condition="'$(XHarnessTestX86_64)' == 'true'" SourceUrl="$(XHarnessX64TestApkUrl)" DestinationFolder="$(ArtifactsTmpDir)XHarness.TestApk\x86_64" SkipUnchangedFiles="True" Retries="5">
       <Output TaskParameter="DownloadedFile" ItemName="DownloadedApkFile" />
     </DownloadFile>
 
-    <DownloadFile Condition="'$(XharnessTestARM64_V8A)' == 'true'" SourceUrl="$(XHarnessARM64V8TestApkUrl)" DestinationFolder="$(ArtifactsTmpDir)XHarness.TestApk\arm64_v8a" SkipUnchangedFiles="True" Retries="5">
+    <DownloadFile Condition="'$(XHarnessTestARM64_V8A)' == 'true'" SourceUrl="$(XHarnessARM64V8TestApkUrl)" DestinationFolder="$(ArtifactsTmpDir)XHarness.TestApk\arm64_v8a" SkipUnchangedFiles="True" Retries="5">
       <Output TaskParameter="DownloadedFile" ItemName="DownloadedApkFile" />
     </DownloadFile>
+    
+    <Error Condition=" '@(DownloadedApkFile)' == '' " Text="You have to specify at least one target by setting one of following properties to true - XHarnessX86TestApkUrl / XHarnessX64TestApkUrl / XHarnessARM64V8TestApkUrl" />
 
     <Message Text="Downloaded @(DownloadedApkFile) for XHarness Test purposes" Importance="High" />
 
+    <!-- We create two work items for each app - one normal and one using the custom commands to test that flow too -->
     <ItemGroup>
-      <!-- We're not set up currently to build APK files as part of normal builds, so this downloads existing ones for now -->
-      <XHarnessApkToTest Include="@(DownloadedApkFile)">
+      <XHarnessApkToTest Include="@(DownloadedApkFile -> '%(Filename)')">
+        <ApkPath>%(FullPath)</ApkPath>
+
+        <!-- Package name: this comes from metadata inside the apk itself -->
+        <AndroidPackageName>net.dot.System.Buffers.Tests</AndroidPackageName>
+
+        <!-- If there are > 1 instrumentation class inside the package, we need to know the name of which to use -->
+        <AndroidInstrumentationName>net.dot.MonoRunner</AndroidInstrumentationName>
+      </XHarnessApkToTest>
+
+      <XHarnessApkToTest Include="@(DownloadedApkFile -> '%(Filename)-custom-command')">
+        <ApkPath>%(FullPath)</ApkPath>
 
         <!-- Package name: this comes from metadata inside the apk itself -->
         <AndroidPackageName>net.dot.System.Buffers.Tests</AndroidPackageName>
@@ -35,6 +49,12 @@
         <!-- If there are > 1 instrumentation class inside the package, we need to know the name of which to use -->
         <AndroidInstrumentationName>net.dot.MonoRunner</AndroidInstrumentationName>
 
+        <!-- This command is the same for PowerShell and bash so no need to detect the platform -->
+        <CustomCommands>
+          <![CDATA[
+          xharness android test --app "$app" --package-name "$package_name" --output-directory "$output_directory" --instrumentation "$instrumentation" --timeout "$timeout" -v
+          ]]>
+        </CustomCommands>
       </XHarnessApkToTest>
     </ItemGroup>
   </Target>
diff --git a/tests/XUnit/testResults.xml b/tests/XUnit/testResults.xml
new file mode 100644
index 00000000000..960c5d56442
--- /dev/null
+++ b/tests/XUnit/testResults.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assemblies timestamp="05/24/2021 16:33:36">
+  <assembly name="SomeXUnitTests.DLL" total="1" passed="0" failed="1" skipped="0" time="0.435" errors="0">
+    <errors />
+    <collection total="1" passed="0" failed="1" skipped="0" name="Test collection for XunitReportingTests" time="0.056">
+      <test name="XunitReportingTests.ExerciseXunitCharacterFilteringFailurePath" type="XunitReportingTests" method="ExerciseXunitCharacterFilteringFailurePath" time="0.0564499" result="Fail">
+        <failure exception-type="Xunit.Sdk.TrueException">
+          <message><![CDATA[Intentional Failure 🍕 \r \n \t \a \b \v \f \0\r\nExpected: True\r\nActual:   False]]></message>
+          <stack-trace><![CDATA[   at XunitReportingTests.ExerciseXunitCharacterFilteringFailurePath() in Class1.cs:line 1]]></stack-trace>
+        </failure>
+      </test>
+    </collection>
+  </assembly>
+</assemblies>
\ No newline at end of file