Skip to content

Commit 7def235

Browse files
Merged PR 4490: eng | Remove netstandard from production pipeline
- Complementary code change of PR [#2386](#2386). - This should be merged after merging the related PR to remove support of .NET Standard in the production pipeline. - The first commit has the related PR's changes(review them on GH). - After having merged the related GH PR and updating the CI pipeline, I'll sync with this PR to unify the changes and get passed the pipeline. - Only the YAML changes under the `eng` folder should be reviewed (ignore the other changes as they are identical to the GH). - Introduced `oneBranchType` parameter to switch between **Official** and **NonOfficial** templates - [new sample run](https://dev.azure.com/SqlClientDrivers/ADO.Net/_build/results?buildId=86908&view=results) Related work items: #30122
1 parent ba288ef commit 7def235

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

eng/pipelines/common/templates/jobs/validate-signed-package-job.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
displayName: 'Check expected folder names'
116116
117117
- powershell: |
118-
# Checks the version of DotNetFramework, NetStandard and NetCore
118+
# Checks the version of DotNetFramework and DotNet
119119
$countErr = 0
120120
$countPass = 0
121121
$excludNamesFromRuntimeFolder = 'lib','win','unix'
@@ -260,11 +260,11 @@ jobs:
260260
261261
if($pVersion.FileVersion -eq '${{parameters.assembly_file_version_core}}')
262262
{
263-
Write-Host 'Correct File version Detected for netcore and netstandard,' $pVersion.FileVersion -ForegroundColor Green
263+
Write-Host 'Correct File version Detected for netcore,' $pVersion.FileVersion -ForegroundColor Green
264264
}
265265
else
266266
{
267-
Write-Host 'Wrong File version Detected for netcore and netstandard and ref folder of netfx,' $pVersion.FileVersion -ForegroundColor Red
267+
Write-Host 'Wrong File version Detected for netcore and ref folder,' $pVersion.FileVersion -ForegroundColor Red
268268
Exit -1
269269
}
270270
}

eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ steps:
3939
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
4040

4141
- ${{ if eq(parameters.product, 'AKV') }}:
42-
- task: MSBuild@1
43-
displayName: 'BuildAKVNetStAllOS using build.proj'
44-
inputs:
45-
solution: '**/build.proj'
46-
configuration: '$(Configuration)'
47-
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetStAllOS -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
48-
4942
- task: MSBuild@1
5043
displayName: 'BuildAKVNetFx using build.proj'
5144
inputs:

eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ parameters:
2828
- net462
2929
- net6.0
3030
- net8.0
31-
- netstandard2.0
32-
- netstandard2.1
3331

3432
- name: product
3533
default: MDS

eng/pipelines/dotnet-sqlclient-signing-pipeline.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ parameters: # parameters are shown up in ADO UI in a build queue time
5252
displayName: 'Lowest supported .NET Framework version (MDS validation)'
5353
type: string
5454
default: 'net462'
55+
- name: oneBranchType
56+
displayName: 'Select OneBranch template'
57+
default: Official
58+
values:
59+
- NonOfficial
60+
- Official
5561

5662
variables:
5763
- template: /eng/pipelines/libraries/variables.yml@self
@@ -74,7 +80,7 @@ resources:
7480
ref: refs/heads/main
7581

7682
extends:
77-
template: v2/OneBranch.Official.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
83+
template: v2/OneBranch.${{parameters.oneBranchType }}.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
7884
parameters:
7985
featureFlags:
8086
WindowsHostVersion: 1ESWindows2022

eng/pipelines/libraries/mds-validation-variables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ variables:
1515
- name: expectedFolderNames
1616
value: lib,ref,runtimes
1717
- name: expectedDotnetVersions
18-
value: net462,net6.0,net8.0,netstandard2.0,netstandard2.1
18+
value: net462,net6.0,net8.0
1919
- name: Database
2020
value: Northwind
2121
- name: platform

0 commit comments

Comments
 (0)