From bc4804118b8eec5db5843232bdea4e710e366d09 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Wed, 17 Mar 2021 16:17:28 -0400
Subject: [PATCH 1/3] runtime-linker-tests: revert earlier change which added
 browser offsets as a dep

---
 eng/pipelines/runtime-linker-tests.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml
index d88a886833a4a..64c4a55c772fd 100644
--- a/eng/pipelines/runtime-linker-tests.yml
+++ b/eng/pipelines/runtime-linker-tests.yml
@@ -77,7 +77,3 @@ jobs:
       nameSuffix: Runtime_Release
       buildArgs: -s mono+libs -c $(_BuildConfig)
       extraStepsTemplate: /eng/pipelines/libraries/execute-trimming-tests-steps.yml
-      dependsOn:
-      - mono_browser_offsets
-      monoCrossAOTTargetOS:
-      - Browser

From b02bd8b5346b8594604df9c3376955fec5bcea31 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Wed, 17 Mar 2021 19:10:30 -0400
Subject: [PATCH 2/3] Disable wasm relinking for dotnet-linker-tests for now

---
 eng/pipelines/runtime-linker-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml
index 64c4a55c772fd..576c4c4ccedce 100644
--- a/eng/pipelines/runtime-linker-tests.yml
+++ b/eng/pipelines/runtime-linker-tests.yml
@@ -75,5 +75,5 @@ jobs:
       testGroup: innerloop
       timeoutInMinutes: 120
       nameSuffix: Runtime_Release
-      buildArgs: -s mono+libs -c $(_BuildConfig)
+      buildArgs: -s mono+libs -c $(_BuildConfig) -p:WasmBuildNative=false
       extraStepsTemplate: /eng/pipelines/libraries/execute-trimming-tests-steps.yml

From ba2065d87c44b12760faf8b9691a1a2f37f6c043 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Wed, 17 Mar 2021 21:45:17 -0400
Subject: [PATCH 3/3] Set WasmBuildNative=false when running tests also

---
 eng/pipelines/libraries/execute-trimming-tests-steps.yml | 3 ++-
 eng/pipelines/runtime-linker-tests.yml                   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/libraries/execute-trimming-tests-steps.yml b/eng/pipelines/libraries/execute-trimming-tests-steps.yml
index 183cebbcf83bd..a0172e2363428 100644
--- a/eng/pipelines/libraries/execute-trimming-tests-steps.yml
+++ b/eng/pipelines/libraries/execute-trimming-tests-steps.yml
@@ -1,7 +1,8 @@
 parameters:
   archType: ''
+  extraTestArgs: ''
 
 steps:
   # Execute tests
-  - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) -s libs.tests -c $(_BuildConfig) /p:TestAssemblies=false /p:TestTrimming=true $(_officialBuildParameter) $(_crossBuildPropertyArg) /bl:$(Build.SourcesDirectory)/artifacts/log/$(buildConfigUpper)/TrimmingTests.binlog
+  - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) -s libs.tests -c $(_BuildConfig) /p:TestAssemblies=false /p:TestTrimming=true $(_officialBuildParameter) $(_crossBuildPropertyArg) /bl:$(Build.SourcesDirectory)/artifacts/log/$(buildConfigUpper)/TrimmingTests.binlog ${{ parameters.extraTestArgs }}
     displayName: Run Trimming Tests
diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml
index 576c4c4ccedce..836b54c849ab5 100644
--- a/eng/pipelines/runtime-linker-tests.yml
+++ b/eng/pipelines/runtime-linker-tests.yml
@@ -77,3 +77,5 @@ jobs:
       nameSuffix: Runtime_Release
       buildArgs: -s mono+libs -c $(_BuildConfig) -p:WasmBuildNative=false
       extraStepsTemplate: /eng/pipelines/libraries/execute-trimming-tests-steps.yml
+      extraStepsParameters:
+          extraTestArgs: '/p:WasmBuildNative=false'