Align the worker package to Sql package (#925)

* remove the range & align the worker-sql packages * use binariesVersion * rename SupportedVersion
Azure · Sep 26, 2023 · d8e9703 · d8e9703
1 parent b4d89e0
commit d8e9703
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Worker.Extensions.Sql/src/Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj b/Worker.Extensions.Sql/src/Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj
@@ -7,7 +7,7 @@
 		<Product>SQL Binding Worker</Product>
 		<!-- Default Version for dev -->
 		<Version>99.99.99</Version>
-		<SupportedVersion>99.99.99</SupportedVersion>
+		<OOPWorkerSupportedExtensionVersion>99.99.99</OOPWorkerSupportedExtensionVersion>
 		<PackageId>Microsoft.Azure.Functions.Worker.Extensions.Sql</PackageId>
 		<PackageTags>Microsoft Azure WebJobs AzureFunctions Isolated DotnetIsolated SQL AzureSQL Worker</PackageTags>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
@@ -34,7 +34,7 @@
 	<ItemGroup>
 		<AssemblyAttribute Include="Microsoft.Azure.Functions.Worker.Extensions.Abstractions.ExtensionInformationAttribute">
 			<_Parameter1>Microsoft.Azure.WebJobs.Extensions.Sql</_Parameter1>
-			<_Parameter2>$(SupportedVersion)</_Parameter2>
+			<_Parameter2>$(OOPWorkerSupportedExtensionVersion)</_Parameter2>
 		</AssemblyAttribute>
 	</ItemGroup>
 </Project>
diff --git a/builds/azure-pipelines/build-pr.yml b/builds/azure-pipelines/build-pr.yml
@@ -46,4 +46,4 @@ stages:
         configuration: '$(configuration)'
         nugetVersion: '99.99.99-test'
         binariesVersion: '99.99.99'
-        supportedVersion: '99.99.99'
+        oopWorkerSupportedExtensionVersion: '99.99.99'
diff --git a/builds/azure-pipelines/build-release.yml b/builds/azure-pipelines/build-release.yml
@@ -28,7 +28,7 @@ variables:
   versionPatch: $[counter(variables['versionMajorMinor'], 0)] # This will reset when we bump minor version
   binariesVersion: '$(versionMajor).$(versionMinor).$(versionPatch)'
   nugetVersion: $[replace(replace('True', eq('${{ parameters.ReleaseType }}', 'full'), '$(binariesVersion)'),'True','$(binariesVersion)-preview')] # This will set the preview tag to the version based on the ReleaseType parameter.
-  supportedVersion: $[replace(replace('True', eq('${{ parameters.ReleaseType }}', 'full'), '$(versionMajor).*'),'True','$(versionMajor).*-*')] # This will set the expression to pull the preview vs full version based on the ReleaseType parameter.
+  oopWorkerSupportedExtensionVersion: $[replace(replace('True', eq('${{ parameters.ReleaseType }}', 'full'), '$(binariesVersion)'),'True','$(binariesVersion)-preview')] # This will set the expression to pull the preview vs full version based on the ReleaseType parameter.
   LGTM.UploadSnapshot: true
   Semmle.SkipAnalysis: true
 
@@ -67,7 +67,7 @@ stages:
           configuration: '$(configuration)'
           nugetVersion: '$(nugetVersion)'
           binariesVersion: '$(binariesVersion)'
-          supportedVersion: '$(supportedVersion)'
+          oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
 
   - job: BuildTestPublishLinux
     displayName: 'Build, Test and Publish on linux'
@@ -87,7 +87,7 @@ stages:
           configuration: '$(configuration)'
           nugetVersion: '$(nugetVersion)'
           binariesVersion: '$(binariesVersion)'
-          supportedVersion: '$(supportedVersion)'
+          oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
           testServer: ''
 
       - template: 'template-steps-publish.yml'

diff --git a/builds/azure-pipelines/template-steps-build-test.yml b/builds/azure-pipelines/template-steps-build-test.yml
@@ -4,7 +4,7 @@ parameters:
   nugetVersion: ''
   binariesVersion: ''
   testServer: ''
-  supportedVersion: ''
+  oopWorkerSupportedExtensionVersion: ''
 
 steps:
 - task: UseDotNet@2
@@ -92,7 +92,7 @@ steps:
   inputs:
     command: build
     projects: ${{ parameters.solution }}
-    arguments: --configuration ${{ parameters.configuration }} -p:Version=${{ parameters.binariesVersion }} -p:SupportedVersion=${{ parameters.binariesVersion }}
+    arguments: --configuration ${{ parameters.configuration }} -p:Version=${{ parameters.binariesVersion }} -p:OOPWorkerSupportedExtensionVersion=${{ parameters.binariesVersion }}
 
 - task: CopyFiles@2
   displayName: 'Copy Sql extension dll to Azure Functions extension bundle'
@@ -224,7 +224,7 @@ steps:
   inputs:
     command: build
     projects: '${{ parameters.solution }}'
-    arguments: '--configuration ${{ parameters.configuration }} -p:GeneratePackageOnBuild=false -p:Version=${{ parameters.binariesVersion }} -p:SupportedVersion=${{ parameters.supportedVersion }}'
+    arguments: '--configuration ${{ parameters.configuration }} -p:GeneratePackageOnBuild=false -p:Version=${{ parameters.binariesVersion }} -p:OOPWorkerSupportedExtensionVersion=${{ parameters.oopWorkerSupportedExtensionVersion }}'
 
 # 5.0 isn't supported on Mac yet
 - task: UseDotNet@2