Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dotnet/msbuild
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 01d0b7a930
Choose a base ref
...
head repository: dotnet/msbuild
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 04b6e1b59d
Choose a head ref
  • 17 commits
  • 13 files changed
  • 10 contributors

Commits on Oct 30, 2024

  1. 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.
    rainersigwald authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    062b6c8 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2025

  1. Configuration menu
    Copy the full SHA
    65bafcd View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2025

  1. 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>
    dotnet-maestro[bot] and dotnet-maestro[bot] authored Feb 10, 2025
    Configuration menu
    Copy the full SHA
    ac361e6 View commit details
    Browse the repository at this point in the history
  2. [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>
    3 people authored Feb 10, 2025
    Configuration menu
    Copy the full SHA
    1fdbf1e View commit details
    Browse the repository at this point in the history
  3. 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>
    4 people authored Feb 10, 2025
    Configuration menu
    Copy the full SHA
    a1c2e74 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2025

  1. [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>
    4 people authored Feb 11, 2025
    Configuration menu
    Copy the full SHA
    f95fe90 View commit details
    Browse the repository at this point in the history
  2. [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
    JanProvaznik authored Feb 11, 2025
    Configuration menu
    Copy the full SHA
    990a07e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b2b6695 View commit details
    Browse the repository at this point in the history
  4. [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.
    JanProvaznik authored Feb 11, 2025
    Configuration menu
    Copy the full SHA
    1ea1660 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fee9f09 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e3404ae View commit details
    Browse the repository at this point in the history
  7. [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.
    JanProvaznik authored Feb 11, 2025
    Configuration menu
    Copy the full SHA
    a57e7e4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a8b0614 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    df39ef8 View commit details
    Browse the repository at this point in the history
  10. 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.
    JanProvaznik authored Feb 11, 2025
    Configuration menu
    Copy the full SHA
    18c6b2e View commit details
    Browse the repository at this point in the history
  11. Add EmbedInteropTypes to COMFileReference (#11414)

    It was only on COMReference before but applies here too.
    rainersigwald authored Feb 11, 2025
    Configuration menu
    Copy the full SHA
    6e4d63b View commit details
    Browse the repository at this point in the history
  12. [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>
    3 people authored Feb 11, 2025
    Configuration menu
    Copy the full SHA
    04b6e1b View commit details
    Browse the repository at this point in the history
Loading