(build) improved the build steps for stages 3-6

Author: arturcic

build/stages/build.yml

@@ -1,5 +1,5 @@
 steps:
-- template: common-steps.yml
+- template: common-build-steps.yml
 - task: UseRubyVersion@0
   condition: ne( variables['Agent.OS'], 'Darwin' )
   displayName: 'Use .Ruby >= 2.5'

build/stages/common-build-steps.yml

@@ -0,0 +1,35 @@
+steps:
+- task: Cache@2
+  inputs:
+    key: 'tools | "$(Agent.OS)" | build.cake'
+    path: tools
+  displayName: Cache Cake tools
+- task: UseDotNet@2
+  displayName: 'Use .NET Core sdk 2.1'
+  inputs:
+    packageType: sdk
+    version: 2.1.802
+- task: UseDotNet@2
+  displayName: 'Use .NET Core sdk 3.1'
+  inputs:
+    packageType: sdk
+    version: 3.1.100
+- task: Bash@3
+  displayName: 'Env Vars'
+  inputs:
+    targetType: 'inline'
+    script: 'env | sort'
+- task: CmdLine@2
+  condition: eq( variables['Agent.OS'], 'Darwin' )
+  displayName: 'Use mono'
+  inputs:
+    script: |
+      SYMLINK=6.4.0
+      MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
+      echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
+      echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
+      echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
+      sudo rm /Library/Frameworks/Mono.framework/Versions/Current
+      sudo ln -s $MONOPREFIX /Library/Frameworks/Mono.framework/Versions/Current
+- script: dotnet tool install --global Cake.Tool
+  displayName: 'Install Cake tool'

build/stages/common-steps.yml

@@ -4,32 +4,10 @@ steps:
     key: 'tools | "$(Agent.OS)" | build.cake'
     path: tools
   displayName: Cache Cake tools
-- task: UseDotNet@2
-  displayName: 'Use .NET Core sdk 2.1'
-  inputs:
-    packageType: sdk
-    version: 2.1.802
 - task: UseDotNet@2
   displayName: 'Use .NET Core sdk 3.1'
   inputs:
     packageType: sdk
     version: 3.1.100
-- task: Bash@3
-  displayName: 'Env Vars'
-  inputs:
-    targetType: 'inline'
-    script: 'env | sort'
-- task: CmdLine@2
-  condition: eq( variables['Agent.OS'], 'Darwin' )
-  displayName: 'Use mono'
-  inputs:
-    script: |
-      SYMLINK=6.4.0
-      MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
-      echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
-      echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
-      echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
-      sudo rm /Library/Frameworks/Mono.framework/Versions/Current
-      sudo ln -s $MONOPREFIX /Library/Frameworks/Mono.framework/Versions/Current
 - script: dotnet tool install --global Cake.Tool
   displayName: 'Install Cake tool'

build/stages/test.yml

@@ -1,5 +1,5 @@
 steps:
-- template: common-steps.yml
+- template: common-build-steps.yml
 - script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Test
   displayName: '[Run Test]'
   env: