diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 00000000000..ea4af53a20f
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "coverlet.console": {
+      "version": "1.5.51-ged9195d73b",
+      "commands": [
+        "coverlet"
+      ]
+    },
+    "dotnet-reportgenerator-globaltool": {
+      "version": "4.1.6",
+      "commands": [
+        "reportgenerator"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/NuGet.config b/NuGet.config
index 2ba88b8eb43..914b0da814d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,5 +4,7 @@
     <clear />
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="test" value="https://www.myget.org/F/2c042c750fe047a1b5ed74bbd75bcd89/api/v3/index.json" />
+    <add key="coverlet-dev" value="https://www.myget.org/F/coverlet-dev/api/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9dd49304462..8767747e2ff 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -108,20 +108,9 @@ stages:
             arguments: 'locals all -clear'
         - script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_BuildArgs)
           displayName: Build and Publish
-        - script: eng\scripts\ci-flaky-tests.cmd -configuration $(_BuildConfig)
-          displayName: Run Flaky Tests
-          continueOnError: true
         - powershell: eng\scripts\KillProcesses.ps1
           displayName: Kill processes
           condition: always()
-        - task: PublishTestResults@2
-          displayName: Publish Flaky Test Results
-          inputs:
-            testResultsFormat: 'xUnit'
-            testResultsFiles: '*.xml'
-            searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Flaky'
-          continueOnError: true
-          condition: always()
         - task: PublishBuildArtifacts@1
           displayName: Upload TestResults
           condition: always()
@@ -131,6 +120,15 @@ stages:
             artifactName: $(Agent.Os)_$(Agent.JobName) TestResults
             artifactType: Container
             parallel: true
+        - task: PublishBuildArtifacts@1
+          displayName: Upload Code Coverage results
+          condition: always()
+          continueOnError: true
+          inputs:
+            pathtoPublish: artifacts/log/$(_BuildConfig)/codecoverage/
+            artifactName: $(Agent.Os)_$(Agent.JobName) CodeCoverage
+            artifactType: Container
+            parallel: true
         - task: PublishBuildArtifacts@1
           displayName: Upload package artifacts
           condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
@@ -308,4 +306,4 @@ stages:
     parameters:
       # Symbol validation isn't being very reliable lately. This should be enabled back
       # once this issue is resolved: https://github.com/dotnet/arcade/issues/2871
-      enableSymbolValidation: false
\ No newline at end of file
+      enableSymbolValidation: false
diff --git a/eng/common/CIBuild.cmd b/eng/common/CIBuild.cmd
index 56c2f25ac22..84ad3a3dec6 100644
--- a/eng/common/CIBuild.cmd
+++ b/eng/common/CIBuild.cmd
@@ -1,2 +1,2 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
\ No newline at end of file
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test /p:RunCodeCoverage=true -ci %*"
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index e001ccb481c..0d6fcd66b11 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -85,10 +85,10 @@ function Build {
     # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
     # Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty.
     [string[]] $msbuildArgs = $properties
-    
-    # Resolve relative project paths into full paths 
+
+    # Resolve relative project paths into full paths
     $projects = ($projects.Split(';').ForEach({Resolve-Path $_}) -join ';')
-    
+
     $msbuildArgs += "/p:Projects=$projects"
     $properties = $msbuildArgs
   }
diff --git a/global.json b/global.json
index 115f35b02ec..2370187ef5e 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19458.2",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19458.2"
+    "Microsoft.DotNet.Arcade.Sdk": "4.0.0-dev",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19454.31"
   }
 }