Skip to content

[release/3.1] Adjust #line directives a bit #33423

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

Merged
merged 1 commit into from
Jun 10, 2021

Conversation

dougbu
Copy link
Contributor

@dougbu dougbu commented Jun 10, 2021

- was "Add option to `RazorPageGenerator` for `#line` preprocessor directives (#27765) (#29024)"
- cherry-picked from d546861 in 'release/5.0' branch
  - was cherry-picked from 1a241fc in 'main' branch

- avoid new CS1504 errors because compiler can't find the ErrorPage.cshtml file
  - problem seems specific to local builds of this branch
- no tooling changes because `RazorPageGenerator` is in aspnetcore-tooling for 3.1
- change amounts to running 'release/5.0' or 'main' version of tool in this branch
  - ErrorPage.cshtml files in three branches were identical at time of previous commits
    ('main' version of ErrorPage.cshtml recently for nullability)
@dougbu dougbu added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jun 10, 2021
@dougbu dougbu requested a review from a team June 10, 2021 05:58
@dougbu dougbu added the tell-mode Indicates a PR which is being merged during tell-mode label Jun 10, 2021
@dougbu
Copy link
Contributor Author

dougbu commented Jun 10, 2021

Have seen error CS1504: Source file 'ErrorPage.cshtml' could not be opened -- Could not find file. files fairly frequently in local builds ☹️ Likely the problem again relates to somehow using a newer compiler than seen in the CI.

See #29024 for much more background and reasons tell-mode makes sense.

@dougbu
Copy link
Contributor Author

dougbu commented Jun 10, 2021

@Pilchie, sorry I didn't make the following a question. tell-mode🆗❔

See #29024 for much more background and reasons tell-mode makes sense.

@Pilchie
Copy link
Member

Pilchie commented Jun 10, 2021

Yes, tell-mode is fine.

@dougbu dougbu merged commit 35176d1 into release/3.1 Jun 10, 2021
@dougbu dougbu deleted the dougbu/back.port.error.page/3.1 branch June 10, 2021 18:14
@dougbu dougbu added this to the 3.1.17 milestone Jun 10, 2021
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
None yet
Development

Successfully merging this pull request may close these issues.

3 participants