Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align the worker package to Sql package #925

Merged
merged 3 commits into from
Sep 26, 2023
Merged

Align the worker package to Sql package #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4efe446
remove the range & align the worker-sql packages
MaddyDev Sep 21, 2023
95c3420
use binariesVersion
MaddyDev Sep 21, 2023
d598384
rename SupportedVersion
MaddyDev Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Worker.Extensions.Sql/src/Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
2 changes: 1 addition & 1 deletion builds/azure-pipelines/build-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ stages:
configuration: '$(configuration)'
nugetVersion: '99.99.99-test'
binariesVersion: '99.99.99'
supportedVersion: '99.99.99'
oopWorkerSupportedExtensionVersion: '99.99.99'
6 changes: 3 additions & 3 deletions builds/azure-pipelines/build-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -67,7 +67,7 @@ stages:
configuration: '$(configuration)'
nugetVersion: '$(nugetVersion)'
binariesVersion: '$(binariesVersion)'
supportedVersion: '$(supportedVersion)'
oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'

- job: BuildTestPublishLinux
displayName: 'Build, Test and Publish on linux'
Expand All @@ -87,7 +87,7 @@ stages:
configuration: '$(configuration)'
nugetVersion: '$(nugetVersion)'
binariesVersion: '$(binariesVersion)'
supportedVersion: '$(supportedVersion)'
oopWorkerSupportedExtensionVersion: '$(oopWorkerSupportedExtensionVersion)'
testServer: ''

- template: 'template-steps-publish.yml'
Expand Down
6 changes: 3 additions & 3 deletions builds/azure-pipelines/template-steps-build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
nugetVersion: ''
binariesVersion: ''
testServer: ''
supportedVersion: ''
oopWorkerSupportedExtensionVersion: ''

steps:
- task: UseDotNet@2
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down