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

[release/6.0] Build ProjectTemplates in Source-Build #40650

Merged
merged 2 commits into from Mar 10, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Mar 10, 2022

Backport of #40643 to release/6.0

/cc @wtgodbe

@github-actions github-actions bot requested a review from Pilchie as a code owner March 10, 2022 21:25
@ghost ghost added this to the 6.0.x milestone Mar 10, 2022
@ghost
Copy link

ghost commented Mar 10, 2022

Hi @github-actions[bot]. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the servicing process document.
Otherwise, please add tell-mode label.

@ghost ghost added this to In Progress in Servicing Mar 10, 2022
@wtgodbe wtgodbe added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode labels Mar 10, 2022
@wtgodbe wtgodbe merged commit 7c2000d into release/6.0 Mar 10, 2022
@wtgodbe wtgodbe deleted the backport/pr-40643-to-release/6.0 branch March 10, 2022 23:41
Servicing automation moved this from In Progress to Done Mar 10, 2022
@wtgodbe wtgodbe modified the milestones: 6.0.x, 6.0.4 Mar 11, 2022
wtgodbe added a commit that referenced this pull request Mar 21, 2022
wtgodbe added a commit that referenced this pull request Mar 21, 2022
wtgodbe added a commit that referenced this pull request Mar 23, 2022
dougbu pushed a commit that referenced this pull request Apr 5, 2022
* Revert "Revert "[release/6.0] Build ProjectTemplates in Source-Build (#40650)" (#40805)"

This reverts commit a351c43.

* Update Microsoft.Authentication.WebAssembly.Msal.csproj
* Update Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
* Update Microsoft.Authentication.WebAssembly.Msal.csproj
* Update Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj

* Workaround
vseanreesermsft pushed a commit to vseanreesermsft/aspnetcore that referenced this pull request Apr 12, 2022
…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 added a commit that referenced this pull request Apr 13, 2022
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore

* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore

* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore

* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime

* Merged PR 21649: [internal/release/6.0] Make UseUrls() override default 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 #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

* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime

* Merge from github release/6.0

* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore dnceng/internal/dotnet-runtime

 - Set to private runtime

* 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

* Merged PR 21931: Revert "[release/6.0] Build ProjectTemplates in Source-Build (#40650)" (#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 (#40650)" (#40805)

This reverts commit 7c2000d.

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Stephen Halter <shalter@microsoft.com>
Co-authored-by: mmitche <mmitche@microsoft.com>
Co-authored-by: Doug Bunting (AAPT) <dougbu@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode
Projects
Development

Successfully merging this pull request may close these issues.

None yet

1 participant