diff --git a/.gitignore b/.gitignore
index 260df47a9..23fe40877 100644
--- a/.gitignore
+++ b/.gitignore
@@ -307,3 +307,5 @@ launchSettings.json
 !TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj.user
 !TestAssets/TestProjects/PJTestAppSimple/PJTestAppSimple.xproj.user
 
+# Local nuget cache when the build is run as CI
+.packages
\ No newline at end of file
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 603f1b7b7..51e9a99aa 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -2,7 +2,7 @@ trigger:
 - master
 
 variables:
-  teamName: Roslyn-Project-System
+  _TeamName: Roslyn-Project-System
   ${{ if eq(variables['System.TeamProject'], 'public') }}:
     PB_PublishBlobFeedKey:
     PB_PublishBlobFeedUrl:
@@ -58,6 +58,7 @@ jobs:
           _BuildArchitecture: arm
           _DOTNET_CLI_UI_LANGUAGE: ''
           _DropSuffix: ''
+          _AdditionalBuildParameters: '/p:DisableSourceLink=true'
 
 - template: /eng/build.yml
   parameters:
@@ -88,7 +89,7 @@ jobs:
             _RuntimeIdentifier: ''
             _BuildArchitecture: 'x64'
             _DropSuffix: ''
-            _AdditionalBuildParameters: '-p:DisableSourceLink=true'
+            _AdditionalBuildParameters: '/p:DisableSourceLink=true'
           Build_Fedora_27_Debug_x64:
             _BuildConfig: Debug
             _DockerParameter: '--docker fedora.27'
@@ -131,7 +132,7 @@ jobs:
             _RuntimeIdentifier: '--runtime-id rhel.6-x64'
             _BuildArchitecture: 'x64'
             _DropSuffix: ''
-            _AdditionalBuildParameters: '-p:DisableSourceLink=true'
+            _AdditionalBuildParameters: '/p:DisableSourceLink=true'
           Build_Arm_Debug:
             _BuildConfig: Debug
             _DockerParameter: ''
@@ -175,7 +176,7 @@ jobs:
             _RuntimeIdentifier: '--runtime-id rhel.6-x64'
             _BuildArchitecture: 'x64'
             _DropSuffix: ''
-            _AdditionalBuildParameters: '-p:DisableSourceLink=true'
+            _AdditionalBuildParameters: '/p:DisableSourceLink=true'
           Build_Arm_Release:
             _BuildConfig: Release
             _DockerParameter: ''
diff --git a/eng/Versions.props b/eng/Versions.props
index 8ec26d651..24f08d6e0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- This is a fake version to fool arcade. In this repo, we handle the versioning
+  of assets ourselves, since all we do is generate zips/tarballs and native installers. -->
+  <PropertyGroup>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
+  </PropertyGroup>
+
   <PropertyGroup>
     <ToolsetVersion>3.0.100-preview-009734</ToolsetVersion>
   </PropertyGroup>
diff --git a/eng/build.yml b/eng/build.yml
index ae89e3393..1b2904414 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -69,7 +69,7 @@ phases:
     - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
       - script: build.cmd
                   $(TestParameter)
-                  -pack -publish
+                  -pack -publish -ci
                   -Configuration $(BuildConfig)
                   -Architecture $(BuildArchitecture)
                   $(_PublishArgs)
@@ -84,7 +84,7 @@ phases:
     - ${{ if eq(parameters.agentOs, 'Linux') }}:
       - script: ./build.sh
                   $(TestParameter)
-                  --pack --publish
+                  --pack --publish --ci
                   --noprettyprint
                   --configuration $(BuildConfig)
                   $(DockerParameter)
@@ -102,7 +102,7 @@ phases:
     - ${{ if eq(parameters.agentOs, 'Darwin') }}:
       - script: ./build.sh
                   $(TestParameter)
-                  --pack --publish
+                  --pack --publish --ci
                   --noprettyprint
                   --configuration $(BuildConfig)
                   $(_PublishArgs)
diff --git a/src/redist/targets/packaging/windows/clisdk/_common.ps1 b/src/redist/targets/packaging/windows/clisdk/_common.ps1
new file mode 100644
index 000000000..b2df24187
--- /dev/null
+++ b/src/redist/targets/packaging/windows/clisdk/_common.ps1
@@ -0,0 +1,26 @@
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+. $PSScriptRoot\_utility.ps1
+
+# Copy things from environment variables that were sent by the build scripts
+$Rid = $env:Rid
+$Tfm = $env:Tfm
+$OutputDir = $env:OutputDir
+$Stage1Dir = $env:Stage1Dir
+$Stage1CompilationDir = $env:Stage1CompilationDir
+$Stage2Dir = $env:Stage2Dir
+$Stage2CompilationDir = $env:Stage2CompilationDir
+$PackageDir = $env:PackageDir
+$TestBinRoot = $env:TestBinRoot
+$TestPackageDir = $env:TestPackageDir
+
+$env:Channel = "$env:RELEASE_SUFFIX"
+
+# Set reasonable defaults for unset variables
+setEnvIfDefault "DOTNET_INSTALL_DIR"  "$RepoRoot\.dotnet_stage0\win7-x64"
+setEnvIfDefault "DOTNET_CLI_VERSION" "0.1.0.0"
+setPathAndHomeIfDefault "$Stage2Dir"
+setVarIfDefault "CONFIGURATION" "Debug"
diff --git a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
index f2df9810d..4ad5aab04 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
@@ -11,7 +11,7 @@ param(
     [Parameter(Mandatory=$true)][string]$NupkgFile
 )
 
-. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
+. "$PSScriptRoot\_common.ps1"
 $RepoRoot = Convert-Path "$PSScriptRoot\..\..\.."
 $NuGetDir = Join-Path $RepoRoot ".nuget"
 $NuGetExe = Join-Path $NuGetDir "nuget.exe"