Use build/install-sdk.yml for all templates (#1228)

tomkerkhove · Aug 19, 2020 · 9767116 · 9767116
1 parent 100e3ce
commit 9767116
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/build/azure-devops/templates/quality/run-code-quality.yml b/build/azure-devops/templates/quality/run-code-quality.yml
@@ -3,11 +3,9 @@ parameters:
   type: string
 
 steps:
-- task: UseDotNet@2
-  displayName: 'Install .Net Core Sdk (${{ parameters.dotnetVersion }})'
-  inputs:
-    packageType: 'sdk'
-    version: '${{ parameters.dotnetVersion }}'
+- template: ./../../build/install-sdk.yml
+  parameters:
+    dotnetVersion: '${{ parameters.dotnetVersion }}'
 - task: DotNetCoreCLI@2
   displayName: 'Restore NuGet Packages'
   inputs:
@@ -18,4 +16,4 @@ steps:
   inputs:
     solutionOrProjectPath: 'src/Promitor.sln'
     failBuildLevelSelector: 'Warning'
-    commandLineInterfacePath: '$(Build.SourcesDirectory)/Lib/Resharper'
+    commandLineInterfacePath: '$(Build.SourcesDirectory)/Lib/Resharper'
diff --git a/build/azure-devops/templates/tests/run-integration-tests.yml b/build/azure-devops/templates/tests/run-integration-tests.yml
@@ -7,11 +7,9 @@ parameters:
   type: string
 
 steps:
-- task: UseDotNet@2
-  displayName: 'Install .Net Core Sdk (${{ parameters.dotnetVersion }})'
-  inputs:
-    packageType: 'sdk'
-    version: '${{ parameters.dotnetVersion }}'
+- template: ./../../build/install-sdk.yml
+  parameters:
+    dotnetVersion: '${{ parameters.dotnetVersion }}'
 - task: replacetokens@3
   displayName: Replace Tokens in Integration Test Configuration (${{ parameters.agentName }} Agent)
   inputs:
@@ -29,4 +27,4 @@ steps:
   inputs:
     command: test
     projects: 'src/Promitor.Tests.Integration/Promitor.Tests.Integration.csproj'
-    arguments: '--configuration ${{ parameters.buildConfiguration }} --filter "Agent=${{ parameters.agentName}}"'
+    arguments: '--configuration ${{ parameters.buildConfiguration }} --filter "Agent=${{ parameters.agentName}}"'
diff --git a/build/azure-devops/templates/tests/run-unit-tests.yml b/build/azure-devops/templates/tests/run-unit-tests.yml
@@ -5,14 +5,12 @@ parameters:
   type: string
 
 steps:
-- task: UseDotNet@2
-  displayName: 'Install .Net Core Sdk (${{ parameters.dotnetVersion }})'
-  inputs:
-    packageType: 'sdk'
-    version: '${{ parameters.dotnetVersion }}'
+- template: ./../../build/install-sdk.yml
+  parameters:
+    dotnetVersion: '${{ parameters.dotnetVersion }}'
 - task: DotNetCoreCLI@2
   displayName: 'dotnet test'
   inputs:
     command: test
     projects: 'src/Promitor.Tests.Unit/Promitor.Tests.Unit.csproj'
-    arguments: '--configuration ${{ parameters.buildConfiguration }}'
+    arguments: '--configuration ${{ parameters.buildConfiguration }}'