From 6c87fbbf01f957686c26f0be492bea2e8488a392 Mon Sep 17 00:00:00 2001
From: Manish Godse <61718172+mangod9@users.noreply.github.com>
Date: Thu, 2 Apr 2020 07:42:04 -0700
Subject: [PATCH 1/3] simplify libraries build dependencies.

---
 eng/pipelines/libraries/build-job.yml      | 2 +-
 eng/pipelines/libraries/build-test-job.yml | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml
index 14057daa4ff90..1f7edf13dc3ed 100644
--- a/eng/pipelines/libraries/build-job.yml
+++ b/eng/pipelines/libraries/build-job.yml
@@ -56,7 +56,7 @@ jobs:
           - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
             - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
         - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
-          - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
+          - ${{ format('coreclr_corelib_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
 
       variables:
         - _skipTestRestoreArg: /p:SkipTestRestore=true
diff --git a/eng/pipelines/libraries/build-test-job.yml b/eng/pipelines/libraries/build-test-job.yml
index b821c45cdda4f..2e4c0275ec8f0 100644
--- a/eng/pipelines/libraries/build-test-job.yml
+++ b/eng/pipelines/libraries/build-test-job.yml
@@ -35,10 +35,7 @@ jobs:
       displayName: 'Test Build'
 
       dependsOn:
-      - ${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}:
-        - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-      - ${{ if in(parameters.framework, 'allConfigurations', 'net472') }}:
-        - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
       # Libraries Test also depends on Product, now that the libraries build only depends on corelib
       - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
         - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

From f8788a60bf29f2f57b82d90afe7e662aaae71b52 Mon Sep 17 00:00:00 2001
From: Manish Godse <61718172+mangod9@users.noreply.github.com>
Date: Thu, 2 Apr 2020 07:52:00 -0700
Subject: [PATCH 2/3] FIx depends for tests

---
 eng/pipelines/libraries/build-test-job.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/libraries/build-test-job.yml b/eng/pipelines/libraries/build-test-job.yml
index 2e4c0275ec8f0..0a44ef8f52d82 100644
--- a/eng/pipelines/libraries/build-test-job.yml
+++ b/eng/pipelines/libraries/build-test-job.yml
@@ -35,7 +35,7 @@ jobs:
       displayName: 'Test Build'
 
       dependsOn:
-      - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
       # Libraries Test also depends on Product, now that the libraries build only depends on corelib
       - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
         - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

From 9a20fca7d8607f128fe43b527217d323fae7a8be Mon Sep 17 00:00:00 2001
From: Manish Godse <61718172+mangod9@users.noreply.github.com>
Date: Thu, 2 Apr 2020 08:15:54 -0700
Subject: [PATCH 3/3] Fix artifact name for webAssembly

---
 eng/pipelines/libraries/base-job.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml
index 0539603360281..ece5ff1b37e0a 100644
--- a/eng/pipelines/libraries/base-job.yml
+++ b/eng/pipelines/libraries/base-job.yml
@@ -110,7 +110,7 @@ jobs:
 
           # WebAssembly uses linux implementation detail
           - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
-            - _runtimeArtifactName: '$(runtimeFlavorName)Product_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'
+            - _runtimeArtifactName: 'CoreLib_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'
 
         # Windows variables
         - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: