-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Comparing changes
Open a pull request
base repository: dotnet/msbuild
base: 01d0b7a930
head repository: dotnet/msbuild
compare: 04b6e1b59d
- 17 commits
- 13 files changed
- 10 contributors
Commits on Oct 30, 2024
-
Keep ActivityId correlations in ETW
With `/OnlyProviders`, the done-for-us `ActivityId`/`RelatedActivityId` correlations aren't done for us, and it's hard to, for example, correlate a task back to the target it's in.
Configuration menu - View commit details
-
Copy full SHA for 062b6c8 - Browse repository at this point
Copy the full SHA 062b6c8View commit details
Commits on Feb 6, 2025
-
Configuration menu - View commit details
-
Copy full SHA for 65bafcd - Browse repository at this point
Copy the full SHA 65bafcdView commit details
Commits on Feb 10, 2025
-
Update dependencies from https://github.com/dotnet/arcade build 20250…
…127.4 (#11367) Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25065.2 -> To Version 9.0.0-beta.25077.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for ac361e6 - Browse repository at this point
Copy the full SHA ac361e6View commit details -
[vs17.12] Update dependencies from dotnet/arcade (#11371)
* Update dependencies from https://github.com/dotnet/arcade build 20250127.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25065.2 -> To Version 9.0.0-beta.25077.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>
Configuration menu - View commit details
-
Copy full SHA for 1fdbf1e - Browse repository at this point
Copy the full SHA 1fdbf1eView commit details -
Update dependencies from https://github.com/nuget/nuget.client build …
…6.13.1.1 (#11339) NuGet.Build.Tasks From Version 6.13.0-rc.113 -> To Version 6.13.1-rc.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
Configuration menu - View commit details
-
Copy full SHA for a1c2e74 - Browse repository at this point
Copy the full SHA a1c2e74View commit details
Commits on Feb 11, 2025
-
[vs17.13] Update dependencies from dotnet/arcade (#11407)
* Update dependencies from https://github.com/dotnet/arcade build 20250127.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25065.2 -> To Version 9.0.0-beta.25077.4 * Update Versions.props VersionPrefix * fix arcade restore path --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com> Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>
Configuration menu - View commit details
-
Copy full SHA for f95fe90 - Browse repository at this point
Copy the full SHA f95fe90View commit details -
[vs17.12] Fix arcade tool restore (#11413)
* Remove NuGet installation and restore tasks from build configurations * Revert "Remove NuGet installation and restore tasks from build configurations" This reverts commit 020a5fc. * fix arcade restore tools path * bump version
Configuration menu - View commit details
-
Copy full SHA for 990a07e - Browse repository at this point
Copy the full SHA 990a07eView commit details -
Configuration menu - View commit details
-
Copy full SHA for b2b6695 - Browse repository at this point
Copy the full SHA b2b6695View commit details -
[automated] Merge branch 'vs17.12' => 'vs17.13' (#11419)
I detected changes in the vs17.12 branch which have not been merged yet to vs17.13. I'm a robot and am configured to help you automatically keep vs17.13 up to date, so I've opened this PR. This PR merges commits made on vs17.12 by the following committers: * @JanProvaznik * @dotnet-maestro[bot] ## 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. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> 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. ``` sh git fetch git checkout vs17.12 git pull --ff-only git checkout vs17.13 git pull --ff-only git merge --no-ff vs17.12 # 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/msbuild HEAD:merge/vs17.12-to-vs17.13 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/msbuild HEAD:merge/vs17.12-to-vs17.13 ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-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/vs17.12-to-vs17.13'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/vs17.12-to-vs17.13 origin/vs17.13 git pull https://github.com/dotnet/msbuild merge/vs17.12-to-vs17.13 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/msbuild HEAD:merge/vs17.12-to-vs17.13 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/vs17.12-to-vs17.13 origin/vs17.13 git pull git@github.com:dotnet/msbuild merge/vs17.12-to-vs17.13 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/msbuild HEAD:merge/vs17.12-to-vs17.13 ``` </details> 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.
Configuration menu - View commit details
-
Copy full SHA for 1ea1660 - Browse repository at this point
Copy the full SHA 1ea1660View commit details -
Configuration menu - View commit details
-
Copy full SHA for fee9f09 - Browse repository at this point
Copy the full SHA fee9f09View commit details -
Configuration menu - View commit details
-
Copy full SHA for e3404ae - Browse repository at this point
Copy the full SHA e3404aeView commit details -
[automated] Merge branch 'vs17.13' => 'main' (#11422)
I detected changes in the vs17.13 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 vs17.13 by the following committers: * @JanProvaznik * @dotnet-maestro[bot] ## 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. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> 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. ``` sh git fetch git checkout vs17.13 git pull --ff-only git checkout main git pull --ff-only git merge --no-ff vs17.13 # 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/msbuild HEAD:merge/vs17.13-to-main ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/msbuild HEAD:merge/vs17.13-to-main ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-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/vs17.13-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/vs17.13-to-main origin/main git pull https://github.com/dotnet/msbuild merge/vs17.13-to-main (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/msbuild HEAD:merge/vs17.13-to-main ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/vs17.13-to-main origin/main git pull git@github.com:dotnet/msbuild merge/vs17.13-to-main (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/msbuild HEAD:merge/vs17.13-to-main ``` </details> 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.
Configuration menu - View commit details
-
Copy full SHA for a57e7e4 - Browse repository at this point
Copy the full SHA a57e7e4View commit details -
Configuration menu - View commit details
-
Copy full SHA for a8b0614 - Browse repository at this point
Copy the full SHA a8b0614View commit details -
Configuration menu - View commit details
-
Copy full SHA for df39ef8 - Browse repository at this point
Copy the full SHA df39ef8View commit details -
Keep ActivityId correlations in ETW (#10909)
With `/OnlyProviders`, the done-for-us `ActivityId`/`RelatedActivityId` correlations aren't done for us, and it's hard to, for example, correlate a task back to the target it's in.
Configuration menu - View commit details
-
Copy full SHA for 18c6b2e - Browse repository at this point
Copy the full SHA 18c6b2eView commit details -
Add EmbedInteropTypes to COMFileReference (#11414)
It was only on COMReference before but applies here too.
Configuration menu - View commit details
-
Copy full SHA for 6e4d63b - Browse repository at this point
Copy the full SHA 6e4d63bView commit details -
[main] Update dependencies from dotnet/roslyn (#11409)
* Update dependencies from https://github.com/dotnet/roslyn build 20250205.14 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.Net.Compilers.Toolset From Version 4.13.0-3.25076.8 -> To Version 4.13.0-3.25105.14 * Update dependencies from https://github.com/dotnet/roslyn build 20250211.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.Net.Compilers.Toolset From Version 4.13.0-3.25076.8 -> To Version 4.14.0-2.25111.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Provazník <janprovaznik@microsoft.com>
Configuration menu - View commit details
-
Copy full SHA for 04b6e1b - Browse repository at this point
Copy the full SHA 04b6e1bView commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 01d0b7a930...04b6e1b59d