Fix exception message and CI build timing (#4743)

microsoft · Dec 2, 2024 · bd101b1 · bd101b1
1 parent c4a33cc
commit bd101b1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/build/ci-pipeline.yml b/build/ci-pipeline.yml
@@ -82,6 +82,18 @@ stages:
     - template: ./jobs/build.yml
       parameters:
         targetBuildFramework: 'net6.0'
+
+- stage: BuildArtifacts
+  displayName: 'Build artifacts'
+  dependsOn:
+  - UpdateVersion
+  variables:
+    assemblySemVer: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.assemblySemVer']]
+    assemblySemFileVer: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.assemblySemFileVer']]
+    informationalVersion: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.informationalVersion']]
+    majorMinorPatch: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.majorMinorPatch']]
+    nuGetVersion: $[stageDependencies.UpdateVersion.Semver.outputs['SetVariablesFromGitVersion.nuGetVersion']]
+  jobs:
   - job: Linux_BuildAndPackage
     pool:
       name: '$(DefaultLinuxPool)'
@@ -99,6 +111,7 @@ stages:
   displayName: 'Run Security Analysis and Validate'
   dependsOn:
   - BuildUnitTests
+  - BuildArtifacts
   jobs:
   - job: Guardian
     pool:
@@ -147,7 +160,7 @@ stages:
 - stage: testStu3
   displayName: 'Run Stu3 Tests'
   dependsOn:
-  - BuildUnitTests
+  - BuildArtifacts
   - redeployStu3
   - redeployStu3Sql
   jobs:
@@ -186,7 +199,7 @@ stages:
 - stage: testR4
   displayName: 'Run R4 Tests'
   dependsOn:
-  - BuildUnitTests
+  - BuildArtifacts
   - redeployR4
   - redeployR4Sql
   jobs:
@@ -225,7 +238,7 @@ stages:
 - stage: testR4B
   displayName: 'Run R4B Tests'
   dependsOn:
-  - BuildUnitTests
+  - BuildArtifacts
   - redeployR4B
   - redeployR4BSql
   jobs:
@@ -264,7 +277,7 @@ stages:
 - stage: testR5
   displayName: 'Run R5 Tests'
   dependsOn:
-  - BuildUnitTests
+  - BuildArtifacts
   - redeployR5
   - redeployR5Sql
   jobs:

diff --git a/src/Microsoft.Health.Fhir.Core/Features/Search/Parameters/SearchParameterOperations.cs b/src/Microsoft.Health.Fhir.Core/Features/Search/Parameters/SearchParameterOperations.cs
@@ -78,7 +78,7 @@ public async Task AddSearchParameterAsync(ITypedElement searchParam, Cancellatio
 
                 if (!supportedResult.Supported)
                 {
-                    throw new SearchParameterNotSupportedException(searchParameterInfo.Url);
+                    throw new SearchParameterNotSupportedException(string.Format(Core.Resources.NoConverterForSearchParamType, searchParameterInfo.Type, searchParameterInfo.Expression));
                 }
 
                 // check data store specific support for SearchParameter

diff --git a/src/Microsoft.Health.Fhir.Core/Resources.Designer.cs b/src/Microsoft.Health.Fhir.Core/Resources.Designer.cs
diff --git a/src/Microsoft.Health.Fhir.Core/Resources.resx b/src/Microsoft.Health.Fhir.Core/Resources.resx
@@ -750,4 +750,8 @@
   <data name="OperationFailedWithErrorFile" xml:space="preserve">
     <value>{0} operation failed for reason: {1} ErrorFile: {2}</value>
   </data>
-</root>
+  <data name="NoConverterForSearchParamType" xml:space="preserve">
+    <value>The provided search parameter type {0} is not supported for the given expression {1}.</value>
+    <comment>{0}: The type field in the search parameter. {1}: The expression field in the search parameter.</comment>
+  </data>
+</root>