dotnet · ViktorHofer · Nov 15, 2019 · Nov 14, 2019 · Nov 14, 2019 · Nov 14, 2019
diff --git a/.dotnet-runtime-placeholder b/.dotnet-runtime-placeholder
diff --git a/eng/helixcorefxtests.proj b/eng/helixcorefxtests.proj
@@ -85,7 +85,7 @@
       TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
      -->
     <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
-    <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
+    <ProjectDir>$(ProjectDir)\src\coreclr\</ProjectDir>
     <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
     <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
     <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>

diff --git a/eng/pipelines/libraries/.azure-ci.yml b/eng/pipelines/libraries/.azure-ci.yml
@@ -7,10 +7,9 @@ trigger:
   branches:
     include:
     - master
-    - release/3.* # TODO: (Consolidation) Remove when consolidated
+    - release/*.*
   paths:
     exclude:
-    - Documentation/* # TODO: (Consolidation) Remove when consolidated
     - docs/*
     - CODE-OF-CONDUCT.md
     - CONTRIBUTING.md
@@ -28,10 +27,9 @@ pr:
   branches:
     include:
     - master
-    - release/3.* # TODO: (Consolidation) Remove when consolidated
+    - release/*.*
   paths:
     exclude:
-    - Documentation/* # TODO: (Consolidation) Remove when consolidated
     - docs/*
     - CODE-OF-CONDUCT.md
     - CONTRIBUTING.md
@@ -69,12 +67,7 @@ resources:
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-a50a721-20191023143845
 
 variables:
-  - ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}: # TODO: (Consolidation) remove this condition
-    - template: variables.yml
-
-  # TODO: (Consolidation) remove this conditional block
-  - ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
-    - template: /eng/pipelines/variables.yml
+  - template: variables.yml
 
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
     - group: DotNet-Blob-Feed

diff --git a/eng/pipelines/libraries/corefx-base.yml b/eng/pipelines/libraries/corefx-base.yml
@@ -186,50 +186,26 @@ jobs:
                   artifactType: container
                 condition: and(succeeded(), eq(variables['_publishTests'], 'true'))
 
-            - ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}: # TODO: (Consolidation) remove.
-              - template: /eng/pipelines/libraries/helix.yml
-                parameters:
-                  # send tests to helix only on public builds, official scheduled builds or manual official builds.
-                  condition: eq(${{ parameters.isOfficialBuild }}, False)
-                  targetOS: ${{ parameters.targetOS }}
-                  archGroup: $(_architecture)
-                  configuration: $(_BuildConfig)
-                  helixQueues: $(_helixQueues)
-                  msbuildScript: $(_msbuildCommand)
-                  framework: $(_framework)
-                  testScope: ${{ coalesce(parameters.testScope, 'innerloop') }} # if parameters.testScope is empty use 'innerloop'
-
-                  ${{ if eq(parameters.isOfficialBuild, 'true') }}:
-                    officialBuildId: $(Build.BuildNumber)
-                    helixToken: $(HelixApiAccessToken)
-
-                  ${{ if eq(parameters.isOfficialBuild, 'false') }}:
-                    # TODO: SET Creator to the PR owner whenever Azure DevOps supports a good way to retrieve it.
-                    creator: dotnet-bot
-                    helixToken: ''
-
-            # TODO: (Consolidation) remove this if block when consolidated
-            - ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
-              - template: /eng/pipelines/helix.yml
-                parameters:
-                  # send tests to helix only on public builds, official scheduled builds or manual official builds.
-                  condition: eq(${{ parameters.isOfficialBuild }}, False)
-                  targetOS: ${{ parameters.targetOS }}
-                  archGroup: $(_architecture)
-                  configuration: $(_BuildConfig)
-                  helixQueues: $(_helixQueues)
-                  msbuildScript: $(_msbuildCommand)
-                  framework: $(_framework)
-                  testScope: ${{ coalesce(parameters.testScope, 'innerloop') }} # if parameters.testScope is empty use 'innerloop'
-
-                  ${{ if eq(parameters.isOfficialBuild, 'true') }}:
-                    officialBuildId: $(Build.BuildNumber)
-                    helixToken: $(HelixApiAccessToken)
-
-                  ${{ if eq(parameters.isOfficialBuild, 'false') }}:
-                    # TODO: SET Creator to the PR owner whenever Azure DevOps supports a good way to retrieve it.
-                    creator: dotnet-bot
-                    helixToken: ''
+            - template: /eng/pipelines/libraries/helix.yml
+              parameters:
+                # send tests to helix only on public builds, official scheduled builds or manual official builds.
+                condition: eq(${{ parameters.isOfficialBuild }}, False)
+                targetOS: ${{ parameters.targetOS }}
+                archGroup: $(_architecture)
+                configuration: $(_BuildConfig)
+                helixQueues: $(_helixQueues)
+                msbuildScript: $(_msbuildCommand)
+                framework: $(_framework)
+                testScope: ${{ coalesce(parameters.testScope, 'innerloop') }} # if parameters.testScope is empty use 'innerloop'
+
+                ${{ if eq(parameters.isOfficialBuild, 'true') }}:
+                  officialBuildId: $(Build.BuildNumber)
+                  helixToken: $(HelixApiAccessToken)
+
+                ${{ if eq(parameters.isOfficialBuild, 'false') }}:
+                  # TODO: SET Creator to the PR owner whenever Azure DevOps supports a good way to retrieve it.
+                  creator: dotnet-bot
+                  helixToken: ''
 
           - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
             - task: PublishBuildArtifacts@1

diff --git a/eng/pipelines/libraries/variables.yml b/eng/pipelines/libraries/variables.yml
@@ -1,17 +1,7 @@
 variables:
-  - ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}: # TODO: (Consolidation) Remove condition when consolidated
-    - name: buildScriptFileName
-      value: libraries
-    - name: sourcesRoot
-      value: $(Build.SourcesDirectory)/src/libraries
-    - name: pipelinesPath
-      value: /eng/pipelines/libraries
-
-  # TODO: (Consolidation) Remove when consolidated
-  - ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
-    - name: buildScriptFileName
-      value: build
-    - name: sourcesRoot
-      value: $(Build.SourcesDirectory)/src
-    - name: pipelinesPath
-      value: /eng/pipelines
+  - name: buildScriptFileName
+    value: libraries
+  - name: sourcesRoot
+    value: $(Build.SourcesDirectory)/src/libraries
+  - name: pipelinesPath
+    value: /eng/pipelines/libraries
diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props
@@ -1,11 +1,9 @@
 <Project>
 
-  <!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 -->
   <PropertyGroup>
-    <IsRuntimeRepository Condition="Exists('$(MSBuildThisFileDirectory)..\..\.dotnet-runtime-placeholder')">true</IsRuntimeRepository>
     <SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
   </PropertyGroup>
-  <Import Project="..\..\Directory.Build.props" Condition="'$(IsRuntimeRepository)' == 'true'" />
+  <Import Project="..\..\Directory.Build.props" />
 
   <!-- Ensure our properties are set before Arcade defines defaults -->
   <Import Project="dir.common.props" />

diff --git a/src/coreclr/Directory.Build.targets b/src/coreclr/Directory.Build.targets
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 -->
-  <Import Project="..\..\Directory.Build.targets" Condition="'$(IsRuntimeRepository)' == 'true'" />
+  <Import Project="..\..\Directory.Build.targets" />
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 

diff --git a/src/coreclr/build-packages.cmd b/src/coreclr/build-packages.cmd
@@ -4,9 +4,6 @@ setlocal EnableDelayedExpansion
 set "__ProjectDir=%~dp0"
 set "__RepoRootDir=%~dp0..\..\"
 
-rem Remove after repo consolidation
-if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir=!__ProjectDir!" )
-
 set "__args=%*"
 set processedArgs=
 set unprocessedArgs=

diff --git a/src/coreclr/build-packages.sh b/src/coreclr/build-packages.sh
@@ -27,12 +27,6 @@ initDistroRid()
 __ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 __RepoRootDir=${__ProjectRoot}/../..
 
-# BEGIN SECTION to remove after repo consolidation
-if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
-  __RepoRootDir=${__ProjectRoot}
-fi
-# END SECTION to remove after repo consolidation
-
 __IsPortableBuild=1
 __CrossBuild=0
 

diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd
@@ -33,9 +33,6 @@ set "__ProjectDir=%~dp0"
 if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%"
 set "__RepoRootDir=%__ProjectDir%\..\.."
 
-rem Remove after repo consolidation
-if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir=!__ProjectDir!" )
-
 set "__TestDir=%__ProjectDir%\tests"
 set "__ProjectFilesDir=%__TestDir%"
 set "__SourceDir=%__ProjectDir%\src"

diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh
@@ -584,12 +584,6 @@ usage_list+=("-skiprestorepackages - skip package restore.")
 __ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 __RepoRootDir=${__ProjectRoot}/../..
 
-# BEGIN SECTION to remove after repo consolidation
-if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
-  __RepoRootDir=${__ProjectRoot}
-fi
-# END SECTION to remove after repo consolidation
-
 handle_arguments() {
     case $1 in
         buildtestwrappersonly|-buildtestwrappersonly)

diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd
@@ -53,9 +53,6 @@ set "__ProjectDir=%~dp0"
 if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%"
 set "__RepoRootDir=%__ProjectDir%\..\.."
 
-rem Remove after repo consolidation
-if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir=!__ProjectDir!" )
-
 set "__ProjectFilesDir=%__ProjectDir%"
 set "__SourceDir=%__ProjectDir%\src"
 set "__RootBinDir=%__ProjectDir%\bin"

diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh
@@ -581,12 +581,6 @@ __ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # Some paths are relative to the main repo root
 __RepoRootDir="${__ProjectRoot}/../.."
 
-# BEGIN SECTION to remove after repo consolidation
-if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
-  __RepoRootDir=${__ProjectRoot}
-fi
-# END SECTION to remove after repo consolidation
-
 __BuildArch=
 __BuildType=Debug
 __CodeCoverage=

diff --git a/src/coreclr/dotnet.cmd b/src/coreclr/dotnet.cmd
@@ -4,9 +4,6 @@ setlocal
 set "__ProjectDir=%~dp0"
 set "__RepoRootDir=%__ProjectDir%..\..\"
 
-rem Remove after repo consolidation
-if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir=%__ProjectDir%" )
-
 :: Clear the 'Platform' env variable for this session, as it's a per-project setting within the build, and
 :: misleading value (such as 'MCD' in HP PCs) may lead to build breakage (issue: #69).
 set Platform=

diff --git a/src/coreclr/dotnet.sh b/src/coreclr/dotnet.sh
@@ -4,12 +4,6 @@ working_tree_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 __ProjectDir=${working_tree_root}
 __RepoRootDir=${working_tree_root}/../..
 
-# BEGIN SECTION to remove after repo consolidation
-if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
-  __RepoRootDir=${__ProjectDir}
-fi
-# END SECTION to remove after repo consolidation
-
 # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
 export DOTNET_MULTILEVEL_LOOKUP=0
 

diff --git a/src/coreclr/src/pal/tools/gen-buildsys.sh b/src/coreclr/src/pal/tools/gen-buildsys.sh
@@ -33,12 +33,6 @@ fi
 __CoreClrDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../.."
 __RepoRootDir=${__CoreClrDir}/../..
 
-# BEGIN SECTION to remove after repo consolidation
-if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
-  __RepoRootDir=${__CoreClrDir}
-fi
-# END SECTION to remove after repo consolidation
-
 build_arch="$3"
 buildtype=DEBUG
 code_coverage=OFF

diff --git a/src/coreclr/tests/scripts/arm32_ci_script.sh b/src/coreclr/tests/scripts/arm32_ci_script.sh
@@ -407,12 +407,6 @@ function run_tests_using_docker {
 
 __RepoRootDir=./../..
 
-# BEGIN SECTION to remove after repo consolidation
-if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then
-  __RepoRootDir=.
-fi
-# END SECTION to remove after repo consolidation
-
 #Define script variables
 __ciMode="emulator"
 __ARMEmulRootfs=/mnt/arm-emulator-rootfs

diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props
@@ -1,20 +1,6 @@
 <Project>
 
-  <!-- TODO: (Consolidation) Remove when consolidated. -->
-  <PropertyGroup>
-    <IsRuntimeRepository Condition="Exists('$(MSBuildThisFileDirectory)..\..\.dotnet-runtime-placeholder')">true</IsRuntimeRepository>
-  </PropertyGroup>
-  <Import Project="..\..\Directory.Build.props" Condition="'$(IsRuntimeRepository)' == 'true'" />
-
-  <!--
-    Import the arcade sdk with these requirements.
-    After:
-      Configuration setup
-    Before:
-      DebugType needs to be not be set to embedded at least for facades
-      OutputPath setup
-  -->
-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(IsRuntimeRepository)' != 'true'" />
+  <Import Project="..\..\Directory.Build.props" />
 
   <!--
     Get ProjectToBuild and '<subset>ProjectToBuild' items. Using the items lets projects handle
@@ -48,20 +34,6 @@
     <LicenseFile>$(RepoRoot)LICENSE.TXT</LicenseFile>
   </PropertyGroup>
 
-  <!-- TODO: (Consolidation) Remove when consolidated. -->
-  <PropertyGroup Condition="'$(IsRuntimeRepository)' != 'true'">
-    <InstallerTasksOutputPath>$(ArtifactsBinDir)installer.tasks\$(Configuration)\</InstallerTasksOutputPath>
-    <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(InstallerTasksOutputPath)netstandard2.0\installer.tasks.dll</InstallerTasksAssemblyPath>
-    <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(InstallerTasksOutputPath)net46\installer.tasks.dll</InstallerTasksAssemblyPath>
-  </PropertyGroup>
-
-  <!-- TODO: Remove after https://github.com/dotnet/arcade/pull/4254 is in. -->
-  <PropertyGroup>
-    <BinDir Condition="'$(BinDir)'==''">$(ArtifactsBinDir)</BinDir>
-    <ObjDir Condition="'$(ObjDir)'==''">$(ArtifactsObjDir)</ObjDir>
-    <PackagesDir Condition="'$(PackagesDir)' == ''">$(NuGetPackageRoot)</PackagesDir>
-  </PropertyGroup>
-
   <PropertyGroup>
     <HostMachineInfoProps>$(ArtifactsObjDir)HostMachineInfo.props</HostMachineInfoProps>
   </PropertyGroup>

diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets
@@ -7,9 +7,7 @@
   -->
   <Import Project="packaging.stubs.targets" Condition="'$(MSBuildProjectExtension)' != '.pkgproj'" />
 
-  <Import Project="..\..\Directory.Build.targets" Condition="'$(IsRuntimeRepository)' == 'true'" />
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(IsRuntimeRepository)' != 'true'" />
+  <Import Project="..\..\Directory.Build.targets" />
 
   <Import Project="$(RepositoryEngineeringDir)DisableSourceControlManagement.targets" Condition="'$(EnableSourceLink)' == 'false'" />
 

diff --git a/src/installer/signing/Directory.Build.props b/src/installer/signing/Directory.Build.props
@@ -4,9 +4,8 @@
 
   <PropertyGroup>
     <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
-    <IsRuntimeRepository Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\.dotnet-runtime-placeholder')">true</IsRuntimeRepository>
 
     <!-- Skip signing steps by default for non-official builds. Skip signing in the runtime repository until we onboard unified signing scripts. -->
-    <SkipSigning Condition="('$(SkipSigning)' == '' and '$(OfficialBuild)' != 'true') or '$(IsRuntimeRepository)' == 'true'">true</SkipSigning>
+    <SkipSigning>true</SkipSigning>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
@@ -8,12 +8,10 @@
     <RepositoryUrl>git://github.com/dotnet/corefx</RepositoryUrl>
   </PropertyGroup>
 
-  <!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 -->
   <PropertyGroup>
-    <IsRuntimeRepository Condition="Exists('$(MSBuildThisFileDirectory)..\..\.dotnet-runtime-placeholder')">true</IsRuntimeRepository>
     <SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
   </PropertyGroup>
-  <Import Project="..\..\Directory.Build.props" Condition="'$(IsRuntimeRepository)' == 'true'" />
+  <Import Project="..\..\Directory.Build.props" />
 
   <PropertyGroup>
     <!--

diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
@@ -1,5 +1,5 @@
 <Project InitialTargets="AddSkipGetTargetFrameworkToProjectReferences">
-  <Import Project="..\..\Directory.Build.targets" Condition="'$(IsRuntimeRepository)' == 'true'" />
+  <Import Project="..\..\Directory.Build.targets" />
 
   <PropertyGroup>
     <!-- Reset these properties back to blank, since they are defaulted by Microsoft.NET.Sdk -->

diff --git a/src/libraries/Native/build-native.cmd b/src/libraries/Native/build-native.cmd
@@ -4,12 +4,7 @@ setlocal
 :SetupArgs
 :: Initialize the args that will be passed to cmake
 set __nativeWindowsDir=%~dp0\Windows
-:: TODO: (Consolidation) Remove when consolidated
-if exist "%~dp0..\..\..\.dotnet-runtime-placeholder" (
-    set __repoRoot=%~dp0..\..\..
-) else (
-    set __repoRoot=%~dp0..\..
-)
+set __repoRoot=%~dp0..\..\..
 set __artifactsDir=%__repoRoot%\artifacts
 set __CMakeBinDir=""
 set __IntermediatesDir=""