-
Notifications
You must be signed in to change notification settings - Fork 198
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
Merge release/dev17.12 to main #11081
Commits on Oct 16, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20241…
…016.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1
Configuration menu - View commit details
-
Copy full SHA for 5a99434 - Browse repository at this point
Copy the full SHA 5a99434View commit details -
Update dependencies from https://github.com/dotnet/arcade build 20241…
…016.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1
Configuration menu - View commit details
-
Copy full SHA for c109815 - Browse repository at this point
Copy the full SHA c109815View commit details
Commits on Oct 22, 2024
-
[release/dev17.10] Update dependencies from dotnet/arcade (#11033)
This pull request updates the following dependencies [marker]: <> (Begin:0022737c-8efd-4919-ecf2-08dc3decc073) ## From https://github.com/dotnet/arcade - **Subscription**: 0022737c-8efd-4919-ecf2-08dc3decc073 - **Build**: 20241016.1 - **Date Produced**: October 16, 2024 4:52:26 PM UTC - **Commit**: f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24508.1 to 8.0.0-beta.24516.1][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24508.1 to 8.0.0-beta.24516.1][1] [1]: dotnet/arcade@e5b13e0...f7fb1fe [DependencyUpdate]: <> (End) [marker]: <> (End:0022737c-8efd-4919-ecf2-08dc3decc073)
Configuration menu - View commit details
-
Copy full SHA for 719e3f2 - Browse repository at this point
Copy the full SHA 719e3f2View commit details -
[release/dev17.8] Update dependencies from dotnet/arcade (#11035)
This pull request updates the following dependencies [marker]: <> (Begin:46887afb-6afe-4ad7-1b8f-08dcc28b24d8) ## From https://github.com/dotnet/arcade - **Subscription**: 46887afb-6afe-4ad7-1b8f-08dcc28b24d8 - **Build**: 20241016.1 - **Date Produced**: October 16, 2024 4:52:26 PM UTC - **Commit**: f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24508.1 to 8.0.0-beta.24516.1][1] [1]: dotnet/arcade@e5b13e0...f7fb1fe [DependencyUpdate]: <> (End) [marker]: <> (End:46887afb-6afe-4ad7-1b8f-08dcc28b24d8)
Configuration menu - View commit details
-
Copy full SHA for af919ba - Browse repository at this point
Copy the full SHA af919baView commit details
Commits on Oct 23, 2024
-
Merge remote-tracking branch 'upstream/release/dev17.8' into merges/r…
…elease/dev17.8-to-release/dev17.10
Configuration menu - View commit details
-
Copy full SHA for 8bcab6d - Browse repository at this point
Copy the full SHA 8bcab6dView commit details -
Merge remote-tracking branch 'upstream/release/dev17.10' into merges/…
…release/dev17.10-to-release/dev17.11
Configuration menu - View commit details
-
Copy full SHA for 87860b3 - Browse repository at this point
Copy the full SHA 87860b3View commit details -
Merge release/dev17.8 to release/dev17.10 (#11065)
This is an automatically generated pull request from release/dev17.8 into release/dev17.10. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.8 - https://github.com/dotnet/razor/find/release/dev17.10 Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.8-to-release/dev17.10 git reset --hard upstream/release/dev17.10 git merge upstream/release/dev17.8 # Fix merge conflicts git commit git push upstream merges/release/dev17.8-to-release/dev17.10 --force ```
Configuration menu - View commit details
-
Copy full SHA for 5161ec1 - Browse repository at this point
Copy the full SHA 5161ec1View commit details -
Merge release/dev17.10 to release/dev17.11 (#11066)
This is an automatically generated pull request from release/dev17.10 into release/dev17.11. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.10 - https://github.com/dotnet/razor/find/release/dev17.11 Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.10-to-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/release/dev17.10 # Fix merge conflicts git commit git push upstream merges/release/dev17.10-to-release/dev17.11 --force ```
Configuration menu - View commit details
-
Copy full SHA for 2dd3154 - Browse repository at this point
Copy the full SHA 2dd3154View commit details -
Merge release/dev17.10 to release/dev17.11 (#11072)
This is an automatically generated pull request from release/dev17.10 into release/dev17.11. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.10 - https://github.com/dotnet/razor/find/release/dev17.11 Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.10-to-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/release/dev17.10 # Fix merge conflicts git commit git push upstream merges/release/dev17.10-to-release/dev17.11 --force ```
Configuration menu - View commit details
-
Copy full SHA for aed0fbc - Browse repository at this point
Copy the full SHA aed0fbcView commit details -
Merge release/dev17.11 to release/dev17.12 (#11073)
This is an automatically generated pull request from release/dev17.11 into release/dev17.12. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.11 - https://github.com/dotnet/razor/find/release/dev17.12 Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force ```
Configuration menu - View commit details
-
Copy full SHA for d259d20 - Browse repository at this point
Copy the full SHA d259d20View commit details -
Merge release/dev17.11 to release/dev17.12 (#11077)
This is an automatically generated pull request from release/dev17.11 into release/dev17.12. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.11 - https://github.com/dotnet/razor/find/release/dev17.12 Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force ```
Configuration menu - View commit details
-
Copy full SHA for 8bf9ad1 - Browse repository at this point
Copy the full SHA 8bf9ad1View commit details