Skip to content

Conversation

dougbu
Copy link
Contributor

@dougbu dougbu commented Sep 29, 2021

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 strings in parentheses (#36756)

  • follow-up to 779db7f
  • errors occur but point to the + sign instead of displaying real problem

- 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 dougbu 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 Sep 29, 2021
@dougbu dougbu requested a review from a team September 29, 2021 23:59
@dougbu
Copy link
Contributor Author

dougbu commented Sep 29, 2021

/fyi @dotnet/aspdoi

@@ -1634,7 +1634,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.R
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logging.W3C.Sample", "src\Middleware\HttpLogging\samples\Logging.W3C.Sample\Logging.W3C.Sample.csproj", "{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport", "src\Razor\Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport\Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport.csproj", "{247E7B6F-FBA2-41A9-BA03-C7C4DF28091C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport", "src\Razor\Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport\Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport.csproj", "{247E7B6F-FBA2-41A9-BA03-C7C4DF28091C}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make conflict resolution easier, I used the project GUIDs from main for recently-updated projects. Microsoft.AspNetCore.Server.HttpSys.NonHelixTests and DelegationSite don't get new GUIDs because @Tratcher added them after the changes I'm backporting.

@dougbu dougbu merged commit 9cf1ace into release/6.0 Sep 30, 2021
@dougbu dougbu deleted the dougbu/backport.36449.36756 branch September 30, 2021 01:57
@ghost ghost added this to the 6.0.0 milestone Sep 30, 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.

2 participants