-
Notifications
You must be signed in to change notification settings - Fork 196
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.11 to release/dev17.12 #10932
Merge release/dev17.11 to release/dev17.12 #10932
Commits on Aug 23, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20240…
…821.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.24421.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk
Configuration menu - View commit details
-
Copy full SHA for fe0753e - Browse repository at this point
Copy the full SHA fe0753eView commit details
Commits on Aug 28, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20240…
…826.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24421.4 -> To Version 8.0.0-beta.24426.2
Configuration menu - View commit details
-
Copy full SHA for 3530f21 - Browse repository at this point
Copy the full SHA 3530f21View commit details
Commits on Sep 10, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20240…
…909.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24426.2 -> To Version 8.0.0-beta.24459.4
Configuration menu - View commit details
-
Copy full SHA for c108e63 - Browse repository at this point
Copy the full SHA c108e63View commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…909.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24426.2 -> To Version 8.0.0-beta.24459.4
Configuration menu - View commit details
-
Copy full SHA for 9b3d543 - Browse repository at this point
Copy the full SHA 9b3d543View commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…909.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24426.2 -> To Version 8.0.0-beta.24459.4
Configuration menu - View commit details
-
Copy full SHA for b2afe51 - Browse repository at this point
Copy the full SHA b2afe51View commit details
Commits on Sep 11, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20240…
…910.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24459.4 -> To Version 8.0.0-beta.24460.4
Configuration menu - View commit details
-
Copy full SHA for 0056636 - Browse repository at this point
Copy the full SHA 0056636View commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…910.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24459.4 -> To Version 8.0.0-beta.24460.4
Configuration menu - View commit details
-
Copy full SHA for 4750e0c - Browse repository at this point
Copy the full SHA 4750e0cView commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…910.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24459.4 -> To Version 8.0.0-beta.24460.4
Configuration menu - View commit details
-
Copy full SHA for 23ad882 - Browse repository at this point
Copy the full SHA 23ad882View commit details
Commits on Sep 12, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20240…
…911.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24460.4 -> To Version 8.0.0-beta.24461.1
Configuration menu - View commit details
-
Copy full SHA for ad899a5 - Browse repository at this point
Copy the full SHA ad899a5View commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…911.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24460.4 -> To Version 8.0.0-beta.24461.1
Configuration menu - View commit details
-
Copy full SHA for 80f5130 - Browse repository at this point
Copy the full SHA 80f5130View commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…911.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24460.4 -> To Version 8.0.0-beta.24461.1
Configuration menu - View commit details
-
Copy full SHA for 55a86ea - Browse repository at this point
Copy the full SHA 55a86eaView commit details
Commits on Sep 13, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20240…
…911.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24461.1 -> To Version 8.0.0-beta.24461.2
Configuration menu - View commit details
-
Copy full SHA for 8aa1621 - Browse repository at this point
Copy the full SHA 8aa1621View commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…911.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24461.1 -> To Version 8.0.0-beta.24461.2
Configuration menu - View commit details
-
Copy full SHA for f671158 - Browse repository at this point
Copy the full SHA f671158View commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…911.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24461.1 -> To Version 8.0.0-beta.24461.2
Configuration menu - View commit details
-
Copy full SHA for 593d15b - Browse repository at this point
Copy the full SHA 593d15bView commit details
Commits on Sep 14, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20240…
…913.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24461.2 -> To Version 8.0.0-beta.24463.3
Configuration menu - View commit details
-
Copy full SHA for 9a0dc6d - Browse repository at this point
Copy the full SHA 9a0dc6dView commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…913.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24461.2 -> To Version 8.0.0-beta.24463.3
Configuration menu - View commit details
-
Copy full SHA for 0164f1a - Browse repository at this point
Copy the full SHA 0164f1aView commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…913.3 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24461.2 -> To Version 8.0.0-beta.24463.3
Configuration menu - View commit details
-
Copy full SHA for 2a251a4 - Browse repository at this point
Copy the full SHA 2a251a4View commit details
Commits on Sep 23, 2024
-
[release/dev17.11] Update dependencies from dotnet/arcade (#10870)
This pull request updates the following dependencies [marker]: <> (Begin:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2) ## From https://github.com/dotnet/arcade - **Subscription**: aa7f5ce7-ed24-46a1-195c-08dc952fc8a2 - **Build**: 20240913.3 - **Date Produced**: September 13, 2024 10:27:20 AM UTC - **Commit**: 8c08d889b3c0b3f19398faceaccd74d0f184a3fb - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24461.2 to 8.0.0-beta.24463.3][5] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24461.2 to 8.0.0-beta.24463.3][5] [5]: dotnet/arcade@0028fcc...8c08d88 [DependencyUpdate]: <> (End) [marker]: <> (End:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2)
Configuration menu - View commit details
-
Copy full SHA for 9954a3f - Browse repository at this point
Copy the full SHA 9954a3fView commit details -
[release/dev17.10] Update dependencies from dotnet/arcade (#10869)
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**: 20240913.3 - **Date Produced**: September 13, 2024 10:27:20 AM UTC - **Commit**: 8c08d889b3c0b3f19398faceaccd74d0f184a3fb - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24461.2 to 8.0.0-beta.24463.3][5] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24461.2 to 8.0.0-beta.24463.3][5] [5]: dotnet/arcade@0028fcc...8c08d88 [DependencyUpdate]: <> (End) [marker]: <> (End:0022737c-8efd-4919-ecf2-08dc3decc073)
Configuration menu - View commit details
-
Copy full SHA for 5943980 - Browse repository at this point
Copy the full SHA 5943980View commit details -
Configuration menu - View commit details
-
Copy full SHA for 12e1ed1 - Browse repository at this point
Copy the full SHA 12e1ed1View commit details -
[release/dev17.8] Update dependencies from dotnet/arcade (#10783)
This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.XliffTasks**: from 1.0.0-beta.23426.1 to 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:46887afb-6afe-4ad7-1b8f-08dcc28b24d8) ## From https://github.com/dotnet/arcade - **Subscription**: 46887afb-6afe-4ad7-1b8f-08dcc28b24d8 - **Build**: 20240913.3 - **Date Produced**: September 13, 2024 10:27:20 AM UTC - **Commit**: 8c08d889b3c0b3f19398faceaccd74d0f184a3fb - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24461.2 to 8.0.0-beta.24463.3][8] [8]: dotnet/arcade@0028fcc...8c08d88 [DependencyUpdate]: <> (End) [marker]: <> (End:46887afb-6afe-4ad7-1b8f-08dcc28b24d8)
Configuration menu - View commit details
-
Copy full SHA for 3d71476 - Browse repository at this point
Copy the full SHA 3d71476View commit details
Commits on Sep 24, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20240…
…920.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24463.3 -> To Version 8.0.0-beta.24470.2
Configuration menu - View commit details
-
Copy full SHA for 53a04f7 - Browse repository at this point
Copy the full SHA 53a04f7View commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…920.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24463.3 -> To Version 8.0.0-beta.24470.2
Configuration menu - View commit details
-
Copy full SHA for 0f983da - Browse repository at this point
Copy the full SHA 0f983daView commit details -
Update dependencies from https://github.com/dotnet/arcade build 20240…
…920.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24463.3 -> To Version 8.0.0-beta.24470.2
Configuration menu - View commit details
-
Copy full SHA for 26fcb18 - Browse repository at this point
Copy the full SHA 26fcb18View commit details
Commits on Sep 25, 2024
-
[release/dev17.10] Update dependencies from dotnet/arcade (#10917)
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**: 20240920.2 - **Date Produced**: September 20, 2024 8:55:27 PM UTC - **Commit**: ff79f814c1cd7bcc9902fb713fe016e6534418b4 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24463.3 to 8.0.0-beta.24470.2][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24463.3 to 8.0.0-beta.24470.2][1] [1]: dotnet/arcade@8c08d88...ff79f81 [DependencyUpdate]: <> (End) [marker]: <> (End:0022737c-8efd-4919-ecf2-08dc3decc073)
Configuration menu - View commit details
-
Copy full SHA for ccd1e7d - Browse repository at this point
Copy the full SHA ccd1e7dView commit details -
[release/dev17.11] Update dependencies from dotnet/arcade (#10918)
This pull request updates the following dependencies [marker]: <> (Begin:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2) ## From https://github.com/dotnet/arcade - **Subscription**: aa7f5ce7-ed24-46a1-195c-08dc952fc8a2 - **Build**: 20240920.2 - **Date Produced**: September 20, 2024 8:55:27 PM UTC - **Commit**: ff79f814c1cd7bcc9902fb713fe016e6534418b4 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24463.3 to 8.0.0-beta.24470.2][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24463.3 to 8.0.0-beta.24470.2][1] [1]: dotnet/arcade@8c08d88...ff79f81 [DependencyUpdate]: <> (End) [marker]: <> (End:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2)
Configuration menu - View commit details
-
Copy full SHA for 968db08 - Browse repository at this point
Copy the full SHA 968db08View commit details -
[release/dev17.8] Update dependencies from dotnet/arcade (#10919)
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**: 20240920.2 - **Date Produced**: September 20, 2024 8:55:27 PM UTC - **Commit**: ff79f814c1cd7bcc9902fb713fe016e6534418b4 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24463.3 to 8.0.0-beta.24470.2][1] [1]: dotnet/arcade@8c08d88...ff79f81 [DependencyUpdate]: <> (End) [marker]: <> (End:46887afb-6afe-4ad7-1b8f-08dcc28b24d8)
Configuration menu - View commit details
-
Copy full SHA for a3aa9f2 - Browse repository at this point
Copy the full SHA a3aa9f2View commit details
Commits on Sep 26, 2024
-
Merge remote-tracking branch 'origin/release/dev17.10' into merges/re…
…lease/dev17.10-to-release/dev17.11
Configuration menu - View commit details
-
Copy full SHA for 7e4c051 - Browse repository at this point
Copy the full SHA 7e4c051View commit details -
Merge release/dev17.10 to release/dev17.11 (#10911)
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 786bf05 - Browse repository at this point
Copy the full SHA 786bf05View commit details
Commits on Sep 27, 2024
-
Merge remote-tracking branch 'origin/release/dev17.8' into merges/rel…
…ease/dev17.8-to-release/dev17.10
Configuration menu - View commit details
-
Copy full SHA for cd27182 - Browse repository at this point
Copy the full SHA cd27182View commit details -
Merge release/dev17.8 to release/dev17.10 (#10916)
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 33f6c4d - Browse repository at this point
Copy the full SHA 33f6c4dView commit details
Commits on Oct 2, 2024
-
Merge release/dev17.10 to release/dev17.11 (#10939)
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 19b715d - Browse repository at this point
Copy the full SHA 19b715dView commit details
Commits on Oct 3, 2024
-
Merge remote-tracking branch 'upstream/release/dev17.11' into merges/…
…release/dev17.11-to-release/dev17.12
Configuration menu - View commit details
-
Copy full SHA for 1fd8c59 - Browse repository at this point
Copy the full SHA 1fd8c59View commit details