Skip to content
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

[automated] Merge branch 'release/9.0.1xx' => 'main' #8380

Merged
merged 29 commits into from
Sep 18, 2024

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the release/9.0.1xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/9.0.1xx by the following committers:

  • marcpopMSFT
  • v-wuzhai
  • dotnet-maestro[bot]
  • vseanreesermsft

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/9.0.1xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.0.1xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/templating HEAD:merge/release/9.0.1xx-to-main
or if you are using SSH
git push [email protected]:dotnet/templating HEAD:merge/release/9.0.1xx-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/9.0.1xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/9.0.1xx-to-main main
git pull https://github.com/dotnet/templating merge/release/9.0.1xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/templating HEAD:merge/release/9.0.1xx-to-main
or if you are using SSH
git checkout -b merge/release/9.0.1xx-to-main main
git pull [email protected]:dotnet/templating merge/release/9.0.1xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/templating HEAD:merge/release/9.0.1xx-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

vseanreesermsft and others added 26 commits August 29, 2024 11:06
…8-29-1106-d2e223d8-9b3b-4a89-baeb-499b60220242

Update branding to 8.0.110
…ence-packages build 20240815.1 (#8297)

[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages
…into merge/release/8.0.1xx-to-release/8.0.3xx
…/8.0.3xx

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx'
…909.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24426.2 -> To Version 8.0.0-beta.24459.4
…7b-4f3b-b1e1-e915a3f837fe

[release/8.0.3xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.3xx-to-release/8.0.4xx
…/8.0.4xx

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx'
…910.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24459.4 -> To Version 8.0.0-beta.24460.4
…cf-4986-9b61-644e073b0195

[release/8.0.4xx] Update dependencies from dotnet/arcade
…910.4 (#8355)

[release/8.0.3xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.4xx-to-release/9.0.1xx
…/9.0.1xx

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx'
…911.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24460.4 -> To Version 8.0.0-beta.24461.1
…1a-4ff7-811e-197f00c09ddf

[release/8.0.3xx] Update dependencies from dotnet/arcade
…911.1 (#8360)

[release/8.0.4xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.3xx-to-release/8.0.4xx
…/8.0.4xx

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx'
…into merge/release/8.0.4xx-to-release/9.0.1xx
…/9.0.1xx

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx'
@github-actions github-actions bot requested a review from a team as a code owner September 17, 2024 21:32
@marcpopMSFT marcpopMSFT merged commit 92f64c4 into main Sep 18, 2024
10 checks passed
Comment on lines -163 to -191

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: eng/common/templates-official/post-build/post-build.yml@self
parameters:
publishingInfraVersion: 3
# Symbol validation isn't being very reliable lately. This should be enabled back
# once this issue is resolved: https://github.com/dotnet/arcade/issues/2871
enableSymbolValidation: false
# Sourcelink validation isn't passing for Arcade due to some regressions. This should be
# enabled back once this issue is resolved: https://github.com/dotnet/arcade/issues/2912
enableSourceLinkValidation: false
publishDependsOn:
- Validate
# This is to enable SDL runs part of Post-Build Validation Stage
SDLValidationParameters:
enable: true
continueOnError: false
params: ' -SourceToolsList @("policheck","credscan")
-ArtifactToolsList @("binskim")
-BinskimAdditionalRunConfigParams @("IgnorePdbLoadError < True","Recurse < True")
-TsaInstanceURL $(_TsaInstanceURL)
-TsaProjectName $(_TsaProjectName)
-TsaNotificationEmail $(_TsaNotificationEmail)
-TsaCodebaseAdmin $(_TsaCodebaseAdmin)
-TsaBugAreaPath $(_TsaBugAreaPath)
-TsaIterationPath $(_TsaIterationPath)
-TsaRepositoryName $(_TsaRepsitoryName)
-TsaCodebaseName $(_TsaCodebaseName)
-TsaPublish $True'
Copy link
Member

@ViktorHofer ViktorHofer Oct 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcpopMSFT since this part got removed dotnet/templating's internal builds don't publish to darc anymore and hence templating is stale in sdk. Any idea why this got removed?

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants