Skip to content

[release/9.0.1xx] Support shared .NET installation - baseline update,… #51908

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

Open
wants to merge 1 commit into
base: release/9.0.1xx
Choose a base branch
from
Open

[release/9.0.1xx] Support shared .NET installation - baseline update,… #51908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,19 @@ jobs:

eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore

source ./eng/common/tools.sh
InitializeDotNetCli true

echo "##vso[task.setvariable variable=Platform]$platform"
echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name"
echo "##vso[task.setvariable variable=SdkTarballPath]$(Pipeline.Workspace)/Artifacts/$sdk_tarball_name"
echo "##vso[task.setvariable variable=SourceBuiltArtifactsPath]$(Pipeline.Workspace)/Artifacts/$artifacts_path"
echo "##vso[task.setvariable variable=DotNetPath]$_InitializeDotNetCli"
displayName: Prepare Tests
workingDirectory: $(Build.SourcesDirectory)

- script: >
.dotnet/dotnet test
$(DotNetPath)/dotnet test
$(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
--filter "Category=SdkContent"
--logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx'
Expand Down Expand Up @@ -168,6 +172,7 @@ jobs:
- ${{ if and(eq(parameters.publishTestResultsPr, 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))) }}:
- template: ../steps/create-baseline-update-pr.yml
parameters:
dotnetPath: $(DotNetPath)
pipeline: sdk
repo: dotnet/sdk
originalFilesDirectory: src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets
Expand Down
6 changes: 5 additions & 1 deletion src/SourceBuild/content/eng/pipelines/templates/steps/create-baseline-update-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
parameters:
- name: dotnetPath
type: string
default: '$(Build.SourcesDirectory)/.dotnet'

# The pipeline that is being run
# Used to determine the correct baseline update tool to run
# Currently only supports "sdk" and "license"
Expand Down Expand Up @@ -31,7 +35,7 @@ steps:

branchName=$(echo "$(Build.SourceBranch)" | sed 's/refs\/heads\///g')

.dotnet/dotnet run \
${{ parameters.dotnetPath }}/dotnet run \
--project eng/tools/CreateBaselineUpdatePR/ \
--property:RestoreSources="$restoreSources" \
"${{ parameters.pipeline }}" \
Expand Down
2 changes: 2 additions & 0 deletions src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ jobs:
- script: |
source ./eng/common/tools.sh
InitializeDotNetCli true
echo "##vso[task.setvariable variable=DotNetPath]$_InitializeDotNetCli"
displayName: Install .NET SDK
workingDirectory: $(Build.SourcesDirectory)

Expand All @@ -176,6 +177,7 @@ jobs:

- template: templates/steps/create-baseline-update-pr.yml
parameters:
dotnetPath: $(DotNetPath)
pipeline: license
repo: dotnet/sdk
originalFilesDirectory: src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests
Expand Down
Loading