Update Arcade and remove workaround

Removes the workaround we needed to fix symbol publishing when running
on full MSBuild

Directory.Build.props

@@ -21,7 +21,7 @@
 
   <PropertyGroup Label="Build Settings">
     <LangVersion>7.3</LangVersion>
-    <StrongNameKeyId>MicrosoftAspNet</StrongNameKeyId>
+    <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <DebugType>portable</DebugType>
   </PropertyGroup>

azure-pipelines.yml

@@ -67,8 +67,7 @@ phases:
           azureSubscription: 'DotNet-Engineering-Services_KeyVault'
           KeyVaultName: EngKeyVault
           SecretsFilter: 'dotnetfeed-storage-access-key-1,microsoft-symbol-server-pat,symweb-symbol-server-pat'
-    # workaround for dotnet/arcade#1425 (revert to cibuild.cmd once fixed)
-    - script: eng\build-no-publish.cmd 
+    - script: eng\common\cibuild.cmd 
         -configuration $(_BuildConfig)
         -prepareMachine
         $(_SignArgs)
@@ -84,24 +83,6 @@ phases:
       inputs:
         testRunner: xunit
         testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
-    # workaround for dotnet/arcade#1425 (remove once fixed)
-    - script: eng\publish.cmd
-        -configuration $(_BuildConfig)
-        -msbuildEngine dotnet
-        $(_SignArgs)
-        $(_OfficialBuildIdArgs)
-        $(_PublishArgs)
-      name: Publish
-      displayName: Publish
-      condition: succeeded()
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Packages
-      inputs:
-        PathtoPublish: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)'
-        PublishLocation: Container
-        ArtifactName: Packages_$(Agent.Os)_$(Agent.JobName)
-      continueOnError: true
-      condition: eq(variables['_BuildConfig'], 'Release')
     - task: PublishBuildArtifacts@1
       displayName: Publish VSIX Artifacts
       inputs:

eng/Versions.props

@@ -47,10 +47,6 @@
     </RestoreSources>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <MicrosoftSymbolUploaderBuildTaskVersion>1.0.0-beta-63412-03</MicrosoftSymbolUploaderBuildTaskVersion>
-  </PropertyGroup>
-
   <PropertyGroup Label="Package Versions">
     <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
     <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>

eng/build-no-publish.cmd

@@ -1,4 +0,0 @@
-rem workaround for dotnet/arcade#1425
-@echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0common\Build.ps1""" -restore -build -test -sign -pack -ci %*"
-exit /b %ErrorLevel%

eng/publish.cmd

@@ -1,4 +0,0 @@
-rem workaround for dotnet/arcade#1425
-@echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0common\Build.ps1""" -publish -ci %*"
-exit /b %ErrorLevel%

global.json

@@ -10,6 +10,6 @@
       "version": "3.0.100-preview-009750"
     },
     "msbuild-sdks": {
-      "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18579.9"
+      "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18605.14"
     }
   }