update to minimal yml

hmcts · May 2, 2024 · d15102b · d15102b
1 parent a2df84c
commit d15102b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/azure-pipelines.sds.master-release.yml b/azure-pipelines.sds.master-release.yml
@@ -36,6 +36,7 @@ stages:
     steps:
     - template: templates/Database/EntityFramework/generate-script.yaml@azTemplates
       parameters:
+        efVersion: ${{ variables.efDotnetToolVersion }}
         outputPath: $(Build.StagingDirectory)
         contextName: ${{ variables.efContextName }}
         workingPath: $(System.DefaultWorkingDirectory)/${{ variables.appName }}/${{ variables.appName }}

diff --git a/azure-pipelines.sds.pr-release.yml b/azure-pipelines.sds.pr-release.yml
@@ -5,7 +5,7 @@ resources:
     - repository: azTemplates
       type: github
       name: hmcts/azure-devops-templates
-      ref: upgrade-dotnet-default
+      ref: fix-vh-templates-for-dotnet-8
       endpoint: hmcts
 
 trigger: none
@@ -42,6 +42,7 @@ stages:
 
           - template: templates/dotnet/build-test-analyse.yml@azTemplates
             parameters:
+              dotnetVersion: ${{ variables.dotnetVersion }}
               nugetConfigPath: nuget.config
               appName: ${{ variables.appName }}
               dockerComposeTestFile: docker-compose.tests.yml
@@ -63,6 +64,7 @@ stages:
         steps:
           - template: templates/Database/EntityFramework/generate-script.yaml@azTemplates
             parameters:
+              efVersion: ${{ variables.efDotnetToolVersion }}
               outputPath: $(Build.StagingDirectory)
               contextName: ${{ variables.efContextName }}
               workingPath: $(System.DefaultWorkingDirectory)/${{ variables.appName }}/${{ variables.appName }}
@@ -86,6 +88,7 @@ stages:
         steps:
           - template: templates\dotnet\publish-acceptance-tests.yml@azTemplates
             parameters:
+              netVersion: ${{ variables.dotnetVersion }}
               vstsFeedId: "${{ variables.nuget_org_name }}/${{ variables.nuget_feed_name }}"
               coreProjectPath: $(projectPath)
 
@@ -269,6 +272,7 @@ stages:
         steps:
           - template: templates/dotnet/run-acceptance-tests.yml@azTemplates
             parameters:
+              netVersion: ${{ variables.dotnetVersion }}
               environment: ${{ variables.env }}
               azureSubscription: ${{ variables.subscriptionName }}
               acceptanceTestSettings:

diff --git a/azure-pipelines.sds.release.yml b/azure-pipelines.sds.release.yml
@@ -29,6 +29,7 @@ stages:
         steps:
           - template: templates/Database/EntityFramework/generate-script.yaml@azTemplates
             parameters:
+              efVersion: ${{ variables.efDotnetToolVersion }}
               outputPath: $(Build.StagingDirectory)
               contextName: ${{ variables.efContextName }}
               workingPath: $(System.DefaultWorkingDirectory)/${{ variables.appName }}/${{ variables.appName }}
@@ -42,6 +43,7 @@ stages:
         steps:
           - template: templates\dotnet\publish-acceptance-tests.yml@azTemplates
             parameters:
+              netVersion: ${{ variables.dotnetVersion }}
               vstsFeedId: "${{ variables.nuget_org_name }}/${{ variables.nuget_feed_name }}"
               coreProjectPath: $(projectPath)
 
@@ -180,6 +182,7 @@ stages:
         steps:
           - template: templates/dotnet/run-acceptance-tests.yml@azTemplates
             parameters:
+              netVersion: ${{ variables.dotnetVersion }}
               environment: ${{ variables.env }}
               azureSubscription: ${{ variables.subscriptionName }}
               acceptanceTestSettings:

diff --git a/variables/shared.yaml b/variables/shared.yaml
@@ -84,3 +84,8 @@ variables:
     value: "vh-infra-core-${{ parameters.env }}-sql-username"
   - name: vhSqlPasswordSecret
     value: "vh-infra-core-${{ parameters.env }}-sql-password"
+
+  - name: dotnetVersion
+    value: '8.x'
+  - name: efDotnetToolVersion
+    value: '8.0.4'