Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[automated] Merge branch 'vs17.9' => 'main' #9648

Merged
merged 16 commits into from
Jan 18, 2024
Merged

[automated] Merge branch 'vs17.9' => 'main' #9648

merged 16 commits into from
Jan 18, 2024

Commits on Jan 5, 2024

  1. [ClickOnce] Consider CopyToPublishDirectory property before publishin… 

    …g content items
    @sujitnayak
    sujitnayak committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    18d6582 View commit details
    Browse the repository at this point in the history

  2. Add requested targets to CacheContext

    @dfederm
    dfederm authored and github-actions committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    2895e50 View commit details
    Browse the repository at this point in the history

  3. Version bump to 17.9.3

    @rainersigwald
    rainersigwald committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    62eecc5 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. for c/r

    @sujitnayak
    sujitnayak committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    b79c1c7 View commit details
    Browse the repository at this point in the history

  2. Add FileAccessData Id and CorrelationId

    @dfederm
    dfederm committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    2ec2a1e View commit details
    Browse the repository at this point in the history

  3. Suppress API compat

    @dfederm
    dfederm committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    671d929 View commit details
    Browse the repository at this point in the history

  4. Revert files I didn't mean to change

    @dfederm
    dfederm committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    6686f7b View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. Update src/Build/CompatibilitySuppressions.xml 

    Co-authored-by: Rainer Sigwald <raines@microsoft.com>
    @dfederm @rainersigwald
    dfederm and rainersigwald committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    019f0f7 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Merge pull request dotnet#9611 from dotnet/backport/pr-9569-to-vs17.9 

    [vs17.9] Add requested targets to CacheContext
    @JanKrivanek
    JanKrivanek committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    c67ce32 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Merge pull request dotnet#9615 from dfederm/file-access-data-id 

    Add FileAccessData Id and CorrelationId
    @JanKrivanek
    JanKrivanek committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    cb0858f View commit details
    Browse the repository at this point in the history

  2. Merge pull request dotnet#9486 from sujitnayak/user/sujitn/1921153 

    [ClickOnce] Consider CopyToPublishDirectory property before publishing Content Items.
    @JanKrivanek
    JanKrivanek committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    ad2a721 View commit details
    Browse the repository at this point in the history

  3. Bump version after recent vs17.9 merges

    @JanKrivanek
    JanKrivanek committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    617e697 View commit details
    Browse the repository at this point in the history

  4. Merge pull request dotnet#9660 from dotnet/JanKrivanek-patch-4 

    [17.9] Bump version after recent vs17.9 merges
    @JanKrivanek
    JanKrivanek committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    563e2e5 View commit details
    Browse the repository at this point in the history

  5. Formatting changes to prevent unnoticed version merges into main

    @JanKrivanek
    JanKrivanek committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    03b1bce View commit details
    Browse the repository at this point in the history

  6. Merge pull request dotnet#9661 from dotnet/JanKrivanek-patch-4 

    [17.9] Formatting changes to prevent unnoticed version merges into main
    @JanKrivanek
    JanKrivanek committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    90725d0 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into merge/vs17.9-to-main

    @JanKrivanek
    JanKrivanek committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    35a2a40 View commit details
    Browse the repository at this point in the history