Skip to content
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.

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

WIP: Fix repo root path in Linux build.sh #31

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ jobs:
buildConfig: checked
platformGroup: gcstress
helixQueueGroup: ci
managedOsxBuild: false
jobParameters:
testGroup: gcstress0x3-gcstress0xc
1 change: 1 addition & 0 deletions eng/pipelines/coreclr/r2r-extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
platformGroup: gcstress # r2r-extra testGroup runs gcstress15 scenario
helixQueueGroup: ci
testGroup: r2r-extra
managedOsxBuild: false
jobParameters:
readyToRun: true
displayNameArgs: R2R
1 change: 1 addition & 0 deletions eng/pipelines/coreclr/r2r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
- Windows_NT_x64
- Windows_NT_x86
helixQueueGroup: ci
managedOsxBuild: false
jobParameters:
testGroup: outerloop
readyToRun: true
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType"
__PackagesBinDir="$__BinDir/.nuget"
export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
export __ArtifactsIntermediatesDir="$__ProjectDir/artifacts/obj"
export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj"
__isMSBuildOnNETCoreSupported=0
__CrossComponentBinDir="$__BinDir"

Expand Down
5 changes: 0 additions & 5 deletions src/coreclr/tests/build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\targeting_pack_ref\targeting_pack_ref.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_dependencies\test_dependencies.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_runtime\test_runtime.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+roslyn\benchmark+roslyn.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+serialize\benchmark+serialize.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark\benchmark.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+intrinsic\benchmark+intrinsic.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\performance\performance.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\CoreFX\CoreFX.csproj" />
<RestoreProjects Include="$(MSBuildThisFileDirectory)external\external.csproj" />
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

114 changes: 0 additions & 114 deletions src/coreclr/tests/src/JIT/config/benchmark/benchmark.csproj

This file was deleted.