Skip to content

Conversation

@Pilchie
Copy link
Member

@Pilchie Pilchie commented Jul 21, 2021

Fixes #18873.

Most work done by either Find and Replace or the Visual Studio fix to add missing headers.

@Pilchie
Copy link
Member Author

Pilchie commented Jul 21, 2021

I suggest reviewing commit by commit, and skipping the second and last third commits as they are fairly mechanical.

@Pilchie
Copy link
Member Author

Pilchie commented Jul 21, 2021

Copy link
Member Author

Choose a reason for hiding this comment

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

There are a bunch of package.json files with author of empty or Microsoft, should those be updated?

Copy link
Member Author

Choose a reason for hiding this comment

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

Is this the right thing to do? @dleeapho ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Figured this was no longer relevant

@BrennanConroy
Copy link
Member

Are we going to handle non cs files later?

@Pilchie
Copy link
Member Author

Pilchie commented Jul 21, 2021

Are we going to handle non cs files later?

The Find and Replace step got them. I did a git grep Apache and walked through the results, and AFAICT, everything remaining after this is redists of other cases (like jquery).

@BrennanConroy
Copy link
Member

Oh, probably the second commit, which we can't really look at :D

@Pilchie
Copy link
Member Author

Pilchie commented Jul 21, 2021

Yes, that's my expectation.

@Pilchie
Copy link
Member Author

Pilchie commented Jul 21, 2021

git show 3dbb4f19f6 --name-only | findstr .java | measure-object confirms it (and other extensions too)

@BrennanConroy
Copy link
Member

@pranavkm
Copy link
Contributor

pranavkm commented Jul 21, 2021

#yolo approval. I can't quite review all the files, but the general gist of it seems right.

@Pilchie I would recommend starting starting the editorconfig rule as a suggestion and doing a second pass that turns in to warnings and clearing up the build warnings. Less chances that you run in to perpetual file conflicts that way.

@Pilchie
Copy link
Member Author

Pilchie commented Jul 21, 2021

@dotnet/aspnet-build Looks like some provisioning failures here. What's the best way to re-run?

@pranavkm
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@Pilchie Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jul 21, 2021
@Pilchie
Copy link
Member Author

Pilchie commented Jul 23, 2021

It's green - going to merge!

@Pilchie Pilchie merged commit 8b30d86 into dotnet:main Jul 23, 2021
@ghost ghost added this to the 6.0-rc1 milestone Jul 23, 2021
@Pilchie Pilchie deleted the mit-license branch July 23, 2021 02:22
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.

Switch to MIT license

3 participants