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

Merging internal commits for release/6.0 #41156

Merged

Commits on Mar 1, 2022

  1. Copy the full SHA
    a387bfb View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2022

  1. Copy the full SHA
    c23f556 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    a0f425b View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    1768ab5 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    27188b2 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2022

  1. Copy the full SHA
    2a5fa08 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    beea630 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    a9a609a View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2022

  1. Merged PR 21649: [internal/release/6.0] Make UseUrls() override defau…

    …lt hosting config
    
    ## Description
    
    Prior to this change, default config (typically loaded from `DOTNET_`/`ASPNET_` environment variables and command line arguments) could override the application-level configuration. This would prevent `GenericWebHostService` from seeing the latest configuration set by `UseUrls()` of `DOTNET_URLS`, `ASPNET_URLS` or `--urls` was set.
    
    Fixes dotnet#38185
    
    ## Customer Impact
    
    This is a big gotcha to customers using `WebApplicationBuilder` (which is used in all the ASP.NET Core 6 templates) who expect the following to work:
    
    ```C#
    var builder = WebApplication.CreateBuilder(args);
    builder.WebHost.UseUrls("http://*:8080");
    var app = builder.Build();
    app.Run();
    ```
    
    A comment on the issue suggesting we patch this has gotten 5 thumbs ups not counting mine.
    
    ## Regression?
    
    - [ ] Yes
    - [x] No
    
    ## Risk
    
    - [ ] High
    - [ ] Medium
    - [x] Low
    
    This is a small well tested change which only affects the loading of default config sources and those added via a `HostFactoryResolver` to host configuration. [Here’s the existing test](https://github.com/dotnet/aspnetcore/blob/0f6f649f1da658bbe37b8898df0c80c5affa9d2d/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs#L883) showing that the expected configuration providers are still dispose.
    
    ## Verification
    
    - [x] Manual (required)
    - [x] Automated
    
    ## Packaging changes reviewed?
    
    - [ ] Yes
    - [ ] No
    - [x] N/A
    Stephen Halter authored and dougbu committed Mar 7, 2022
    Copy the full SHA
    4279611 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2022

  1. Copy the full SHA
    07c4ec3 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    921ea44 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2022

  1. Merge from github release/6.0

    mmitche committed Mar 14, 2022
    Copy the full SHA
    0729a7d View commit details
    Browse the repository at this point in the history
  2. [internal/release/6.0] Update dependencies from dnceng/internal/dotne…

    …t-efcore dnceng/internal/dotnet-runtime
    
     - Set to private runtime
    dotnet-bot committed Mar 14, 2022
    Copy the full SHA
    765af57 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. Merged PR 21744: Merge from github release/6.0

    # {PR title}
    
    Summary of the changes (Less than 80 chars)
    
    ## Description
    
    {Detail}
    
    Fixes #{bug number} (in this specific format)
    
    ## Customer Impact
    
    {Justification}
    
    ## Regression?
    
    - [ ] Yes
    - [ ] No
    
    [If yes, specify the version the behavior has regressed from]
    
    ## Risk
    
    - [ ] High
    - [ ] Medium
    - [ ] Low
    
    [Justify the selection above]
    
    ## Verification
    
    - [ ] Manual (required)
    - [ ] Automated
    
    ## Packaging changes reviewed?
    
    - [ ] Yes
    - [ ] No
    - [ ] N/A
    
    ----
    
    ## When servicing release/2.1
    
    - [ ] Make necessary changes in eng/PatchConfig.props
    
    Merge from github release/6.0
    mmitche committed Mar 15, 2022
    Copy the full SHA
    ce90c81 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. Merged PR 21869: Correct --architecture in fpm commands

    # {PR title}
    
    Correct `--architecture` in `fpm` commands
    
    ## Description
    
    Update `fpm` commands to use a supported `--architecture` value. As-is, the x64 .rpm files we produce are incompatible w/ installation on an x64 machine. Problem found during servicing version flow.
    
    ## Customer Impact
    
    Unable to build dotnet-installer-ci-official w/ current .rpm files from dotnet-aspnetcore repo.
    
    ## Regression?
    
    - [x] Yes
    - [ ] No
    
    This is a build regression since 6.0.3. It will also impact our 'main' branch.
    
    ## Risk
    
    - [ ] High
    - [ ] Medium
    - [x] Low
    
    Have verified the chosen values for the command line using available online documentation. Since we know the current .rpm files are busted, things can only get better 😃
    
    ## Verification
    
    - [x] Manual (required)
    - [ ] Automated
    
    I am locally building this branch and will use `rpmlint` in a `docker` container to verify the goodness of the produced package.
    
    ## Packaging changes reviewed?
    
    - [ ] Yes
    - [ ] No
    - [ ] N/A
    
    Not sure how to answer this because the change is to an internal setting of the RPM installer. If others agree it's the right change, it's been reviewed 😃
    
    ----
    
    ## When servicing release/2.1
    
    - [ ] Make necessary changes in eng/PatchConfig.props
    dougbu committed Mar 18, 2022
    Copy the full SHA
    578ba6d View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Merge from public

    mmitche committed Mar 21, 2022
    Copy the full SHA
    0498f89 View commit details
    Browse the repository at this point in the history
  2. Merged PR 21913: Merge from public release/6.0

    # {PR title}
    
    Summary of the changes (Less than 80 chars)
    
    ## Description
    
    {Detail}
    
    Fixes #{bug number} (in this specific format)
    
    ## Customer Impact
    
    {Justification}
    
    ## Regression?
    
    - [ ] Yes
    - [ ] No
    
    [If yes, specify the version the behavior has regressed from]
    
    ## Risk
    
    - [ ] High
    - [ ] Medium
    - [ ] Low
    
    [Justify the selection above]
    
    ## Verification
    
    - [ ] Manual (required)
    - [ ] Automated
    
    ## Packaging changes reviewed?
    
    - [ ] Yes
    - [ ] No
    - [ ] N/A
    
    ----
    
    ## When servicing release/2.1
    
    - [ ] Make necessary changes in eng/PatchConfig.props
    mmitche committed Mar 21, 2022
    Copy the full SHA
    cdabbaa View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. Merged PR 21931: Revert "[release/6.0] Build ProjectTemplates in Sour…

    …ce-Build (dotnet#40650)" (dotnet#40805)
    
    # {PR title}
    
    Summary of the changes (Less than 80 chars)
    
    ## Description
    
    {Detail}
    
    Fixes #{bug number} (in this specific format)
    
    ## Customer Impact
    
    {Justification}
    
    ## Regression?
    
    - [ ] Yes
    - [ ] No
    
    [If yes, specify the version the behavior has regressed from]
    
    ## Risk
    
    - [ ] High
    - [ ] Medium
    - [ ] Low
    
    [Justify the selection above]
    
    ## Verification
    
    - [ ] Manual (required)
    - [ ] Automated
    
    ## Packaging changes reviewed?
    
    - [ ] Yes
    - [ ] No
    - [ ] N/A
    
    ----
    
    ## When servicing release/2.1
    
    - [ ] Make necessary changes in eng/PatchConfig.props
    
    Revert "[release/6.0] Build ProjectTemplates in Source-Build (dotnet#40650)" (dotnet#40805)
    
    This reverts commit 7c2000d.
    mmitche committed Mar 22, 2022
    Copy the full SHA
    f9ae0f5 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2022

  1. Merge commit 'f9ae0f5d30be2de3c0de61b5673bd8873231d70a' into internal…

    …-merge-6.0-2022-04-12-1158
    vseanreesermsft committed Apr 12, 2022
    Copy the full SHA
    d687378 View commit details
    Browse the repository at this point in the history