Skip to content

Commit 3c40e8d

Browse files
authored
use AssemblyMetadata property in csproj file (Azure#621)
* remove assemblyInfo and use AssemblyAttribute * remove assemblyinfo file * update include * remove space and attribute from Target * add supportedVersion variable * add supportedVersion * add supportedVersion to build-pr
1 parent 13243ca commit 3c40e8d

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

Worker.Extensions.Sql/src/Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
<Product>SQL Binding Worker</Product>
88
<!--Version information-->
99
<VersionPrefix>99.99.99</VersionPrefix>
10+
<SupportedVersion>1.*-*</SupportedVersion>
1011
<PackageId>Microsoft.Azure.Functions.Worker.Extensions.Sql</PackageId>
1112
<PackageTags>Microsoft Azure WebJobs AzureFunctions Isolated DotnetIsolated SQL AzureSQL Worker</PackageTags>
1213
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
1314
<IsPackable>true</IsPackable>
14-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
15+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1516
</PropertyGroup>
1617

1718
<ItemGroup>
@@ -22,4 +23,10 @@
2223
<None Include=".\README.md" Pack="true" PackagePath="" />
2324
</ItemGroup>
2425

25-
</Project>
26+
<ItemGroup>
27+
<AssemblyAttribute Include="Microsoft.Azure.Functions.Worker.Extensions.Abstractions.ExtensionInformationAttribute">
28+
<_Parameter1>Microsoft.Azure.WebJobs.Extensions.Sql</_Parameter1>
29+
<_Parameter2>$(SupportedVersion)</_Parameter2>
30+
</AssemblyAttribute>
31+
</ItemGroup>
32+
</Project>

Worker.Extensions.Sql/src/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 6 deletions
This file was deleted.

builds/azure-pipelines/build-pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,5 @@ stages:
5050
configuration: '$(configuration)'
5151
nugetVersion: '1.0.0-test'
5252
binariesVersion: '1.0.0'
53-
testFilter: '$(testFilter)'
53+
testFilter: '$(testFilter)'
54+
supportedVersion: '1.*-*'

builds/azure-pipelines/build-release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ variables:
1919
versionPatch: $[counter(variables['versionMajorMinor'], 0)] # This will reset when we bump minor version
2020
binariesVersion: '$(versionMajor).$(versionMinor).$(versionPatch)'
2121
nugetVersion: '$(binariesVersion)-preview'
22+
supportedVersion: '$(versionMajor).*-*'
2223
LGTM.UploadSnapshot: true
2324
Semmle.SkipAnalysis: true
2425

@@ -60,6 +61,7 @@ stages:
6061
nugetVersion: '$(nugetVersion)'
6162
binariesVersion: '$(binariesVersion)'
6263
testFilter: '$(testFilter)'
64+
supportedVersion: '$(supportedVersion)'
6365

6466
- job: BuildTestPublishLinux
6567
displayName: 'Build, Test and Publish on linux'
@@ -79,6 +81,7 @@ stages:
7981
configuration: '$(configuration)'
8082
nugetVersion: '$(nugetVersion)'
8183
binariesVersion: '$(binariesVersion)'
84+
supportedVersion: '$(supportedVersion)'
8285
testFilter: ''
8386
testServer: ''
8487

builds/azure-pipelines/template-steps-build-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ parameters:
55
binariesVersion: ''
66
testFilter: ''
77
testServer: ''
8+
supportedVersion: ''
89

910
steps:
1011
- task: UseDotNet@2
@@ -80,7 +81,7 @@ steps:
8081
inputs:
8182
command: build
8283
projects: '${{ parameters.solution }}'
83-
arguments: '--configuration ${{ parameters.configuration }} -p:GeneratePackageOnBuild=false -p:Version=${{ parameters.binariesVersion }}'
84+
arguments: '--configuration ${{ parameters.configuration }} -p:GeneratePackageOnBuild=false -p:Version=${{ parameters.binariesVersion }} -p:SupportedVersion=${{ parameters.supportedVersion }}'
8485

8586
- task: CopyFiles@2
8687
displayName: 'Copy Sql extension dll to Azure Functions extension bundle'

0 commit comments

Comments
 (0)