Remove IsRuntimeRepository checks#43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 4 commits into from
Nov 15, 2019
Merged

Remove IsRuntimeRepository checks #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d83a7a7
Remove IsRuntimeRepository checks
ViktorHofer Nov 14, 2019
2a8c75c
Remove YAML bits needed for building in core-setup.
jkoritzinsky Nov 14, 2019
abab4dd
Remove remaining consolidation branches in yml
ViktorHofer Nov 14, 2019
1e65b13
Merge branch 'RemoveRuntimeChecks' of https://github.com/ViktorHofer/…
ViktorHofer Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .dotnet-runtime-placeholder
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion eng/helixcorefxtests.proj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
5 changes: 0 additions & 5 deletions eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,6 @@ jobs:
- name: coreClrRepoRoot
value: '$(Build.SourcesDirectory)/src/coreclr'

- ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

- name: coreClrRepoRoot
value: '$(Build.SourcesDirectory)'

- name: coreClrRepoRootDir
value: '$(coreClrRepoRoot)$(dir)'

Expand Down
22 changes: 6 additions & 16 deletions eng/pipelines/installer/azure-pipelines.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,12 @@ trigger:
branches:
include:
- master
- release/3.*
- release/*.*
paths:
include:
- '*'
- docs/installer/manpages/*
- Documentation/manpages/*
exclude:
- Documentation/*
- src/coreclr/*
- src/libraries/*
- eng/pipelines/coreclr/*
Expand All@@ -24,14 +22,12 @@ pr:
branches:
include:
- master
- release/3.*
- release/*.*
paths:
include:
- '*'
- docs/installer/manpages/*
- Documentation/manpages/*
exclude:
- Documentation/*
- src/coreclr/*
- src/libraries/*
- eng/pipelines/coreclr/*
Expand DownExpand Up@@ -72,16 +68,10 @@ variables:
# Values for SDLValidationParameters
- group: core-setup-sdl-validation

- ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
- name: pipelinesPath
value: /eng/pipelines/installer
- name: buildScriptFileName
value: installer
- ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
- name: pipelinesPath
value: /eng/pipelines
- name: buildScriptFileName
value: build
- name: pipelinesPath
value: /eng/pipelines/installer
- name: buildScriptFileName
value: installer

stages:
- stage: Build
Expand Down
14 changes: 4 additions & 10 deletions eng/pipelines/installer/jobs/bash-build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ parameters:
packageDistroList: null
skipTests: $(SkipTests)
strategy:
matrix:
matrix:
debug:
_BuildConfig: Debug
release:
Expand DownExpand Up@@ -45,15 +45,12 @@ jobs:
$(PreserveNuGetAuthDockerArgs)
${{ parameters.additionalRunArgs }}
${{ parameters.dockerImage }}

${{ if eq(parameters.name, 'FreeBSD_x64')}}:
RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&

${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
BuildScript: ./eng/install-nuget-credprovider-then-build.sh
${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
MSBuildScript: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh

${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}:
Expand DownExpand Up@@ -97,10 +94,7 @@ jobs:
-w=/root/runtime
$(PreserveNuGetAuthDockerArgs)

${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
installersSubsetArg: --subset Installers
${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
installersSubsetArg: /p:Subset=Installer
installersSubsetArg: --subset Installers

steps:

Expand Down
13 changes: 3 additions & 10 deletions eng/pipelines/libraries/.azure-ci.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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
Expand Down
64 changes: 20 additions & 44 deletions eng/pipelines/libraries/corefx-base.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
22 changes: 6 additions & 16 deletions eng/pipelines/libraries/variables.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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
4 changes: 1 addition & 3 deletions src/coreclr/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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" />
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/Directory.Build.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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" />

Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/build-packages.cmd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/build-packages.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/build-test.cmd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/build-test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/build.cmd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/dotnet.cmd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/dotnet.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/src/pal/tools/gen-buildsys.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/tests/scripts/arm32_ci_script.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove IsRuntimeRepository checks#43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 4 commits into

from

Nov 15, 2019
 Merged


Remove IsRuntimeRepository checks
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d83a7a7

Remove IsRuntimeRepository checks


ViktorHofer Nov 14, 2019
2a8c75c

Remove YAML bits needed for building in core-setup.


jkoritzinsky Nov 14, 2019
abab4dd

Remove remaining consolidation branches in yml


ViktorHofer Nov 14, 2019
1e65b13

Merge branch 'RemoveRuntimeChecks' of https://github.com/ViktorHofer/…


ViktorHofer Nov 14, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 0 additions & 5 deletions
.dotnet-runtime-placeholder

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,6 @@ jobs:
 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'

 - name: coreClrRepoRootDir
 value: '$(coreClrRepoRoot)$(dir)'

Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/installer/azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,12 @@ trigger:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand All@@ -24,14 +22,12 @@ pr:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand DownExpand Up@@ -72,16 +68,10 @@ variables:
 # Values for SDLValidationParameters
 - group: core-setup-sdl-validation

 - ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer
 - ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 - name: pipelinesPath
 value: /eng/pipelines
 - name: buildScriptFileName
 value: build
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer

stages:
- stage: Build
Expand Down

14 changes: 4 additions & 10 deletions
eng/pipelines/installer/jobs/bash-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ parameters:
 packageDistroList: null
 skipTests: $(SkipTests)
 strategy:
 matrix:
 matrix:
 debug:
 _BuildConfig: Debug
 release:
Expand DownExpand Up@@ -45,15 +45,12 @@ jobs:
 $(PreserveNuGetAuthDockerArgs)
 ${{ parameters.additionalRunArgs }}
 ${{ parameters.dockerImage }}

 ${{ if eq(parameters.name, 'FreeBSD_x64')}}:
 RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&

 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh
 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 MSBuildScript: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh

 ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}:
Expand DownExpand Up@@ -97,10 +94,7 @@ jobs:
 -w=/root/runtime
 $(PreserveNuGetAuthDockerArgs)

 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 installersSubsetArg: --subset Installers
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 installersSubsetArg: /p:Subset=Installer
 installersSubsetArg: --subset Installers

 steps:

Expand Down

13 changes: 3 additions & 10 deletions
eng/pipelines/libraries/.azure-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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
Expand Down

64 changes: 20 additions & 44 deletions
eng/pipelines/libraries/corefx-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/libraries/variables.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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

4 changes: 1 addition & 3 deletions
src/coreclr/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-packages.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-packages.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/dotnet.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/dotnet.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/src/pal/tools/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/tests/scripts/arm32_ci_script.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove IsRuntimeRepository checks#43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 4 commits into

from

Nov 15, 2019
 Merged


Remove IsRuntimeRepository checks
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d83a7a7

Remove IsRuntimeRepository checks


ViktorHofer Nov 14, 2019
2a8c75c

Remove YAML bits needed for building in core-setup.


jkoritzinsky Nov 14, 2019
abab4dd

Remove remaining consolidation branches in yml


ViktorHofer Nov 14, 2019
1e65b13

Merge branch 'RemoveRuntimeChecks' of https://github.com/ViktorHofer/…


ViktorHofer Nov 14, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 0 additions & 5 deletions
.dotnet-runtime-placeholder

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,6 @@ jobs:
 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'

 - name: coreClrRepoRootDir
 value: '$(coreClrRepoRoot)$(dir)'

Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/installer/azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,12 @@ trigger:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand All@@ -24,14 +22,12 @@ pr:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand DownExpand Up@@ -72,16 +68,10 @@ variables:
 # Values for SDLValidationParameters
 - group: core-setup-sdl-validation

 - ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer
 - ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 - name: pipelinesPath
 value: /eng/pipelines
 - name: buildScriptFileName
 value: build
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer

stages:
- stage: Build
Expand Down

14 changes: 4 additions & 10 deletions
eng/pipelines/installer/jobs/bash-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ parameters:
 packageDistroList: null
 skipTests: $(SkipTests)
 strategy:
 matrix:
 matrix:
 debug:
 _BuildConfig: Debug
 release:
Expand DownExpand Up@@ -45,15 +45,12 @@ jobs:
 $(PreserveNuGetAuthDockerArgs)
 ${{ parameters.additionalRunArgs }}
 ${{ parameters.dockerImage }}

 ${{ if eq(parameters.name, 'FreeBSD_x64')}}:
 RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&

 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh
 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 MSBuildScript: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh

 ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}:
Expand DownExpand Up@@ -97,10 +94,7 @@ jobs:
 -w=/root/runtime
 $(PreserveNuGetAuthDockerArgs)

 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 installersSubsetArg: --subset Installers
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 installersSubsetArg: /p:Subset=Installer
 installersSubsetArg: --subset Installers

 steps:

Expand Down

13 changes: 3 additions & 10 deletions
eng/pipelines/libraries/.azure-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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
Expand Down

64 changes: 20 additions & 44 deletions
eng/pipelines/libraries/corefx-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/libraries/variables.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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

4 changes: 1 addition & 3 deletions
src/coreclr/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-packages.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-packages.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/dotnet.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/dotnet.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/src/pal/tools/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/tests/scripts/arm32_ci_script.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove IsRuntimeRepository checks#43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 4 commits into

from

Nov 15, 2019
 Merged


Remove IsRuntimeRepository checks
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d83a7a7

Remove IsRuntimeRepository checks


ViktorHofer Nov 14, 2019
2a8c75c

Remove YAML bits needed for building in core-setup.


jkoritzinsky Nov 14, 2019
abab4dd

Remove remaining consolidation branches in yml


ViktorHofer Nov 14, 2019
1e65b13

Merge branch 'RemoveRuntimeChecks' of https://github.com/ViktorHofer/…


ViktorHofer Nov 14, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 0 additions & 5 deletions
.dotnet-runtime-placeholder

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,6 @@ jobs:
 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'

 - name: coreClrRepoRootDir
 value: '$(coreClrRepoRoot)$(dir)'

Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/installer/azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,12 @@ trigger:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand All@@ -24,14 +22,12 @@ pr:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand DownExpand Up@@ -72,16 +68,10 @@ variables:
 # Values for SDLValidationParameters
 - group: core-setup-sdl-validation

 - ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer
 - ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 - name: pipelinesPath
 value: /eng/pipelines
 - name: buildScriptFileName
 value: build
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer

stages:
- stage: Build
Expand Down

14 changes: 4 additions & 10 deletions
eng/pipelines/installer/jobs/bash-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ parameters:
 packageDistroList: null
 skipTests: $(SkipTests)
 strategy:
 matrix:
 matrix:
 debug:
 _BuildConfig: Debug
 release:
Expand DownExpand Up@@ -45,15 +45,12 @@ jobs:
 $(PreserveNuGetAuthDockerArgs)
 ${{ parameters.additionalRunArgs }}
 ${{ parameters.dockerImage }}

 ${{ if eq(parameters.name, 'FreeBSD_x64')}}:
 RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&

 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh
 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 MSBuildScript: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh

 ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}:
Expand DownExpand Up@@ -97,10 +94,7 @@ jobs:
 -w=/root/runtime
 $(PreserveNuGetAuthDockerArgs)

 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 installersSubsetArg: --subset Installers
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 installersSubsetArg: /p:Subset=Installer
 installersSubsetArg: --subset Installers

 steps:

Expand Down

13 changes: 3 additions & 10 deletions
eng/pipelines/libraries/.azure-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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
Expand Down

64 changes: 20 additions & 44 deletions
eng/pipelines/libraries/corefx-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/libraries/variables.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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

4 changes: 1 addition & 3 deletions
src/coreclr/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-packages.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-packages.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/dotnet.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/dotnet.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/src/pal/tools/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/tests/scripts/arm32_ci_script.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove IsRuntimeRepository checks#43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 4 commits into

from

Nov 15, 2019
 Merged


Remove IsRuntimeRepository checks
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d83a7a7

Remove IsRuntimeRepository checks


ViktorHofer Nov 14, 2019
2a8c75c

Remove YAML bits needed for building in core-setup.


jkoritzinsky Nov 14, 2019
abab4dd

Remove remaining consolidation branches in yml


ViktorHofer Nov 14, 2019
1e65b13

Merge branch 'RemoveRuntimeChecks' of https://github.com/ViktorHofer/…


ViktorHofer Nov 14, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 0 additions & 5 deletions
.dotnet-runtime-placeholder

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,6 @@ jobs:
 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'

 - name: coreClrRepoRootDir
 value: '$(coreClrRepoRoot)$(dir)'

Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/installer/azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,12 @@ trigger:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand All@@ -24,14 +22,12 @@ pr:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand DownExpand Up@@ -72,16 +68,10 @@ variables:
 # Values for SDLValidationParameters
 - group: core-setup-sdl-validation

 - ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer
 - ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 - name: pipelinesPath
 value: /eng/pipelines
 - name: buildScriptFileName
 value: build
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer

stages:
- stage: Build
Expand Down

14 changes: 4 additions & 10 deletions
eng/pipelines/installer/jobs/bash-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ parameters:
 packageDistroList: null
 skipTests: $(SkipTests)
 strategy:
 matrix:
 matrix:
 debug:
 _BuildConfig: Debug
 release:
Expand DownExpand Up@@ -45,15 +45,12 @@ jobs:
 $(PreserveNuGetAuthDockerArgs)
 ${{ parameters.additionalRunArgs }}
 ${{ parameters.dockerImage }}

 ${{ if eq(parameters.name, 'FreeBSD_x64')}}:
 RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&

 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh
 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 MSBuildScript: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh

 ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}:
Expand DownExpand Up@@ -97,10 +94,7 @@ jobs:
 -w=/root/runtime
 $(PreserveNuGetAuthDockerArgs)

 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 installersSubsetArg: --subset Installers
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 installersSubsetArg: /p:Subset=Installer
 installersSubsetArg: --subset Installers

 steps:

Expand Down

13 changes: 3 additions & 10 deletions
eng/pipelines/libraries/.azure-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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
Expand Down

64 changes: 20 additions & 44 deletions
eng/pipelines/libraries/corefx-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/libraries/variables.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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

4 changes: 1 addition & 3 deletions
src/coreclr/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-packages.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-packages.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/dotnet.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/dotnet.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/src/pal/tools/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/tests/scripts/arm32_ci_script.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove IsRuntimeRepository checks#43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 4 commits into

from

Nov 15, 2019
 Merged


Remove IsRuntimeRepository checks
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d83a7a7

Remove IsRuntimeRepository checks


ViktorHofer Nov 14, 2019
2a8c75c

Remove YAML bits needed for building in core-setup.


jkoritzinsky Nov 14, 2019
abab4dd

Remove remaining consolidation branches in yml


ViktorHofer Nov 14, 2019
1e65b13

Merge branch 'RemoveRuntimeChecks' of https://github.com/ViktorHofer/…


ViktorHofer Nov 14, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 0 additions & 5 deletions
.dotnet-runtime-placeholder

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,6 @@ jobs:
 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'

 - name: coreClrRepoRootDir
 value: '$(coreClrRepoRoot)$(dir)'

Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/installer/azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,12 @@ trigger:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand All@@ -24,14 +22,12 @@ pr:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand DownExpand Up@@ -72,16 +68,10 @@ variables:
 # Values for SDLValidationParameters
 - group: core-setup-sdl-validation

 - ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer
 - ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 - name: pipelinesPath
 value: /eng/pipelines
 - name: buildScriptFileName
 value: build
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer

stages:
- stage: Build
Expand Down

14 changes: 4 additions & 10 deletions
eng/pipelines/installer/jobs/bash-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ parameters:
 packageDistroList: null
 skipTests: $(SkipTests)
 strategy:
 matrix:
 matrix:
 debug:
 _BuildConfig: Debug
 release:
Expand DownExpand Up@@ -45,15 +45,12 @@ jobs:
 $(PreserveNuGetAuthDockerArgs)
 ${{ parameters.additionalRunArgs }}
 ${{ parameters.dockerImage }}

 ${{ if eq(parameters.name, 'FreeBSD_x64')}}:
 RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&

 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh
 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 MSBuildScript: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh

 ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}:
Expand DownExpand Up@@ -97,10 +94,7 @@ jobs:
 -w=/root/runtime
 $(PreserveNuGetAuthDockerArgs)

 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 installersSubsetArg: --subset Installers
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 installersSubsetArg: /p:Subset=Installer
 installersSubsetArg: --subset Installers

 steps:

Expand Down

13 changes: 3 additions & 10 deletions
eng/pipelines/libraries/.azure-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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
Expand Down

64 changes: 20 additions & 44 deletions
eng/pipelines/libraries/corefx-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/libraries/variables.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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

4 changes: 1 addition & 3 deletions
src/coreclr/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-packages.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-packages.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/dotnet.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/dotnet.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/src/pal/tools/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/tests/scripts/arm32_ci_script.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove IsRuntimeRepository checks#43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 4 commits into

from

Nov 15, 2019
 Merged


Remove IsRuntimeRepository checks
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d83a7a7

Remove IsRuntimeRepository checks


ViktorHofer Nov 14, 2019
2a8c75c

Remove YAML bits needed for building in core-setup.


jkoritzinsky Nov 14, 2019
abab4dd

Remove remaining consolidation branches in yml


ViktorHofer Nov 14, 2019
1e65b13

Merge branch 'RemoveRuntimeChecks' of https://github.com/ViktorHofer/…


ViktorHofer Nov 14, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 0 additions & 5 deletions
.dotnet-runtime-placeholder

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,6 @@ jobs:
 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'

 - name: coreClrRepoRootDir
 value: '$(coreClrRepoRoot)$(dir)'

Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/installer/azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,12 @@ trigger:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand All@@ -24,14 +22,12 @@ pr:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand DownExpand Up@@ -72,16 +68,10 @@ variables:
 # Values for SDLValidationParameters
 - group: core-setup-sdl-validation

 - ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer
 - ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 - name: pipelinesPath
 value: /eng/pipelines
 - name: buildScriptFileName
 value: build
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer

stages:
- stage: Build
Expand Down

14 changes: 4 additions & 10 deletions
eng/pipelines/installer/jobs/bash-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ parameters:
 packageDistroList: null
 skipTests: $(SkipTests)
 strategy:
 matrix:
 matrix:
 debug:
 _BuildConfig: Debug
 release:
Expand DownExpand Up@@ -45,15 +45,12 @@ jobs:
 $(PreserveNuGetAuthDockerArgs)
 ${{ parameters.additionalRunArgs }}
 ${{ parameters.dockerImage }}

 ${{ if eq(parameters.name, 'FreeBSD_x64')}}:
 RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&

 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh
 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 MSBuildScript: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh

 ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}:
Expand DownExpand Up@@ -97,10 +94,7 @@ jobs:
 -w=/root/runtime
 $(PreserveNuGetAuthDockerArgs)

 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 installersSubsetArg: --subset Installers
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 installersSubsetArg: /p:Subset=Installer
 installersSubsetArg: --subset Installers

 steps:

Expand Down

13 changes: 3 additions & 10 deletions
eng/pipelines/libraries/.azure-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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
Expand Down

64 changes: 20 additions & 44 deletions
eng/pipelines/libraries/corefx-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/libraries/variables.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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

4 changes: 1 addition & 3 deletions
src/coreclr/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-packages.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-packages.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/dotnet.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/dotnet.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/src/pal/tools/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/tests/scripts/arm32_ci_script.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove IsRuntimeRepository checks#43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 4 commits into

from

Nov 15, 2019
 Merged


Remove IsRuntimeRepository checks
#43
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d83a7a7

Remove IsRuntimeRepository checks


ViktorHofer Nov 14, 2019
2a8c75c

Remove YAML bits needed for building in core-setup.


jkoritzinsky Nov 14, 2019
abab4dd

Remove remaining consolidation branches in yml


ViktorHofer Nov 14, 2019
1e65b13

Merge branch 'RemoveRuntimeChecks' of https://github.com/ViktorHofer/…


ViktorHofer Nov 14, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 0 additions & 5 deletions
.dotnet-runtime-placeholder

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

5 changes: 0 additions & 5 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,11 +84,6 @@ jobs:
 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'

 - name: coreClrRepoRootDir
 value: '$(coreClrRepoRoot)$(dir)'

Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/installer/azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,12 @@ trigger:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand All@@ -24,14 +22,12 @@ pr:
 branches:
 include:
 - master
 - release/3.*
 - release/*.*
 paths:
 include:
 - '*'
 - docs/installer/manpages/*
 - Documentation/manpages/*
 exclude:
 - Documentation/*
 - src/coreclr/*
 - src/libraries/*
 - eng/pipelines/coreclr/*
Expand DownExpand Up@@ -72,16 +68,10 @@ variables:
 # Values for SDLValidationParameters
 - group: core-setup-sdl-validation

 - ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer
 - ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 - name: pipelinesPath
 value: /eng/pipelines
 - name: buildScriptFileName
 value: build
 - name: pipelinesPath
 value: /eng/pipelines/installer
 - name: buildScriptFileName
 value: installer

stages:
- stage: Build
Expand Down

14 changes: 4 additions & 10 deletions
eng/pipelines/installer/jobs/bash-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ parameters:
 packageDistroList: null
 skipTests: $(SkipTests)
 strategy:
 matrix:
 matrix:
 debug:
 _BuildConfig: Debug
 release:
Expand DownExpand Up@@ -45,15 +45,12 @@ jobs:
 $(PreserveNuGetAuthDockerArgs)
 ${{ parameters.additionalRunArgs }}
 ${{ parameters.dockerImage }}

 ${{ if eq(parameters.name, 'FreeBSD_x64')}}:
 RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&

 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh
 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 BuildScript: ./eng/install-nuget-credprovider-then-build.sh --subsetCategory installer
 MSBuildScript: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh

 ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}:
Expand DownExpand Up@@ -97,10 +94,7 @@ jobs:
 -w=/root/runtime
 $(PreserveNuGetAuthDockerArgs)

 ${{ if contains(variables['Build.DefinitionName'], 'runtime') }}:
 installersSubsetArg: --subset Installers
 ${{ if not(contains(variables['Build.DefinitionName'], 'runtime')) }}:
 installersSubsetArg: /p:Subset=Installer
 installersSubsetArg: --subset Installers

 steps:

Expand Down

13 changes: 3 additions & 10 deletions
eng/pipelines/libraries/.azure-ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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
Expand Down

64 changes: 20 additions & 44 deletions
eng/pipelines/libraries/corefx-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

22 changes: 6 additions & 16 deletions
eng/pipelines/libraries/variables.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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

4 changes: 1 addition & 3 deletions
src/coreclr/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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" />

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-packages.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-packages.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/build.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

3 changes: 0 additions & 3 deletions
src/coreclr/dotnet.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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=
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/dotnet.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/src/pal/tools/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/tests/scripts/arm32_ci_script.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading