-
Notifications
You must be signed in to change notification settings - Fork 322
Remove OneBranchType parameter and use Official type only #3913
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.
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
Open
cheenamalhotra
wants to merge
4
commits into
main
Choose a base branch
from
dev/cheena/fix-onebranch-templates
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+292
−24
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ab2c497
Remove OneBranchType parameter and use Official type only
cheenamalhotra 9668c06
Add nonofficial pipelines
cheenamalhotra 83ab81e
Merge branch 'main' into dev/cheena/fix-onebranch-templates
cheenamalhotra 23c4b58
Rename official pipeline
cheenamalhotra File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| ################################################################################# | ||
| # Licensed to the .NET Foundation under one or more agreements. # | ||
| # The .NET Foundation licenses this file to you under the MIT license. # | ||
| # See the LICENSE file in the project root for more information. # | ||
| ################################################################################# | ||
|
|
||
| name: $(Year:YY)$(DayOfYear)$(Rev:.r) | ||
|
|
||
| parameters: | ||
| - name: buildConfiguration | ||
| displayName: 'Build configuration' | ||
| type: 'string' | ||
| values: | ||
| - 'Release' | ||
| - 'Debug' | ||
| default: 'Release' | ||
|
|
||
| - name: publishSymbols | ||
| displayName: 'Publish symbols' | ||
| type: 'boolean' | ||
| default: false | ||
|
|
||
| - name: runSdlTasks | ||
| displayName: 'Run SDL Tasks' | ||
| type: 'boolean' | ||
| default: true | ||
|
|
||
| variables: | ||
| - template: /eng/pipelines/variables/common-variables.yml@self | ||
| - template: /eng/pipelines/variables/onebranch-variables.yml@self | ||
| - template: /eng/pipelines/variables/esrp-signing-variables.yml@self | ||
| - template: /eng/pipelines/variables/akv-official-variables.yml@self | ||
|
|
||
| resources: | ||
| repositories: | ||
| - repository: templates | ||
| type: 'git' | ||
| name: 'OneBranch.Pipelines/GovernedTemplates' | ||
| ref: 'refs/heads/main' | ||
|
|
||
| extends: | ||
| template: 'v2/OneBranch.NonOfficial.CrossPlat.yml@templates' | ||
|
|
||
| parameters: | ||
| featureFlags: | ||
| WindowsHostVersion: | ||
| Version: '2022' | ||
|
|
||
| globalSdl: | ||
| # See https://aka.ms/obpipelines/sdl | ||
|
|
||
| apiscan: | ||
| enabled: ${{ parameters.runSdlTasks }} | ||
| softwareFolder: '${{ variables.apiScanDllPath }}' | ||
| softwareName: 'Microsoft.Data.SqlClient' # Note: This name is registered with ApiScan | ||
| softwareVersionNum: '${{ variables.assemblyFileVersion }}' | ||
| symbolsFolder: '${{ variables.apiScanPdbPath }}' | ||
|
|
||
| armory: | ||
| enabled: ${{ parameters.runSdlTasks }} | ||
| break: true | ||
|
|
||
| asyncSdl: | ||
| # If this should be enabled, move supported tools under this item, | ||
| # see https://aka.ms/obpipelines/asyncsdl | ||
| enabled: false | ||
|
|
||
| binskim: | ||
| enabled: ${{ parameters.runSdlTasks }} | ||
| break: true | ||
|
|
||
| codeinspector: | ||
| enabled: ${{ parameters.runSdlTasks }} | ||
| logLevel: Error | ||
|
|
||
| codeql: | ||
| enabled: ${{ parameters.runSdlTasks }} | ||
| sourceRoot: '$(REPO_ROOT)/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider' | ||
| # Note, this can only be done if project doesn't depend on other projects. In | ||
| # package reference mode, this is true, but if we ever enable project reference | ||
| # builds, this will have to be removed. | ||
|
|
||
| credscan: | ||
| enabled: ${{ parameters.runSdlTasks }} | ||
| suppressionsFile: '$(REPO_ROOT)/.config/CredScanSuppressions.json' | ||
|
|
||
| eslint: | ||
| enabled: false | ||
|
|
||
| policheck: | ||
| enabled: ${{ parameters.runSdlTasks }} | ||
| break: true | ||
| exclusionFile: '$(REPO_ROOT)/.config/PolicheckExclusions.xml' | ||
|
|
||
| roslyn: | ||
| enabled: ${{ parameters.runSdlTasks }} | ||
| break: true | ||
| # Requires RoslynAnalyzers task to be added after build task | ||
|
|
||
| publishLogs: | ||
| enabled: ${{ parameters.runSdlTasks }} | ||
|
|
||
| sbom: | ||
| enabled: ${{ parameters.runSdlTasks }} | ||
| packageName: 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider' | ||
| packageVersion: ${{ variables.nugetPackageVersion }} | ||
|
|
||
| tsa: | ||
| # OneBranch publishes all sdl results to TSA. If TSA is disabled all SDL tools will | ||
| # be forced into 'break' build mode. | ||
| enabled: true | ||
| configFile: '$(REPO_ROOT)/.config/tsaoptions.json' | ||
|
|
||
| stages: | ||
| - stage: BuildAkv | ||
| displayName: 'Build AKV' | ||
| jobs: | ||
| - template: /eng/pipelines/jobs/build-akv-official-job.yml@self | ||
| parameters: | ||
| apiScanDllPath: '${{ variables.apiScanDllPath }}' | ||
| apiScanPdbPath: '${{ variables.apiScanPdbPath }}' | ||
| assemblyFileVersion: '${{ variables.assemblyFileVersion }}' | ||
| buildConfiguration: '${{ parameters.buildConfiguration }}' | ||
| nugetPackageVersion: '${{ variables.nugetPackageVersion }}' | ||
| mdsPackageVersion: '${{ variables.mdsPackageVersion }}' | ||
| publishSymbols: '${{ parameters.publishSymbols }}' | ||
| signingAppRegistrationClientId: '$(SigningAppRegistrationClientId)' | ||
| signingAppRegistrationTenantId: '$(SigningAppRegistrationTenantId)' | ||
| signingAuthAkvName: '$(SigningAuthAkvName)' | ||
| signingAuthSignCertName: '$(SigningAuthSignCertName)' | ||
| signingEsrpClientId: '$(SigningEsrpClientId)' | ||
| signingEsrpConnectedServiceName: '$(SigningEsrpConnectedServiceName)' | ||
| symbolsAzureSubscription: '$(SymbolsAzureSubscription)' | ||
| symbolsPublishProjectName: '$(SymbolsPublishProjectName)' | ||
| symbolsPublishServer: '$(SymbolsPublishServer)' | ||
| symbolsPublishTokenUri: '$(SymbolsPublishTokenUri)' | ||
| symbolsUploadAccount: '$(SymbolsUploadAccount)' | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
151 changes: 151 additions & 0 deletions
151
eng/pipelines/dotnet-sqlclient-non-official-pipeline.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| ################################################################################# | ||
| # Licensed to the .NET Foundation under one or more agreements. # | ||
| # The .NET Foundation licenses this file to you under the MIT license. # | ||
| # See the LICENSE file in the project root for more information. # | ||
| ################################################################################# | ||
cheenamalhotra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| name: $(Year:YY)$(DayOfYear)$(Rev:.r) | ||
| trigger: | ||
| branches: | ||
| include: | ||
| - internal/main | ||
| paths: | ||
| include: | ||
| - .azuredevops | ||
| - .config | ||
| - doc | ||
| - eng/pipelines | ||
| - src | ||
| - tools | ||
| - azurepipelines-coverage.yml | ||
| - build.proj | ||
| - NuGet.config | ||
|
|
||
| parameters: # parameters are shown up in ADO UI in a build queue time | ||
| - name: 'debug' | ||
| displayName: 'Enable debug output' | ||
| type: boolean | ||
| default: false | ||
|
|
||
| - name: publishSymbols | ||
| displayName: 'Publish symbols' | ||
| type: boolean | ||
| default: false | ||
|
|
||
| - name: CurrentNetFxVersion | ||
| displayName: 'Lowest supported .NET Framework version (MDS validation)' | ||
| type: string | ||
| default: 'net462' | ||
|
|
||
| - name: isPreview | ||
| displayName: 'Is this a preview build?' | ||
| type: boolean | ||
| default: false | ||
|
|
||
| # The timeout, in minutes, for each test job. | ||
| - name: testJobTimeout | ||
| displayName: 'Test job timeout (in minutes)' | ||
| type: number | ||
| default: 60 | ||
|
|
||
| variables: | ||
| - template: /eng/pipelines/libraries/variables.yml@self | ||
| - name: packageFolderName | ||
| value: drop_buildMDS_build_signed_package | ||
| - name: PublishSymbols | ||
| value: ${{ parameters['publishSymbols'] }} | ||
| - name: CurrentNetFxVersion | ||
| value: ${{ parameters['CurrentNetFxVersion'] }} | ||
|
|
||
| resources: | ||
| repositories: | ||
| - repository: templates | ||
| type: git | ||
| name: OneBranch.Pipelines/GovernedTemplates | ||
| ref: refs/heads/main | ||
|
|
||
| extends: | ||
| template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates | ||
cheenamalhotra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| parameters: | ||
| featureFlags: | ||
| # Suggested by MerlinBot (https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient/pullrequest/4882) | ||
| EnableCDPxPAT: false | ||
| WindowsHostVersion: 1ESWindows2022 | ||
| globalSdl: # https://aka.ms/obpipelines/sdl | ||
| tsa: | ||
| # The OneBranch template will set 'break' to false for the other SDL | ||
| # tools when TSA is enabled. This allows TSA to gather the results | ||
| # and publish them for downstream analysis. | ||
| enabled: true | ||
| apiscan: | ||
| enabled: true | ||
| softwareFolder: $(softwareFolder) | ||
| symbolsFolder: $(symbolsFolder) | ||
| softwarename: Microsoft.Data.SqlClient | ||
| versionNumber: $(AssemblyFileVersion) | ||
| codeql: | ||
| compiled: | ||
| enabled: ${{ not(parameters['isPreview']) }} | ||
| sbom: | ||
| enabled: ${{ not(parameters['isPreview']) }} | ||
| packageName: Microsoft.Data.SqlClient | ||
| packageVersion: $(NugetPackageVersion) | ||
| policheck: | ||
| enabled: ${{ not(parameters['isPreview']) }} | ||
| break: true # always break the build on policheck issues. You can disable it by setting to 'false' | ||
| exclusionsFile: $(REPOROOT)\.config\PolicheckExclusions.xml | ||
| asyncSdl: | ||
| enabled: false | ||
| credscan: | ||
| enabled: ${{ not(parameters['isPreview']) }} | ||
| suppressionsFile: $(REPOROOT)/.config/CredScanSuppressions.json | ||
| binskim: | ||
| enabled: ${{ not(parameters['isPreview']) }} | ||
| armory: | ||
| enabled: ${{ not(parameters['isPreview']) }} | ||
| break: true | ||
| eslint: # TypeScript and JavaScript | ||
| enabled: false | ||
| roslyn: | ||
| enabled: ${{ not(parameters['isPreview']) }} | ||
| break: true | ||
| publishLogs: | ||
| enabled: ${{ not(parameters['isPreview']) }} | ||
| tsaOptionsPath: $(REPOROOT)\.config\tsaoptions.json | ||
| disableLegacyManifest: true | ||
| stages: | ||
| - stage: buildMDS | ||
| displayName: 'Build MDS' | ||
| jobs: | ||
| - template: eng/pipelines/common/templates/jobs/build-signed-package-job.yml@self | ||
| parameters: | ||
| symbolsFolder: $(symbolsFolder) | ||
cheenamalhotra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| softwareFolder: $(softwareFolder) | ||
| publishSymbols: ${{ parameters['publishSymbols'] }} | ||
| isPreview: ${{ parameters['isPreview'] }} | ||
|
|
||
| - stage: mds_package_validation | ||
| displayName: 'MDS Package Validation' | ||
| dependsOn: buildMDS | ||
| jobs: | ||
| - template: eng/pipelines/common/templates/jobs/validate-signed-package-job.yml@self | ||
| parameters: | ||
| packageFolderName: $(packageFolderName) | ||
cheenamalhotra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| isPreview: ${{ parameters['isPreview'] }} | ||
| downloadPackageStep: | ||
| download: current | ||
| artifact: $(packageFolderName) | ||
| patterns: '**/*.*nupkg' | ||
| displayName: 'Download NuGet Package' | ||
|
|
||
| # Disabling as of 10/15/2025 due to OneBranch apparently disallowing MSBuild tasks in validation stages. | ||
| # - template: eng/pipelines/common/templates/jobs/run-tests-package-reference-job.yml@self | ||
| # parameters: | ||
| # packageFolderName: $(packageFolderName) | ||
| # isPreview: ${{ parameters['isPreview'] }} | ||
| # timeout: ${{ parameters.testJobTimeout }} | ||
| # downloadPackageStep: | ||
| # download: current | ||
| # artifact: $(packageFolderName) | ||
| # patterns: '**/*.nupkg' | ||
| # displayName: 'Download NuGet Package' | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.