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.

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 main to main-vs-deps #53983

Merged
7 commits merged into from
Jun 10, 2021
Merged

Merge main to main-vs-deps #53983

7 commits merged into from
Jun 10, 2021

Commits on Jun 8, 2021

  1. Prepare for content type renames for aspx/cshtml/html files.

    These content type names are not yet submitted. Once they have been submitted, there will be a subsequent commit to only remove the old content type names.
    ToddGrun committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    a765c71 View commit details
    Browse the repository at this point in the history
  2. Cleanup whitespace

    ToddGrun committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    8b85de9 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2021

  1. Merge pull request #53954 from dotnet/dev/toddgrun/ChangeWebToolsCont…

    …entTypeNamesInMain
    
    Prepare for content type renames for aspx/cshtml/html files.
    ToddGrun authored Jun 9, 2021
    Configuration menu
    Copy the full SHA
    2541044 View commit details
    Browse the repository at this point in the history
  2. updatePublishData

    genlu committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    7a180ba View commit details
    Browse the repository at this point in the history
  3. Merge pull request #53978 from genlu/updatePublishData

    Update PublishData
    JoeRobich authored Jun 9, 2021
    Configuration menu
    Copy the full SHA
    cb04321 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0e94007 View commit details
    Browse the repository at this point in the history
  5. Record "extended property patterns" feature as done (#53953)

    * Record "extended property patterns" feature as done
    * Add "async method builder override" feature
    jcouv authored Jun 9, 2021
    Configuration menu
    Copy the full SHA
    8b12a25 View commit details
    Browse the repository at this point in the history