From ed9cd9d192d285d36474cd1e7610709341677f37 Mon Sep 17 00:00:00 2001 From: Tomas Rylek Date: Wed, 13 Nov 2019 16:14:42 +0100 Subject: [PATCH 1/6] Fix repo root path in Linux build.sh --- src/coreclr/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index 9eb5824525edc..0446592217b29 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -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" From f16bd7a49245794390b4d33feba4a1a87899629d Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 13 Nov 2019 22:29:55 +0100 Subject: [PATCH 2/6] Temporary instrumentation - delete 4 tests using myget packages --- .../benchmark+intrinsic.csproj | 28 ----- .../benchmark+roslyn/benchmark+roslyn.csproj | 99 --------------- .../benchmark+serialize.csproj | 96 --------------- .../src/JIT/config/benchmark/benchmark.csproj | 114 ------------------ 4 files changed, 337 deletions(-) delete mode 100644 src/coreclr/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj delete mode 100644 src/coreclr/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj delete mode 100644 src/coreclr/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj delete mode 100644 src/coreclr/tests/src/JIT/config/benchmark/benchmark.csproj diff --git a/src/coreclr/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj b/src/coreclr/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj deleted file mode 100644 index 4eb81d9bd4f12..0000000000000 --- a/src/coreclr/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - - Debug - AnyCPU - BuildOnly - .NETCoreApp,Version=v5.0 - netcoreapp5.0 - false - - - - $(MicrosoftPrivateCoreFxNETCoreAppVersion) - - - $(MicrosoftPrivateCoreFxNETCoreAppVersion) - - - - netcoreapp5.0 - .NETCoreApp - win-arm;win-arm64;win-x64;win-x86;$(TargetRid) - - - - diff --git a/src/coreclr/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj b/src/coreclr/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj deleted file mode 100644 index 3d7ebcf72d169..0000000000000 --- a/src/coreclr/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - - .NETStandard,Version=v1.4 - netstandard1.4 - false - - - - 1.1.1 - - - $(XunitPerformanceApiPackageVersion) - - - $(XunitPerformanceApiPackageVersion) - - - $(XunitPerformanceApiPackageVersion) - - - $(XunitPerformanceApiPackageVersion) - - - $(MicrosoftDiagnosticsTracingTraceEventPackageVersion) - - - $(MicrosoftNETCorePlatformsVersion) - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-preview2-25302-03 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-preview2-25302-03 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - $(XunitPackageVersion) - - - $(XunitPackageVersion) - - - $(XunitPackageVersion) - - - - netstandard1.4 - .NETStandard - - - - diff --git a/src/coreclr/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj b/src/coreclr/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj deleted file mode 100644 index d0b51085a44dc..0000000000000 --- a/src/coreclr/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj +++ /dev/null @@ -1,96 +0,0 @@ - - - - - .NETStandard,Version=v1.4 - netstandard1.4 - false - - - - $(XunitPerformanceApiPackageVersion) - - - $(XunitPerformanceApiPackageVersion) - - - $(XunitPerformanceApiPackageVersion) - - - $(XunitPerformanceApiPackageVersion) - - - $(MicrosoftDiagnosticsTracingTraceEventPackageVersion) - - - $(MicrosoftNETCorePlatformsVersion) - - - 7.0.1 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-preview2-25302-03 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - $(XunitPackageVersion) - - - $(XunitPackageVersion) - - - $(XunitPackageVersion) - - - - netstandard1.4 - .NETStandard - - - - diff --git a/src/coreclr/tests/src/JIT/config/benchmark/benchmark.csproj b/src/coreclr/tests/src/JIT/config/benchmark/benchmark.csproj deleted file mode 100644 index b4b2b6427aed3..0000000000000 --- a/src/coreclr/tests/src/JIT/config/benchmark/benchmark.csproj +++ /dev/null @@ -1,114 +0,0 @@ - - - - - .NETStandard,Version=v1.4 - netstandard1.4 - false - - - - $(XunitPerformanceApiPackageVersion) - - - $(XunitPerformanceApiPackageVersion) - - - $(XunitPerformanceApiPackageVersion) - - - $(XunitPerformanceApiPackageVersion) - - - $(MicrosoftDiagnosticsTracingTraceEventPackageVersion) - - - $(MicrosoftNETCorePlatformsVersion) - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.5.2 - - - 4.5.0 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - $(MicrosoftPrivateCoreFxNETCoreAppVersion) - - - 4.4.0-beta-24913-02 - - - $(MicrosoftPrivateCoreFxNETCoreAppVersion) - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - 4.4.0-beta-24913-02 - - - $(XunitPackageVersion) - - - $(XunitPackageVersion) - - - $(XunitPackageVersion) - - - - netstandard1.4 - .NETStandard - - - - From 7b6525d09664cc7f029141b9846070482cdcd5d0 Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 13 Nov 2019 22:56:58 +0100 Subject: [PATCH 3/6] Remove restoration for the four silly JIT/config projects --- src/coreclr/tests/build.proj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj index 50c468254adda..0dfdcdc2ea20e 100644 --- a/src/coreclr/tests/build.proj +++ b/src/coreclr/tests/build.proj @@ -23,11 +23,6 @@ - - - - - From 5ee1071b835bc7ae6091b6334dff934f3dd436c7 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 14 Nov 2019 09:03:01 +0100 Subject: [PATCH 4/6] Fix gcstress0x3-gcstress0xc pipeline (already fixed in CoreCLR) --- eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml index b3ef70cb3b12a..bd343f0f6c380 100644 --- a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml @@ -30,5 +30,6 @@ jobs: buildConfig: checked platformGroup: gcstress helixQueueGroup: ci + managedOsxBuild: false jobParameters: testGroup: gcstress0x3-gcstress0xc From f5a9366398dbe52d16a38c726761a40d34b5ec6e Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 14 Nov 2019 09:11:38 +0100 Subject: [PATCH 5/6] Fix r2r-extra pipeline --- eng/pipelines/coreclr/r2r-extra.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/coreclr/r2r-extra.yml b/eng/pipelines/coreclr/r2r-extra.yml index 442f0674bd2d0..4b31b4b635278 100644 --- a/eng/pipelines/coreclr/r2r-extra.yml +++ b/eng/pipelines/coreclr/r2r-extra.yml @@ -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 From f86282e5c6f383e5d9a9adc1d874831d77bad766 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 14 Nov 2019 09:26:19 +0100 Subject: [PATCH 6/6] Fix r2r pipeline --- eng/pipelines/coreclr/r2r.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/coreclr/r2r.yml b/eng/pipelines/coreclr/r2r.yml index cf3046dfb09b6..20aeaf567c567 100644 --- a/eng/pipelines/coreclr/r2r.yml +++ b/eng/pipelines/coreclr/r2r.yml @@ -32,6 +32,7 @@ jobs: - Windows_NT_x64 - Windows_NT_x86 helixQueueGroup: ci + managedOsxBuild: false jobParameters: testGroup: outerloop readyToRun: true