From 22927dd384ee22bdebc7fa7d06eb1887470a5143 Mon Sep 17 00:00:00 2001
From: Juan Hoyos <juan.hoyos@microsoft.com>
Date: Fri, 4 Sep 2020 11:54:47 -0700
Subject: [PATCH] Unconditionally build the cross-os DAC (#41852)

* Unconditionally build the cross-os DAC.
---
 eng/pipelines/coreclr/templates/build-job.yml      |  4 +-
 eng/pipelines/coreclr/templates/crossdac-build.yml | 81 +++++++++++-----------
 2 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml
index 91a5cb0..987187c 100644
--- a/eng/pipelines/coreclr/templates/build-job.yml
+++ b/eng/pipelines/coreclr/templates/build-job.yml
@@ -173,7 +173,7 @@ jobs:
 
         - template: /eng/pipelines/common/macos-sign-with-entitlements.yml
           parameters:
-            filesToSign: 
+            filesToSign:
             - name: createdump
               path: $(buildProductRootFolderPath)
               entitlementsFile: $(Build.SourcesDirectory)/eng/pipelines/common/createdump-entitlements.plist
@@ -215,7 +215,7 @@ jobs:
           artifactName: $(buildProductArtifactName)
           displayName: 'product build'
 
-    - ${{ if and(ne(parameters.osGroup, 'OSX'), ne(parameters.archType, 'x86'), ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, 'clrTools')) }}:
+    - ${{ if and(in(parameters.osGroup, 'Windows_NT', 'Linux'), ne(parameters.archType, 'x86'), ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, 'clrTools')) }}:
       - template: /eng/pipelines/coreclr/templates/crossdac-build.yml
         parameters:
           archType: ${{ parameters.archType }}
diff --git a/eng/pipelines/coreclr/templates/crossdac-build.yml b/eng/pipelines/coreclr/templates/crossdac-build.yml
index 16f16d3..152bc40 100644
--- a/eng/pipelines/coreclr/templates/crossdac-build.yml
+++ b/eng/pipelines/coreclr/templates/crossdac-build.yml
@@ -4,50 +4,49 @@ parameters:
   osSubgroup: ''
 
 steps:
-    # Always build the crossdac, that way we know in CI/PR if things break to build.
-    - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
-      - ${{ if notin(parameters.archType, 'x86') }}:
-        - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -linuxdac $(officialBuildIdArg)
-          displayName: Build Cross OS Linux DAC for Windows
+  # Always build the crossdac, that way we know in CI/PR if things break to build.
+  - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
+    - ${{ if notin(parameters.archType, 'x86') }}:
+      - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -linuxdac $(officialBuildIdArg)
+        displayName: Build Cross OS Linux DAC for Windows
 
 
-    # Make the assets available in a single container for the packaging job.
-    - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-      - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
-        - ${{ if notin(parameters.archType, 'x86', 'arm') }}:
-          - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -alpinedac $(officialBuildIdArg)
-            displayName: Build Cross OS Linux-musl DAC for Windows
+  - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
+    - ${{ if notin(parameters.archType, 'x86', 'arm') }}:
+      - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -alpinedac $(officialBuildIdArg)
+        displayName: Build Cross OS Linux-musl DAC for Windows
 
-        - task: CopyFiles@2
-          displayName: Gather CrossDac Artifacts (Linux)
-          inputs:
-            SourceFolder: $(buildLinuxDacRootFolderPath)
-            Contents: |
-              **/*
-              !**/sharedFramework/**/*
-            TargetFolder: $(buildLinuxDacStagingPath)
+    - task: CopyFiles@2
+      displayName: Gather CrossDac Artifacts (Linux)
+      inputs:
+        SourceFolder: $(buildLinuxDacRootFolderPath)
+        Contents: |
+          **/*
+          !**/sharedFramework/**/*
+        TargetFolder: $(buildLinuxDacStagingPath)
 
-        - ${{ if ne(parameters.archType, 'arm') }}:
-          - task: CopyFiles@2
-            displayName: Gather CrossDac Artifacts (Linux_musl)
-            inputs:
-              SourceFolder: $(buildMuslDacRootFolderPath)
-              Contents: |
-                **/*
-                !**/sharedFramework/**/*
-              TargetFolder: '$(buildMuslDacStagingPath)'
+    - ${{ if ne(parameters.archType, 'arm') }}:
+      - task: CopyFiles@2
+        displayName: Gather CrossDac Artifacts (Linux_musl)
+        inputs:
+          SourceFolder: $(buildMuslDacRootFolderPath)
+          Contents: |
+            **/*
+            !**/sharedFramework/**/*
+          TargetFolder: '$(buildMuslDacStagingPath)'
 
-      - ${{ if eq(parameters.osGroup, 'Linux') }}:
-        - task: CopyFiles@2
-          displayName: Gather runtime for CrossDac
-          inputs:
-            SourceFolder: $(coreClrProductRootFolderPath)
-            Contents: libcoreclr.so
-            TargetFolder: '$(crossDacArtifactPath)/${{ parameters.osGroup }}${{ parameters.osSubgroup }}.$(archType).$(buildConfigUpper)/$(crossDacHostArch)'
+  - ${{ if eq(parameters.osGroup, 'Linux') }}:
+    - task: CopyFiles@2
+      displayName: Gather runtime for CrossDac
+      inputs:
+        SourceFolder: $(coreClrProductRootFolderPath)
+        Contents: libcoreclr.so
+        TargetFolder: '$(crossDacArtifactPath)/${{ parameters.osGroup }}${{ parameters.osSubgroup }}.$(archType).$(buildConfigUpper)/$(crossDacHostArch)'
 
-      - task: PublishBuildArtifacts@1
-        displayName: Publish runtime for CrossDac
-        inputs:
-          pathtoPublish:  $(crossDacArtifactPath)
-          PublishLocation: Container
-          artifactName:  $(buildCrossDacArtifactName)
+  # Make the assets available in a single container for the packaging job.
+  - task: PublishBuildArtifacts@1
+    displayName: Publish runtime for CrossDac
+    inputs:
+      pathtoPublish:  $(crossDacArtifactPath)
+      PublishLocation: Container
+      artifactName:  $(buildCrossDacArtifactName)
-- 
2.7.4