diff --git a/Directory.Build.props b/Directory.Build.props
index 140f41d21..7d0463659 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -59,7 +59,7 @@
 
   <!-- Enable the analyzers for this repo -->
   <PropertyGroup>
-    <IsSourceProject Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))">true</IsSourceProject>
+    <IsSourceProject>$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))</IsSourceProject>
     <EnableAnalyzers Condition="'$(EnableAnalyzers)'=='' and '$(IsSourceProject)' == 'true'">true</EnableAnalyzers>
   </PropertyGroup>
 
@@ -70,7 +70,7 @@
     <!-- By default make all libraries to be AnyCPU but individual projects can override it if they need to -->
     <Platform>AnyCPU</Platform>
     <OutputType>Library</OutputType>
-    <RunApiCompat>true</RunApiCompat>
+    <RunApiCompat>$(IsSourceProject)</RunApiCompat>
     <LangVersion>latest</LangVersion> <!-- default to allowing all language features -->
   </PropertyGroup>
   
@@ -110,6 +110,9 @@
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
 
+    <!-- Don't reference implicit framework packages, all projects in this repo must be explicit -->
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+
     <!-- Suppress preview message as we are usually using preview SDK versions. -->
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 81d5aa5f1..3885211a7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -68,9 +68,10 @@ jobs:
       steps:
       - checkout: self
         clean: true
-      - script: eng\common\cibuild.cmd
+      - script: build.cmd
           -configuration $(_BuildConfig) 
           -prepareMachine
+          -ci
           -warnaserror:0
           $(_BuildArgs)
         displayName: Windows Build / Publish
@@ -86,9 +87,10 @@ jobs:
         steps:
         - checkout: self
           clean: true
-        - script: eng/common/cibuild.sh
+        - script: ./build.sh
             --configuration $(_BuildConfig)
             --prepareMachine
+            --ci
           displayName: Linux Build
 
     # OSX leg (only runs in CI)
@@ -102,7 +104,8 @@ jobs:
         steps:
         - checkout: self
           clean: true
-        - script: eng/common/cibuild.sh
+        - script: ./build.sh
             --configuration $(_BuildConfig)
             --prepareMachine
+            --ci
           displayName: OSX Build
\ No newline at end of file
diff --git a/build.cmd b/build.cmd
index e35949b62..27e468b04 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,2 +1,2 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build %*"
\ No newline at end of file
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build /warnAsMessage:NU1702 %*"
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 1467a1daa..36a1c2ce0 100755
--- a/build.sh
+++ b/build.sh
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
 done
 
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-"$scriptroot/eng/common/build.sh" --build --restore $@
\ No newline at end of file
+"$scriptroot/eng/common/build.sh" --build --restore /warnAsMessage:NU1702 $@
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e1a8fa352..dd1eef404 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19229.8">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19256.12">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
+      <Sha>c31fac9f6899094226cb5cd77c85b8f60ecafa3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19229.8">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19256.12">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
+      <Sha>c31fac9f6899094226cb5cd77c85b8f60ecafa3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19229.8">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19256.12">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
+      <Sha>c31fac9f6899094226cb5cd77c85b8f60ecafa3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19229.8">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19256.12">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
+      <Sha>c31fac9f6899094226cb5cd77c85b8f60ecafa3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19229.8">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19256.12">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
+      <Sha>c31fac9f6899094226cb5cd77c85b8f60ecafa3d</Sha>
     </Dependency>
     <PinnedDependency Name="NETStandard.Library" Version="2.0.3">
       <Uri>https://github.com/dotnet/standard</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 5dc97dea0..5bebf05b6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,10 +24,10 @@
     <NetStandardLibraryPackage>netstandard.library</NetStandardLibraryPackage>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetApiCompatPackageVersion>
-    <MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetBuildTasksPackagingPackageVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19256.12</MicrosoftDotNetApiCompatPackageVersion>
+    <MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19256.12</MicrosoftDotNetBuildTasksPackagingPackageVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19256.12</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19256.12</MicrosoftDotNetGenAPIPackageVersion>
     <!-- This is the LKG stable version of NetStandard.Library from myget.org. Please don't edit this version -->
     <NetStandardLibraryPackageVersion>2.0.3</NetStandardLibraryPackageVersion>
   </PropertyGroup>
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index d0147db4b..d7e3799eb 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -122,6 +122,10 @@ try {
     . $configureToolsetScript
   }
 
+  if (($restore) -and ($null -eq $env:DisableNativeToolsetInstalls)) {
+    InitializeNativeTools
+  }
+
   Build
 }
 catch {
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 40b1e8ec7..ce846d888 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -35,7 +35,7 @@ usage()
   echo "  --nodeReuse <value>      Sets nodereuse msbuild parameter ('true' or 'false')"
   echo "  --warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
   echo ""
-  echo "Command line arguments starting with '/p:' are passed through to MSBuild."
+  echo "Command line arguments not listed above are passed thru to msbuild."
   echo "Arguments can also be passed in with a single hyphen."
 }
 
@@ -137,22 +137,8 @@ while [[ $# > 0 ]]; do
       node_reuse=$2
       shift
       ;;
-    -p:*|/p:*)
-      properties="$properties $1"
-      ;;
-    -m:*|/m:*)
-      properties="$properties $1"
-      ;;
-    -bl:*|/bl:*)
-      properties="$properties $1"
-      ;;
-    -dl:*|/dl:*)
-      properties="$properties $1"
-      ;;
     *)
-      echo "Invalid argument: $1"
-      usage
-      exit 1
+      properties="$properties $1"
       ;;
   esac
 
@@ -218,4 +204,8 @@ if [[ -n "${useInstalledDotNetCli:-}" ]]; then
   use_installed_dotnet_cli="$useInstalledDotNetCli"
 fi
 
+if [[ "$restore" == true && -z ${DisableNativeToolsetInstalls:-} ]]; then
+  InitializeNativeTools
+fi
+
 Build
diff --git a/eng/common/dotnet-install.cmd b/eng/common/dotnet-install.cmd
new file mode 100644
index 000000000..b1c2642e7
--- /dev/null
+++ b/eng/common/dotnet-install.cmd
@@ -0,0 +1,2 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*"
\ No newline at end of file
diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1
new file mode 100644
index 000000000..5987943fd
--- /dev/null
+++ b/eng/common/dotnet-install.ps1
@@ -0,0 +1,22 @@
+[CmdletBinding(PositionalBinding=$false)]
+Param(
+  [string] $verbosity = "minimal",
+  [string] $architecture = "",
+  [string] $version = "Latest",
+  [string] $runtime = "dotnet"
+)
+
+. $PSScriptRoot\tools.ps1
+
+try {
+  $dotnetRoot = Join-Path $RepoRoot ".dotnet"
+  InstallDotNet $dotnetRoot $version $architecture $runtime $true
+} 
+catch {
+  Write-Host $_
+  Write-Host $_.Exception
+  Write-Host $_.ScriptStackTrace
+  ExitWithExitCode 1
+}
+
+ExitWithExitCode 0
\ No newline at end of file
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
new file mode 100644
index 000000000..c3072c958
--- /dev/null
+++ b/eng/common/dotnet-install.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+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 )"
+
+version='Latest'
+architecture=''
+runtime='dotnet'
+while [[ $# > 0 ]]; do
+  opt="$(echo "$1" | awk '{print tolower($0)}')"
+  case "$opt" in
+    -version|-v)
+      shift
+      version="$1"
+      ;;
+    -architecture|-a)
+      shift
+      architecture="$1"
+      ;;
+    -runtime|-r)
+      shift
+      runtime="$1"
+      ;;
+    *)
+      echo "Invalid argument: $1"
+      usage
+      exit 1
+      ;;
+  esac
+  shift
+done
+
+. "$scriptroot/tools.sh"
+dotnetRoot="$repo_root/.dotnet"
+InstallDotNet $dotnetRoot $version "$architecture" $runtime true || {
+  local exit_code=$?
+  echo "dotnet-install.sh failed (exit code '$exit_code')." >&2
+  ExitWithExitCode $exit_code
+}
+
+ExitWithExitCode 0
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index 495a563a7..a4306bd37 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -41,9 +41,13 @@ Param (
   [switch] $Force = $False,
   [int] $DownloadRetries = 5,
   [int] $RetryWaitTimeInSeconds = 30,
-  [string] $GlobalJsonFile = "$PSScriptRoot\..\..\global.json"
+  [string] $GlobalJsonFile
 )
 
+if (!$GlobalJsonFile) {
+  $GlobalJsonFile = Join-Path (Get-Item $PSScriptRoot).Parent.Parent.FullName "global.json"
+}
+
 Set-StrictMode -version 2.0
 $ErrorActionPreference="Stop"
 
diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh
index 54b70f678..fc72d1394 100644
--- a/eng/common/init-tools-native.sh
+++ b/eng/common/init-tools-native.sh
@@ -9,7 +9,7 @@ clean=false
 force=false
 download_retries=5
 retry_wait_time_seconds=30
-global_json_file="${scriptroot}/../../global.json"
+global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json"
 declare -A native_assets
 
 . $scriptroot/native/common-library.sh
@@ -71,6 +71,7 @@ function ReadGlobalJsonNativeTools {
   local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}')
   native_tools_list=${native_tools_list//[\" ]/}
   native_tools_list=${native_tools_list//,/$'\n'}
+  native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[:space:]')"
 
   local old_IFS=$IFS
   while read -r line; do
@@ -116,8 +117,6 @@ else
       installer_command+=" --clean"
     fi
 
-    echo "Installing $tool version $tool_version"
-    echo "Executing '$installer_command'"
     $installer_command
 
     if [[ $? != 0 ]]; then
@@ -127,19 +126,16 @@ else
   done
 fi
 
-if [[ ! -z $clean ]]; then
+if [[ $clean = true ]]; then
   exit 0
 fi
 
 if [[ -d $install_bin ]]; then
   echo "Native tools are available from $install_bin"
-  if [[ !-z BUILD_BUILDNUMBER ]]; then
-    echo "##vso[task.prependpath]$install_bin"
-  fi
+  echo "##vso[task.prependpath]$install_bin"
 else
   echo "Native tools install directory does not exist, installation failed" >&2
   exit 1
 fi
 
 exit 0
-
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 7839b70bb..1814e0ab6 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -90,6 +90,9 @@ jobs:
     timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 
   variables:
+  - ${{ if eq(parameters.enableTelemetry, 'true') }}:
+    - name: DOTNET_CLI_TELEMETRY_PROFILE
+      value: '$(Build.Repository.Uri)'
   - ${{ each variable in parameters.variables }}:
     # handle name-value variable syntax
     # example:
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 5c4a129c8..d86eef1e3 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -108,7 +108,7 @@ function InitializeDotNetCli([bool]$install) {
   }
 
   # Find the first path on %PATH% that contains the dotnet.exe
-  if ($useInstalledDotNetCli -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
+  if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
     $dotnetCmd = Get-Command "dotnet.exe" -ErrorAction SilentlyContinue
     if ($dotnetCmd -ne $null) {
       $env:DOTNET_INSTALL_DIR = Split-Path $dotnetCmd.Path -Parent
@@ -119,7 +119,7 @@ function InitializeDotNetCli([bool]$install) {
 
   # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version,
   # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues.
-  if (($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
+  if ((-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
     $dotnetRoot = $env:DOTNET_INSTALL_DIR
   } else {
     $dotnetRoot = Join-Path $RepoRoot ".dotnet"
@@ -152,7 +152,7 @@ function InitializeDotNetCli([bool]$install) {
 }
 
 function GetDotNetInstallScript([string] $dotnetRoot) {
-  $installScript = "$dotnetRoot\dotnet-install.ps1"
+  $installScript = Join-Path $dotnetRoot "dotnet-install.ps1"
   if (!(Test-Path $installScript)) {
     Create-Directory $dotnetRoot
     Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile $installScript
@@ -162,9 +162,21 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
 }
 
 function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = "") {
+  InstallDotNet $dotnetRoot $version $architecture
+}
+
+function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) {  $installScript = GetDotNetInstallScript $dotnetRoot
   $installScript = GetDotNetInstallScript $dotnetRoot
-  $archArg = if ($architecture) { $architecture } else { "<auto>" }
-  & $installScript -Version $version -InstallDir $dotnetRoot -Architecture $archArg
+  $installParameters = @{
+    Version = $version
+    InstallDir = $dotnetRoot
+  }
+
+  if ($architecture) { $installParameters.Architecture = $architecture }
+  if ($runtime) { $installParameters.Runtime = $runtime }
+  if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles }
+
+  & $installScript @installParameters
   if ($lastExitCode -ne 0) {
     Write-Host "Failed to install dotnet cli (exit code '$lastExitCode')." -ForegroundColor Red
     ExitWithExitCode $lastExitCode
@@ -391,6 +403,16 @@ function GetSdkTaskProject([string]$taskName) {
   return Join-Path (Split-Path (InitializeToolset) -Parent) "SdkTasks\$taskName.proj"
 }
 
+function InitializeNativeTools() {
+  if (Get-Member -InputObject $GlobalJson -Name "native-tools") {
+    $nativeArgs=""
+    if ($ci) {
+      $nativeArgs = "-InstallDirectory $ToolsDir"
+    }
+    Invoke-Expression "& `"$PSScriptRoot/init-tools-native.ps1`" $nativeArgs"
+  }
+}
+
 function InitializeToolset() {
   if (Test-Path variable:global:_ToolsetBuildProj) {
     return $global:_ToolsetBuildProj
@@ -419,6 +441,7 @@ function InitializeToolset() {
   $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" }
 
   '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' | Set-Content $proj
+
   MSBuild $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile
 
   $path = Get-Content $toolsetLocationFile -TotalCount 1
@@ -512,6 +535,8 @@ $ToolsDir = Join-Path $RepoRoot ".tools"
 $LogDir = Join-Path (Join-Path $ArtifactsDir "log") $configuration
 $TempDir = Join-Path (Join-Path $ArtifactsDir "tmp") $configuration
 $GlobalJson = Get-Content -Raw -Path (Join-Path $RepoRoot "global.json") | ConvertFrom-Json
+# true if global.json contains a "runtimes" section
+$globalJsonHasRuntimes = if ($GlobalJson.tools.PSObject.Properties.Name -Match 'runtimes') { $true } else { $false }
 
 Create-Directory $ToolsetDir
 Create-Directory $TempDir
@@ -524,4 +549,4 @@ if ($ci) {
 
   $env:TEMP = $TempDir
   $env:TMP = $TempDir
-}
+}
\ No newline at end of file
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index ecdece1f8..9dc565e29 100644
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -101,7 +101,7 @@ function InitializeDotNetCli {
   fi
 
   # Find the first path on $PATH that contains the dotnet.exe
-  if [[ "$use_installed_dotnet_cli" == true && -z "${DOTNET_INSTALL_DIR:-}" ]]; then
+  if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then
     local dotnet_path=`command -v dotnet`
     if [[ -n "$dotnet_path" ]]; then
       ResolvePath "$dotnet_path"
@@ -115,10 +115,11 @@ function InitializeDotNetCli {
 
   # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version,
   # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues.
-  if [[ -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
+  if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
     dotnet_root="$DOTNET_INSTALL_DIR"
   else
     dotnet_root="$repo_root/.dotnet"
+
     export DOTNET_INSTALL_DIR="$dotnet_root"
 
     if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
@@ -149,16 +150,34 @@ function InitializeDotNetCli {
 function InstallDotNetSdk {
   local root=$1
   local version=$2
+  local architecture=""
+  if [[ $# == 3 ]]; then
+    architecture=$3
+  fi
+  InstallDotNet "$root" "$version" $architecture
+}
 
+function InstallDotNet {
+  local root=$1
+  local version=$2
+ 
   GetDotNetInstallScript "$root"
   local install_script=$_GetDotNetInstallScript
 
-  local arch_arg=""
-  if [[ $# == 3 ]]; then
-    arch_arg="--architecture $3"
+  local archArg=''
+  if [[ "$#" -ge "3" ]]; then
+    archArg="--architecture $3"
+  fi
+  local runtimeArg=''
+  if [[ "$#" -ge "4" ]]; then
+    runtimeArg="--runtime $4"
   fi
 
-  bash "$install_script" --version $version --install-dir "$root" $arch_arg || {
+  local skipNonVersionedFilesArg=""
+  if [[ "$#" -ge "5" ]]; then
+    skipNonVersionedFilesArg="--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 (exit code '$exit_code')." >&2
     ExitWithExitCode $exit_code
@@ -212,6 +231,17 @@ function GetNuGetPackageCachePath {
   _GetNuGetPackageCachePath=$NUGET_PACKAGES
 }
 
+function InitializeNativeTools() {
+  if grep -Fq "native-tools" $global_json_file
+  then
+    local nativeArgs=""
+    if [[ "$ci" == true ]]; then
+      nativeArgs="-InstallDirectory $tools_dir"
+    fi
+    "$_script_dir/init-tools-native.sh" $nativeArgs
+  fi
+}
+
 function InitializeToolset {
   if [[ -n "${_InitializeToolset:-}" ]]; then
     return
@@ -307,10 +337,17 @@ eng_root=`cd -P "$_script_dir/.." && pwd`
 repo_root=`cd -P "$_script_dir/../.." && pwd`
 artifacts_dir="$repo_root/artifacts"
 toolset_dir="$artifacts_dir/toolset"
+tools_dir="$repo_root/.tools"
 log_dir="$artifacts_dir/log/$configuration"
 temp_dir="$artifacts_dir/tmp/$configuration"
 
 global_json_file="$repo_root/global.json"
+# determine if global.json contains a "runtimes" entry
+global_json_has_runtimes=false
+dotnetlocal_key=`grep -m 1 "runtimes" "$global_json_file"` || true
+if [[ -n "$dotnetlocal_key" ]]; then
+  global_json_has_runtimes=true
+fi
 
 # HOME may not be defined in some scenarios, but it is required by NuGet
 if [[ -z $HOME ]]; then
@@ -325,4 +362,4 @@ mkdir -p "$log_dir"
 if [[ $ci == true ]]; then
   export TEMP="$temp_dir"
   export TMP="$temp_dir"
-fi
+fi
\ No newline at end of file
diff --git a/global.json b/global.json
index a9dfc6e75..4573fa4d7 100644
--- a/global.json
+++ b/global.json
@@ -1,8 +1,8 @@
 {
   "tools": {
-    "dotnet": "2.1.503"
+    "dotnet": "3.0.100-preview6-011681"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19229.8"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19256.12"
   }
 }
diff --git a/src/netstandard/pkg/Microsoft.Private.Standard.pkgproj b/src/netstandard/pkg/Microsoft.Private.Standard.pkgproj
index 7b49d784b..6e6188193 100644
--- a/src/netstandard/pkg/Microsoft.Private.Standard.pkgproj
+++ b/src/netstandard/pkg/Microsoft.Private.Standard.pkgproj
@@ -3,7 +3,8 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <Version>2.1.0</Version>
+    <MajorVersion>2</MajorVersion>
+    <MinorVersion>1</MinorVersion>
     <HarvestStablePackage>false</HarvestStablePackage>
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
     <OmitDependencies>true</OmitDependencies>
diff --git a/src/netstandard/pkg/NETStandard.Library.pkgproj b/src/netstandard/pkg/NETStandard.Library.pkgproj
index 377718d30..bb482e5ba 100644
--- a/src/netstandard/pkg/NETStandard.Library.pkgproj
+++ b/src/netstandard/pkg/NETStandard.Library.pkgproj
@@ -3,7 +3,8 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <Version>2.1.0</Version>
+    <MajorVersion>2</MajorVersion>
+    <MinorVersion>1</MinorVersion>
     <HarvestStablePackage>false</HarvestStablePackage>
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
     <OmitDependencies>true</OmitDependencies>
diff --git a/src/netstandard/pkg/shims/Directory.Build.targets b/src/netstandard/pkg/shims/Directory.Build.targets
index 6becfdab2..0e1005c7d 100644
--- a/src/netstandard/pkg/shims/Directory.Build.targets
+++ b/src/netstandard/pkg/shims/Directory.Build.targets
@@ -28,9 +28,8 @@
 
   <PropertyGroup>
     <OutDir>$(ArtifactsBinDir)shims/$(ShimRelOutputPath)</OutDir>
+    <TargetPath>$(OutDir)$(TargetFileName)</TargetPath>
     <GenerateProjectSpecificOutputFolder>false</GenerateProjectSpecificOutputFolder>
     <NoWarn>$(NoWarn);0618</NoWarn>
-    <!-- Leave TargetPath empty so it can be set by Microsoft.Common.CurrentVersion.targets -->
-    <TargetPath></TargetPath>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/Directory.Build.props b/src/netstandard/pkg/shims/netfx/Directory.Build.props
index b0da79628..267307757 100644
--- a/src/netstandard/pkg/shims/netfx/Directory.Build.props
+++ b/src/netstandard/pkg/shims/netfx/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ShimRelOutputPath>netfx</ShimRelOutputPath>
+    <ShimRelOutputPath>netfx/</ShimRelOutputPath>
     <TargetFramework>netstandard2.1</TargetFramework>
     <!-- Treat this as a reference assembly because it needs to packaged in the ref folder -->
     <IsReferenceAssembly>true</IsReferenceAssembly>
diff --git a/src/netstandard/pkg/shims/netfx/System.ComponentModel.Composition.csproj b/src/netstandard/pkg/shims/netfx/System.ComponentModel.Composition.csproj
index 2179bcc93..928f71c90 100644
--- a/src/netstandard/pkg/shims/netfx/System.ComponentModel.Composition.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.ComponentModel.Composition.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.ComponentModel.Composition.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Core.csproj b/src/netstandard/pkg/shims/netfx/System.Core.csproj
index b36ab6a90..814593591 100644
--- a/src/netstandard/pkg/shims/netfx/System.Core.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Core.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Core.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Data.csproj b/src/netstandard/pkg/shims/netfx/System.Data.csproj
index 0a1881780..311dcfcd9 100644
--- a/src/netstandard/pkg/shims/netfx/System.Data.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Data.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Data.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Drawing.csproj b/src/netstandard/pkg/shims/netfx/System.Drawing.csproj
index 474ae3b87..590a26476 100644
--- a/src/netstandard/pkg/shims/netfx/System.Drawing.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Drawing.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Drawing.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.IO.Compression.FileSystem.csproj b/src/netstandard/pkg/shims/netfx/System.IO.Compression.FileSystem.csproj
index c30855f94..8b83abf9d 100644
--- a/src/netstandard/pkg/shims/netfx/System.IO.Compression.FileSystem.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.IO.Compression.FileSystem.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.Compression.FileSystem.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Net.csproj b/src/netstandard/pkg/shims/netfx/System.Net.csproj
index b847d6f45..c22c6198e 100644
--- a/src/netstandard/pkg/shims/netfx/System.Net.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Net.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Numerics.csproj b/src/netstandard/pkg/shims/netfx/System.Numerics.csproj
index c69a6446c..469e38a99 100644
--- a/src/netstandard/pkg/shims/netfx/System.Numerics.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Numerics.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Numerics.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Runtime.Serialization.csproj b/src/netstandard/pkg/shims/netfx/System.Runtime.Serialization.csproj
index 0a1ecdc5f..71e892610 100644
--- a/src/netstandard/pkg/shims/netfx/System.Runtime.Serialization.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Runtime.Serialization.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.Serialization.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.ServiceModel.Web.csproj b/src/netstandard/pkg/shims/netfx/System.ServiceModel.Web.csproj
index a782a63da..c1ea22761 100644
--- a/src/netstandard/pkg/shims/netfx/System.ServiceModel.Web.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.ServiceModel.Web.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.ServiceModel.Web.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Transactions.csproj b/src/netstandard/pkg/shims/netfx/System.Transactions.csproj
index 30456f48d..57a44a5ff 100644
--- a/src/netstandard/pkg/shims/netfx/System.Transactions.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Transactions.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Transactions.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Web.csproj b/src/netstandard/pkg/shims/netfx/System.Web.csproj
index 6a59f2821..752d2714f 100644
--- a/src/netstandard/pkg/shims/netfx/System.Web.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Web.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Web.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Windows.csproj b/src/netstandard/pkg/shims/netfx/System.Windows.csproj
index bcddd9696..689664a5c 100644
--- a/src/netstandard/pkg/shims/netfx/System.Windows.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Windows.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Windows.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Xml.Linq.csproj b/src/netstandard/pkg/shims/netfx/System.Xml.Linq.csproj
index 63e3bedca..e31fa74b3 100644
--- a/src/netstandard/pkg/shims/netfx/System.Xml.Linq.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Xml.Linq.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Xml.Linq.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Xml.Serialization.csproj b/src/netstandard/pkg/shims/netfx/System.Xml.Serialization.csproj
index 782429fdc..df6fffb99 100644
--- a/src/netstandard/pkg/shims/netfx/System.Xml.Serialization.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Xml.Serialization.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Xml.Serialization.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.Xml.csproj b/src/netstandard/pkg/shims/netfx/System.Xml.csproj
index d0abccccf..7779c1a75 100644
--- a/src/netstandard/pkg/shims/netfx/System.Xml.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.Xml.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Xml.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/System.csproj b/src/netstandard/pkg/shims/netfx/System.csproj
index 9c32d6442..a6ec738e5 100644
--- a/src/netstandard/pkg/shims/netfx/System.csproj
+++ b/src/netstandard/pkg/shims/netfx/System.csproj
@@ -9,5 +9,4 @@
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
     <ProjectReference Include="..\..\..\..\platforms\extensions\System.CodeDom.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netfx/mscorlib.csproj b/src/netstandard/pkg/shims/netfx/mscorlib.csproj
index ab3047c9e..a5becbbba 100644
--- a/src/netstandard/pkg/shims/netfx/mscorlib.csproj
+++ b/src/netstandard/pkg/shims/netfx/mscorlib.csproj
@@ -11,5 +11,4 @@
     <ProjectReference Include="..\..\..\..\platforms\extensions\System.Security.AccessControl.csproj" />
     <ProjectReference Include="..\..\..\..\platforms\extensions\System.Security.Principal.Windows.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/Directory.Build.props b/src/netstandard/pkg/shims/netstandard/Directory.Build.props
index 82979bf7e..b6e615da1 100644
--- a/src/netstandard/pkg/shims/netstandard/Directory.Build.props
+++ b/src/netstandard/pkg/shims/netstandard/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ShimRelOutputPath>netstandard</ShimRelOutputPath>
+    <ShimRelOutputPath>netstandard/</ShimRelOutputPath>
     <TargetFramework>netstandard2.1</TargetFramework>
     <!-- Treat this as a reference assembly because it needs to packaged in the ref folder -->
     <IsReferenceAssembly>true</IsReferenceAssembly>
diff --git a/src/netstandard/pkg/shims/netstandard/Microsoft.Win32.Primitives.csproj b/src/netstandard/pkg/shims/netstandard/Microsoft.Win32.Primitives.csproj
index c7a3a6e35..1f20a1732 100644
--- a/src/netstandard/pkg/shims/netstandard/Microsoft.Win32.Primitives.csproj
+++ b/src/netstandard/pkg/shims/netstandard/Microsoft.Win32.Primitives.csproj
@@ -8,5 +8,4 @@
     <Compile Include="Microsoft.Win32.Primitives.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.AppContext.csproj b/src/netstandard/pkg/shims/netstandard/System.AppContext.csproj
index dc5644cc0..10bf0c6eb 100644
--- a/src/netstandard/pkg/shims/netstandard/System.AppContext.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.AppContext.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.AppContext.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Collections.Concurrent.csproj b/src/netstandard/pkg/shims/netstandard/System.Collections.Concurrent.csproj
index 17fc4b62d..0eed9c398 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Collections.Concurrent.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Collections.Concurrent.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Collections.Concurrent.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Collections.NonGeneric.csproj b/src/netstandard/pkg/shims/netstandard/System.Collections.NonGeneric.csproj
index 0a16b89e7..8daa04844 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Collections.NonGeneric.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Collections.NonGeneric.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Collections.NonGeneric.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Collections.Specialized.csproj b/src/netstandard/pkg/shims/netstandard/System.Collections.Specialized.csproj
index 70151f1df..a144d2d44 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Collections.Specialized.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Collections.Specialized.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Collections.Specialized.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Collections.csproj b/src/netstandard/pkg/shims/netstandard/System.Collections.csproj
index 7cac42ac7..6c1673333 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Collections.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Collections.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Collections.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.ComponentModel.EventBasedAsync.csproj b/src/netstandard/pkg/shims/netstandard/System.ComponentModel.EventBasedAsync.csproj
index 148bb90a0..91f713f92 100644
--- a/src/netstandard/pkg/shims/netstandard/System.ComponentModel.EventBasedAsync.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.ComponentModel.EventBasedAsync.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.ComponentModel.EventBasedAsync.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.ComponentModel.Primitives.csproj b/src/netstandard/pkg/shims/netstandard/System.ComponentModel.Primitives.csproj
index eb8f395f0..c1bb00b3a 100644
--- a/src/netstandard/pkg/shims/netstandard/System.ComponentModel.Primitives.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.ComponentModel.Primitives.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.ComponentModel.Primitives.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.ComponentModel.TypeConverter.csproj b/src/netstandard/pkg/shims/netstandard/System.ComponentModel.TypeConverter.csproj
index 725cf4f39..784325be4 100644
--- a/src/netstandard/pkg/shims/netstandard/System.ComponentModel.TypeConverter.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.ComponentModel.TypeConverter.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.ComponentModel.TypeConverter.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.ComponentModel.csproj b/src/netstandard/pkg/shims/netstandard/System.ComponentModel.csproj
index d5a5a716c..26db18eca 100644
--- a/src/netstandard/pkg/shims/netstandard/System.ComponentModel.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.ComponentModel.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.ComponentModel.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Console.csproj b/src/netstandard/pkg/shims/netstandard/System.Console.csproj
index 22e91d57c..89d737d79 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Console.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Console.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Console.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Data.Common.csproj b/src/netstandard/pkg/shims/netstandard/System.Data.Common.csproj
index 67d05d459..87dc1e1c0 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Data.Common.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Data.Common.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Data.Common.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Contracts.csproj b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Contracts.csproj
index ca2df0663..8765142af 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Contracts.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Contracts.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Diagnostics.Contracts.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Debug.csproj b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Debug.csproj
index bfc58bf9a..dcd144a7a 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Debug.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Debug.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Diagnostics.Debug.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.FileVersionInfo.csproj b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.FileVersionInfo.csproj
index ad4025fc2..c3efb4042 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.FileVersionInfo.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.FileVersionInfo.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Diagnostics.FileVersionInfo.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Process.csproj b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Process.csproj
index 80c9af1d0..ee7cbcfd2 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Process.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Process.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Diagnostics.Process.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.StackTrace.csproj b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.StackTrace.csproj
index f7163d661..8f0ee0b57 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.StackTrace.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.StackTrace.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Diagnostics.StackTrace.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.TextWriterTraceListener.csproj b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.TextWriterTraceListener.csproj
index 0163f3935..dcb6b6dae 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.TextWriterTraceListener.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.TextWriterTraceListener.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Diagnostics.TextWriterTraceListener.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Tools.csproj b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Tools.csproj
index 906e2e639..3d9dd2d70 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Tools.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Tools.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Diagnostics.Tools.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.TraceSource.csproj b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.TraceSource.csproj
index 2e7283a8d..c152569ba 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.TraceSource.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.TraceSource.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Diagnostics.TraceSource.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Tracing.csproj b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Tracing.csproj
index 1907c2604..299197639 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Tracing.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Diagnostics.Tracing.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Diagnostics.Tracing.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Drawing.Primitives.csproj b/src/netstandard/pkg/shims/netstandard/System.Drawing.Primitives.csproj
index cd615c7cf..aa1bf757a 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Drawing.Primitives.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Drawing.Primitives.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Drawing.Primitives.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Dynamic.Runtime.csproj b/src/netstandard/pkg/shims/netstandard/System.Dynamic.Runtime.csproj
index 36a2b5335..10409d762 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Dynamic.Runtime.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Dynamic.Runtime.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Dynamic.Runtime.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Globalization.Calendars.csproj b/src/netstandard/pkg/shims/netstandard/System.Globalization.Calendars.csproj
index eee684456..93b057fea 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Globalization.Calendars.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Globalization.Calendars.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Globalization.Calendars.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Globalization.Extensions.csproj b/src/netstandard/pkg/shims/netstandard/System.Globalization.Extensions.csproj
index 8c4d2f34f..6e150864f 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Globalization.Extensions.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Globalization.Extensions.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Globalization.Extensions.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Globalization.csproj b/src/netstandard/pkg/shims/netstandard/System.Globalization.csproj
index d549b2e58..446d238ed 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Globalization.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Globalization.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Globalization.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.Compression.ZipFile.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.Compression.ZipFile.csproj
index a8d1b3751..732bc57c7 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.Compression.ZipFile.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.Compression.ZipFile.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.Compression.ZipFile.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.Compression.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.Compression.csproj
index ebf284faf..ae28f71fa 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.Compression.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.Compression.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.Compression.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.DriveInfo.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.DriveInfo.csproj
index 1728037d0..6b8f8e55b 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.DriveInfo.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.DriveInfo.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.FileSystem.DriveInfo.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.Primitives.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.Primitives.csproj
index 7af84c88c..c6f687960 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.Primitives.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.Primitives.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.FileSystem.Primitives.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.Watcher.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.Watcher.csproj
index d76b8882e..aa97afd9b 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.Watcher.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.Watcher.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.FileSystem.Watcher.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.csproj
index dd2fe458f..9a2c56ea8 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.FileSystem.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.FileSystem.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.IsolatedStorage.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.IsolatedStorage.csproj
index 358417636..f9ff8af31 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.IsolatedStorage.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.IsolatedStorage.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.IsolatedStorage.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.MemoryMappedFiles.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.MemoryMappedFiles.csproj
index 1d8326e3b..946ef9c60 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.MemoryMappedFiles.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.MemoryMappedFiles.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.MemoryMappedFiles.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.Pipes.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.Pipes.csproj
index 63e0450a6..39744da22 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.Pipes.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.Pipes.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.Pipes.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.UnmanagedMemoryStream.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.UnmanagedMemoryStream.csproj
index bc1f2a3db..eec266fd5 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.UnmanagedMemoryStream.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.UnmanagedMemoryStream.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.UnmanagedMemoryStream.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.IO.csproj b/src/netstandard/pkg/shims/netstandard/System.IO.csproj
index cf89a95e3..55ae89972 100644
--- a/src/netstandard/pkg/shims/netstandard/System.IO.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.IO.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.IO.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Linq.Expressions.csproj b/src/netstandard/pkg/shims/netstandard/System.Linq.Expressions.csproj
index 194780bc7..6526135cd 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Linq.Expressions.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Linq.Expressions.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Linq.Expressions.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Linq.Parallel.csproj b/src/netstandard/pkg/shims/netstandard/System.Linq.Parallel.csproj
index 8a876b97d..9dff436fb 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Linq.Parallel.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Linq.Parallel.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Linq.Parallel.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Linq.Queryable.csproj b/src/netstandard/pkg/shims/netstandard/System.Linq.Queryable.csproj
index a3e0c4bb3..fe921a152 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Linq.Queryable.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Linq.Queryable.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Linq.Queryable.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Linq.csproj b/src/netstandard/pkg/shims/netstandard/System.Linq.csproj
index d8ee954f1..1acbbc5c4 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Linq.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Linq.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Linq.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.Http.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.Http.csproj
index 75ed25cfe..7dedea9ba 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.Http.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.Http.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.Http.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.NameResolution.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.NameResolution.csproj
index b521c30a3..a2d23f65b 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.NameResolution.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.NameResolution.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.NameResolution.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.NetworkInformation.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.NetworkInformation.csproj
index b24e55ff1..1b5eb08f5 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.NetworkInformation.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.NetworkInformation.csproj
@@ -9,5 +9,4 @@
     <Compile Include="System.Net.NetworkInformation.manual.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.Ping.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.Ping.csproj
index c836628a2..a8e952b40 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.Ping.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.Ping.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.Ping.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.Primitives.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.Primitives.csproj
index e5904c472..9de9640df 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.Primitives.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.Primitives.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.Primitives.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.Requests.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.Requests.csproj
index 12ea058a6..0539d25e7 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.Requests.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.Requests.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.Requests.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.Security.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.Security.csproj
index 84e675ec1..1bc33af57 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.Security.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.Security.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.Security.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.Sockets.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.Sockets.csproj
index ee2038893..f77eb4b3e 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.Sockets.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.Sockets.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.Sockets.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.WebHeaderCollection.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.WebHeaderCollection.csproj
index 2b3dfe046..c12adaf6d 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.WebHeaderCollection.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.WebHeaderCollection.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.WebHeaderCollection.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.WebSockets.Client.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.WebSockets.Client.csproj
index ac01be822..a15c24702 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.WebSockets.Client.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.WebSockets.Client.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.WebSockets.Client.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Net.WebSockets.csproj b/src/netstandard/pkg/shims/netstandard/System.Net.WebSockets.csproj
index eb75cba2a..572999ee9 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Net.WebSockets.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Net.WebSockets.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Net.WebSockets.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.ObjectModel.csproj b/src/netstandard/pkg/shims/netstandard/System.ObjectModel.csproj
index f5d7a77fe..9e1c9ae98 100644
--- a/src/netstandard/pkg/shims/netstandard/System.ObjectModel.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.ObjectModel.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.ObjectModel.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Reflection.Extensions.csproj b/src/netstandard/pkg/shims/netstandard/System.Reflection.Extensions.csproj
index 7437e0d03..ce7c62f6a 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Reflection.Extensions.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Reflection.Extensions.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Reflection.Extensions.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Reflection.Primitives.csproj b/src/netstandard/pkg/shims/netstandard/System.Reflection.Primitives.csproj
index a45d5105c..438ff1083 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Reflection.Primitives.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Reflection.Primitives.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Reflection.Primitives.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Reflection.csproj b/src/netstandard/pkg/shims/netstandard/System.Reflection.csproj
index daef9ec5d..4a905606c 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Reflection.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Reflection.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Reflection.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Resources.Reader.csproj b/src/netstandard/pkg/shims/netstandard/System.Resources.Reader.csproj
index 88e9ccdbc..4f90fb00c 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Resources.Reader.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Resources.Reader.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Resources.Reader.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Resources.ResourceManager.csproj b/src/netstandard/pkg/shims/netstandard/System.Resources.ResourceManager.csproj
index 0fabbe279..835d9f542 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Resources.ResourceManager.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Resources.ResourceManager.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Resources.ResourceManager.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Resources.Writer.csproj b/src/netstandard/pkg/shims/netstandard/System.Resources.Writer.csproj
index 409c013ce..0991b714d 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Resources.Writer.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Resources.Writer.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Resources.Writer.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.CompilerServices.VisualC.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.CompilerServices.VisualC.csproj
index a1edc296c..78001aa60 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.CompilerServices.VisualC.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.CompilerServices.VisualC.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.CompilerServices.VisualC.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.Extensions.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.Extensions.csproj
index c2e4b1e3b..7bac3d445 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.Extensions.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.Extensions.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.Extensions.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.Handles.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.Handles.csproj
index 9faf94abe..f40515fcf 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.Handles.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.Handles.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.Handles.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.csproj
index e63cfcec9..18928d17d 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.InteropServices.RuntimeInformation.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.InteropServices.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.InteropServices.csproj
index a4965c4da..cc04b0f70 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.InteropServices.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.InteropServices.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.InteropServices.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.Numerics.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.Numerics.csproj
index b64dff1c3..4a1ae730c 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.Numerics.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.Numerics.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.Numerics.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Formatters.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Formatters.csproj
index bd1c16328..5d4c5f53a 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Formatters.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Formatters.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.Serialization.Formatters.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Json.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Json.csproj
index 9c4bcd02a..30cac788b 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Json.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Json.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.Serialization.Json.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Primitives.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Primitives.csproj
index 6509cc34d..5c4c73c5c 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Primitives.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Primitives.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.Serialization.Primitives.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Xml.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Xml.csproj
index 2e6cc14bd..fb72bc9b8 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Xml.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.Serialization.Xml.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.Serialization.Xml.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Runtime.csproj b/src/netstandard/pkg/shims/netstandard/System.Runtime.csproj
index d8af44c37..348db30ef 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Runtime.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Runtime.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Runtime.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Security.Claims.csproj b/src/netstandard/pkg/shims/netstandard/System.Security.Claims.csproj
index acf3d230f..aeee2d530 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Security.Claims.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Security.Claims.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Security.Claims.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Algorithms.csproj b/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Algorithms.csproj
index 354c54556..9d6a2d58b 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Algorithms.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Algorithms.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Security.Cryptography.Algorithms.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Csp.csproj b/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Csp.csproj
index d0bb2c56a..586c56998 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Csp.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Csp.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Security.Cryptography.Csp.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Encoding.csproj b/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Encoding.csproj
index 0c47c3c7a..18fd71533 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Encoding.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Encoding.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Security.Cryptography.Encoding.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Primitives.csproj b/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Primitives.csproj
index 684383912..b1f8b93c5 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Primitives.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.Primitives.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Security.Cryptography.Primitives.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.X509Certificates.csproj b/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.X509Certificates.csproj
index cde199515..0b85a30f3 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.X509Certificates.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Security.Cryptography.X509Certificates.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Security.Cryptography.X509Certificates.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Security.Principal.csproj b/src/netstandard/pkg/shims/netstandard/System.Security.Principal.csproj
index acd805a4d..00d2855c1 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Security.Principal.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Security.Principal.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Security.Principal.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Security.SecureString.csproj b/src/netstandard/pkg/shims/netstandard/System.Security.SecureString.csproj
index 89636d2ba..f0d0ff727 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Security.SecureString.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Security.SecureString.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Security.SecureString.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Text.Encoding.Extensions.csproj b/src/netstandard/pkg/shims/netstandard/System.Text.Encoding.Extensions.csproj
index eb49cd05b..379cccda9 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Text.Encoding.Extensions.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Text.Encoding.Extensions.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Text.Encoding.Extensions.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Text.Encoding.csproj b/src/netstandard/pkg/shims/netstandard/System.Text.Encoding.csproj
index cc23b085c..38c8a45e2 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Text.Encoding.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Text.Encoding.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Text.Encoding.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Text.RegularExpressions.csproj b/src/netstandard/pkg/shims/netstandard/System.Text.RegularExpressions.csproj
index 38b147009..85ea87c6e 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Text.RegularExpressions.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Text.RegularExpressions.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Text.RegularExpressions.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Threading.Overlapped.csproj b/src/netstandard/pkg/shims/netstandard/System.Threading.Overlapped.csproj
index 08822eeb5..7c7e624dd 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Threading.Overlapped.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Threading.Overlapped.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Threading.Overlapped.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Threading.Tasks.Parallel.csproj b/src/netstandard/pkg/shims/netstandard/System.Threading.Tasks.Parallel.csproj
index e2921a1f4..1df73c2c7 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Threading.Tasks.Parallel.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Threading.Tasks.Parallel.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Threading.Tasks.Parallel.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Threading.Tasks.csproj b/src/netstandard/pkg/shims/netstandard/System.Threading.Tasks.csproj
index 317836413..55bf4eefd 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Threading.Tasks.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Threading.Tasks.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Threading.Tasks.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Threading.Thread.csproj b/src/netstandard/pkg/shims/netstandard/System.Threading.Thread.csproj
index 13e375b74..0475efad1 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Threading.Thread.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Threading.Thread.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Threading.Thread.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Threading.ThreadPool.csproj b/src/netstandard/pkg/shims/netstandard/System.Threading.ThreadPool.csproj
index 5558adb75..793600e7b 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Threading.ThreadPool.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Threading.ThreadPool.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Threading.ThreadPool.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Threading.Timer.csproj b/src/netstandard/pkg/shims/netstandard/System.Threading.Timer.csproj
index 1045dffb0..2282a25de 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Threading.Timer.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Threading.Timer.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Threading.Timer.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Threading.csproj b/src/netstandard/pkg/shims/netstandard/System.Threading.csproj
index 378f53f7f..f165135f4 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Threading.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Threading.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Threading.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.ValueTuple.csproj b/src/netstandard/pkg/shims/netstandard/System.ValueTuple.csproj
index c03159554..f67235336 100644
--- a/src/netstandard/pkg/shims/netstandard/System.ValueTuple.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.ValueTuple.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.ValueTuple.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Xml.ReaderWriter.csproj b/src/netstandard/pkg/shims/netstandard/System.Xml.ReaderWriter.csproj
index c3f883f2e..becf6b019 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Xml.ReaderWriter.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Xml.ReaderWriter.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Xml.ReaderWriter.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Xml.XDocument.csproj b/src/netstandard/pkg/shims/netstandard/System.Xml.XDocument.csproj
index 1bb96cc83..661e12aa3 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Xml.XDocument.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Xml.XDocument.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Xml.XDocument.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Xml.XPath.XDocument.csproj b/src/netstandard/pkg/shims/netstandard/System.Xml.XPath.XDocument.csproj
index c4e03fa2b..e884e538e 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Xml.XPath.XDocument.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Xml.XPath.XDocument.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Xml.XPath.XDocument.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Xml.XPath.csproj b/src/netstandard/pkg/shims/netstandard/System.Xml.XPath.csproj
index fb7872c05..2bb0a3203 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Xml.XPath.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Xml.XPath.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Xml.XPath.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Xml.XmlDocument.csproj b/src/netstandard/pkg/shims/netstandard/System.Xml.XmlDocument.csproj
index 4f2b3fa01..1e475b3c4 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Xml.XmlDocument.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Xml.XmlDocument.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Xml.XmlDocument.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/netstandard/System.Xml.XmlSerializer.csproj b/src/netstandard/pkg/shims/netstandard/System.Xml.XmlSerializer.csproj
index 8094a0af8..c779a2b3a 100644
--- a/src/netstandard/pkg/shims/netstandard/System.Xml.XmlSerializer.csproj
+++ b/src/netstandard/pkg/shims/netstandard/System.Xml.XmlSerializer.csproj
@@ -8,5 +8,4 @@
     <Compile Include="System.Xml.XmlSerializer.Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/netstandard/pkg/shims/shim.projtemplate b/src/netstandard/pkg/shims/shim.projtemplate
index e56691d91..c7d69f1ac 100644
--- a/src/netstandard/pkg/shims/shim.projtemplate
+++ b/src/netstandard/pkg/shims/shim.projtemplate
@@ -10,5 +10,4 @@
     <Compile Include="[SHIM].Forwards.cs" />
     <ProjectReference Include="..\..\..\ref\netstandard.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>