Skip to content

Conversation

dougbu
Copy link
Contributor

@dougbu dougbu commented Sep 13, 2021

  • clean up CodeCheck.ps1
    • avoid aliases
    • rework long lines
    • avoid deprecated dotnet run -p
    • improve output a bit
    • correct whitespace
  • there can be only one
    • we have just one solution file
    • solution file should mention projects once
  • check solution filters
    • confirm all mentioned projects are in AspNetCore.sln
  • add missing projects to AspNetCore.sln
    • Middleware.slnf contained projects that no longer exist eg. NodeServices
      • VS also sorted the file and VS 2019 added ARM64 configurations
    • a few other solution filters still referenced removed and moved projects
    • correct capitalization in some solution filters

Note: Unable to load some WiX projects in VS 2019 or any in VS 2022 (WiX extension unavailable for 2022)

  • gave up on getting those into AspNetCore.sln; removed them from the relevant solution filters

@wtgodbe
Copy link
Member

wtgodbe commented Sep 13, 2021

What did you do to regenerate the .sln/.slnf files? Also, what do you mean by "we have just one solution file"?

@Pilchie Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Sep 13, 2021
@dougbu
Copy link
Contributor Author

dougbu commented Sep 13, 2021

What did you do to regenerate the .sln/.slnf files?

A combination of VS 2019 and 2022. WiX doesn't have a VS extension for *.wixproj projects yet ☹️ but they should have something by the time 2022 reaches RTM 😄

I suspect people made manual changes to solution filters and neglected AspNetCore.sln for a bit.

Also, what do you mean by "we have just one solution file"?

CodeCheck.ps1 previously checked for solution files throughout the repo, wasting time and complicating the PowerShell. I cleaned that up.

@dougbu
Copy link
Contributor Author

dougbu commented Sep 14, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@dougbu
Copy link
Contributor Author

dougbu commented Sep 14, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@dougbu dougbu mentioned this pull request Sep 15, 2021
- confirm all mentioned projects are in AspNetCore.sln
- clean up CodeCheck.ps1
  - avoid aliases
  - rework long lines
  - avoid deprecated `dotnet run -p`
  - improve output a bit
  - correct whitespace
- there can be only one
  - we have just one solution file
  - solution file should mention projects _once_
- Middleware.slnf contained projects that no longer exist eg. NodeServices
  - VS also sorted the file and VS 2019 added ARM64 configurations
- a few other solution filters still referenced removed and moved projects
- correct capitalization in some solution filters

Note: Unable to load some WiX projects in VS 2019 or _any_ in VS 2022 (WiX extension unavailable for 2022)
@dougbu dougbu force-pushed the dougbu/check.solution.filters branch from db027ff to 04f874f Compare September 15, 2021 19:14
@dougbu dougbu merged commit 779db7f into main Sep 16, 2021
@dougbu dougbu deleted the dougbu/check.solution.filters branch September 16, 2021 00:03
@ghost ghost added this to the 7.0-preview1 milestone Sep 16, 2021
@dougbu
Copy link
Contributor Author

dougbu commented Sep 16, 2021

/backport to release/6.0

@github-actions
Copy link
Contributor

Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1240323991

@github-actions
Copy link
Contributor

@dougbu backporting to release/6.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Check solution filters - confirm all mentioned projects are in AspNetCore.sln - clean up CodeCheck.ps1 - avoid aliases - rework long lines - avoid deprecated `dotnet run -p` - improve output a bit - correct whitespace - there can be only one - we have just one solution file - solution file should mention projects _once_
Applying: Add missing projects to AspNetCore.sln - Middleware.slnf contained projects that no longer exist eg. NodeServices - VS also sorted the file and VS 2019 added ARM64 configurations - a few other solution filters still referenced removed and moved projects - correct capitalization in some solution filters
error: sha1 information is lacking or useless (eng/scripts/CodeCheck.ps1).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Add missing projects to AspNetCore.sln - Middleware.slnf contained projects that no longer exist eg. NodeServices - VS also sorted the file and VS 2019 added ARM64 configurations - a few other solution filters still referenced removed and moved projects - correct capitalization in some solution filters
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

dougbu added a commit that referenced this pull request Sep 29, 2021
- backport of #36449 and #36756

Dougbu/check.solution.filters (#36449)

  * Check solution filters
  - confirm all mentioned projects are in AspNetCore.sln
  - clean up CodeCheck.ps1
    - avoid aliases
    - rework long lines
    - avoid deprecated `dotnet run -p`
    - improve output a bit
    - correct whitespace
  - there can be only one
    - we have just one solution file
    - solution file should mention projects _once_

  * Add missing projects to AspNetCore.sln
  - Middleware.slnf contained projects that no longer exist eg. NodeServices
    - VS also sorted the file and VS 2019 added ARM64 configurations
  - a few other solution filters still referenced removed and moved projects
  - correct capitalization in some solution filters

  Note: Unable to load some WiX projects in VS 2019 or _any_ in VS 2022 (WiX extension unavailable for 2022)

  * Remove trailing comma in a solution filter

Put concatenated `string`s in parentheses (#36756)

  - follow-up to 779db7f
  - errors occur but point to the `+` sign instead of displaying real problem
dougbu added a commit that referenced this pull request Sep 30, 2021
- backport of #36449 and #36756

Dougbu/check.solution.filters (#36449)

  * Check solution filters
  - confirm all mentioned projects are in AspNetCore.sln
  - clean up CodeCheck.ps1
    - avoid aliases
    - rework long lines
    - avoid deprecated `dotnet run -p`
    - improve output a bit
    - correct whitespace
  - there can be only one
    - we have just one solution file
    - solution file should mention projects _once_

  * Add missing projects to AspNetCore.sln
  - Middleware.slnf contained projects that no longer exist eg. NodeServices
    - VS also sorted the file and VS 2019 added ARM64 configurations
  - a few other solution filters still referenced removed and moved projects
  - correct capitalization in some solution filters

  Note: Unable to load some WiX projects in VS 2019 or _any_ in VS 2022 (WiX extension unavailable for 2022)

  * Remove trailing comma in a solution filter

Put concatenated `string`s in parentheses (#36756)

  - follow-up to 779db7f
  - errors occur but point to the `+` sign instead of displaying real problem
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants