Skip to content

Commit

Permalink
Merged PR 4490: eng | Remove netstandard from production pipeline
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
DavoudEshtehari committed May 3, 2024
1 parent ba288ef commit 7def235
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
displayName: 'Check expected folder names'
- powershell: |
# Checks the version of DotNetFramework, NetStandard and NetCore
# Checks the version of DotNetFramework and DotNet
$countErr = 0
$countPass = 0
$excludNamesFromRuntimeFolder = 'lib','win','unix'
Expand Down Expand Up @@ -260,11 +260,11 @@ jobs:
if($pVersion.FileVersion -eq '${{parameters.assembly_file_version_core}}')
{
Write-Host 'Correct File version Detected for netcore and netstandard,' $pVersion.FileVersion -ForegroundColor Green
Write-Host 'Correct File version Detected for netcore,' $pVersion.FileVersion -ForegroundColor Green
}
else
{
Write-Host 'Wrong File version Detected for netcore and netstandard and ref folder of netfx,' $pVersion.FileVersion -ForegroundColor Red
Write-Host 'Wrong File version Detected for netcore and ref folder,' $pVersion.FileVersion -ForegroundColor Red
Exit -1
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ steps:
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'

- ${{ if eq(parameters.product, 'AKV') }}:
- task: MSBuild@1
displayName: 'BuildAKVNetStAllOS using build.proj'
inputs:
solution: '**/build.proj'
configuration: '$(Configuration)'
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetStAllOS -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'

- task: MSBuild@1
displayName: 'BuildAKVNetFx using build.proj'
inputs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ parameters:
- net462
- net6.0
- net8.0
- netstandard2.0
- netstandard2.1

- name: product
default: MDS
Expand Down
8 changes: 7 additions & 1 deletion eng/pipelines/dotnet-sqlclient-signing-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ parameters: # parameters are shown up in ADO UI in a build queue time
displayName: 'Lowest supported .NET Framework version (MDS validation)'
type: string
default: 'net462'
- name: oneBranchType
displayName: 'Select OneBranch template'
default: Official
values:
- NonOfficial
- Official

variables:
- template: /eng/pipelines/libraries/variables.yml@self
Expand All @@ -74,7 +80,7 @@ resources:
ref: refs/heads/main

extends:
template: v2/OneBranch.Official.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
template: v2/OneBranch.${{parameters.oneBranchType }}.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
parameters:
featureFlags:
WindowsHostVersion: 1ESWindows2022
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/mds-validation-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ variables:
- name: expectedFolderNames
value: lib,ref,runtimes
- name: expectedDotnetVersions
value: net462,net6.0,net8.0,netstandard2.0,netstandard2.1
value: net462,net6.0,net8.0
- name: Database
value: Northwind
- name: platform
Expand Down

0 comments on commit 7def235

Please sign in to comment.