Skip to content

Conversation

@TanayParikh
Copy link
Contributor

@TanayParikh TanayParikh requested a review from MattGal December 13, 2021 20:44
@TanayParikh TanayParikh requested a review from dougbu as a code owner December 13, 2021 20:44
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Dec 13, 2021
@TanayParikh TanayParikh requested a review from a team December 13, 2021 20:44
@TanayParikh TanayParikh merged commit dc03884 into main Dec 13, 2021
@TanayParikh TanayParikh deleted the TanayParikh-patch-3 branch December 13, 2021 23:04
@ghost ghost added this to the 7.0-preview1 milestone Dec 13, 2021
@TanayParikh
Copy link
Contributor Author

/backport to release/6.0

@TanayParikh
Copy link
Contributor Author

/backport to release/5.0

@TanayParikh
Copy link
Contributor Author

/backport to release/3.1

@github-actions
Copy link
Contributor

Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1580525404

@TanayParikh
Copy link
Contributor Author

/backport to release/2.1

@github-actions
Copy link
Contributor

Started backporting to release/5.0: https://github.com/dotnet/aspnetcore/actions/runs/1580525567

@github-actions
Copy link
Contributor

Started backporting to release/3.1: https://github.com/dotnet/aspnetcore/actions/runs/1580525977

@github-actions
Copy link
Contributor

Started backporting to release/2.1: https://github.com/dotnet/aspnetcore/actions/runs/1580526185

@github-actions
Copy link
Contributor

@TanayParikh backporting to release/6.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Use CDN for .NET Assets
Using index info to reconstruct a base tree...
M	eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use CDN for .NET Assets
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link
Contributor

@TanayParikh backporting to release/3.1 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Use CDN for .NET Assets
Using index info to reconstruct a base tree...
M	eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use CDN for .NET Assets
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link
Contributor

@TanayParikh backporting to release/5.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Use CDN for .NET Assets
Using index info to reconstruct a base tree...
M	eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use CDN for .NET Assets
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link
Contributor

@TanayParikh backporting to release/2.1 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Use CDN for .NET Assets
Using index info to reconstruct a base tree...
M	eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use CDN for .NET Assets
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

dougbu pushed a commit that referenced this pull request Dec 16, 2021
* Backport Use CDN for .NET Assets to release 6.0

#39007

* Use dotnetcli.azureedge
dougbu pushed a commit that referenced this pull request Dec 17, 2021
* Backport Use CDN for .NET Assets for release/5.0

#39007

* Update Versions.props

* Update Versions.props
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants