Normalize all file headers to the expected Apache 2.0 license #19409

sharwell · 2020-02-27T17:11:16Z

This change makes the conversion to MIT simpler by ensuring the repository starts with all headers in a known state. This change should be reviewed to make sure we aren't adding a header to a file where it would change meaning, and we aren't changing the header in a file that should keep its original header.

Edit: Only C# files are updated in this pull request. Other content types will be updated in a separate pull request.

...ure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs

SteveSandersonMS · 2020-02-27T17:13:28Z

src/Components/Blazor/Server/src/MonoDebugProxy/ws-proxy/DebugStore.cs

@@ -1,3 +1,6 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+


Files under /ws-proxy need to be excluded from this change as they are shared-source from the Mono repo.

Are these files expected to have the MIT header after all changes are made? If so, I recommend keeping them in this state for one commit since the next commit will convert everything seen in this PR to the MIT headers. Otherwise, let me know the expected final state of the files and I'll work on setting things up.

No, they are expected to remain identical (byte-for-byte) to their current state.

SteveSandersonMS · 2020-02-27T17:14:50Z

src/Components/Server/src/BlazorPack/SequenceOfT.cs

-// Copyright (c) Andrew Arnott. All rights reserved.
-// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.


Not sure this is a legitimate change. Files under /BlazorPack are being used on a shared-source basis. I don't think we get to change the copyright header.

analogrelay · 2020-02-27T17:15:46Z

src/Shared/TaskToApm.cs

@@ -1,6 +1,5 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.


So these were taken from CoreFX I think, hence we kept their license. Assuming that we'll be switching them all back to the MIT header shortly I think this is OK, but I want to raise them as a possible oddity.

Yes, the next commit changes everything here plus ~7200 other files to use the MIT header. Normalizing the headers before the change makes that one much easier to review because all changed files are changed in exactly the same way.

analogrelay · 2020-02-27T17:16:30Z

src/Shared/runtime/Http2/Hpack/H2StaticTable.cs

@@ -1,6 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0.


FYI @Tratcher this will trigger our sync bot right? How does it handle license headers today? The eventual change (moving to MIT headers) should simplify things, right?

Yeah, the bot will pick up any src difference in these shared/runtime files. Ideally runtime would have it's licence changed first. Otherwise we'll want to disable the bot until both sides are updated.

Or exclude the src/shared/runtime directory and deal with it later?

Runtime should already be MIT?

Nope, at least not the common files. https://github.com/dotnet/runtime/blob/4f84429fb44801b841c052505935a3cd14da18e2/src/libraries/Common/src/System/Net/Http/aspnetcore/Http2/Hpack/H2StaticTable.cs#L1-L3

@sharwell do you want to update the licenses in the runtime repo to MIT or should I? See the readme for syncing the changes.
https://github.com/dotnet/runtime/blob/master/src/libraries/Common/src/System/Net/Http/aspnetcore/ReadMe.SharedCode.md

Why don't we just sync the runtime after our transition is complete using our usual process? It's still manual (even if tracked automatically).

I want to limit how long they're out of sync. It makes syncing other changes harder.

analogrelay

LGTM, would like @Tratcher to confirm he's at least seen this and aware of what it will do to our sync process with the runtime for src/shared/runtime

BrennanConroy · 2020-02-27T17:20:09Z

Are .ts and .java files being checked by your script? Because there are a bunch of those that will need to be updated
Examples:
https://github.com/dotnet/aspnetcore/blob/master/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
https://github.com/dotnet/aspnetcore/blob/master/src/SignalR/clients/ts/signalr/src/AbortController.ts

analogrelay · 2020-02-27T17:20:21Z

Also, we need to resolve @SteveSandersonMS 's comments before merging.

sharwell · 2020-02-27T17:21:55Z

Are .ts and .java files being checked by your script?

@BrennanConroy Not currently. Thanks for bringing that up. I was looking at a filtered view to address managed code changes first. I'll submit a separate pull request to deal with changes in other content types.

Also, I'm not using a script. All the changes here were made by a new analyzer and code fix coming for Visual Studio hopefully in 16.6. 🎉

BrennanConroy · 2020-02-28T16:51:48Z

Looks like some tests read source files and assert the contents will need to be fixed up.

Tratcher · 2020-03-03T17:58:34Z

I've dealt with src/shared/runtime and src/shared/shared.tests/runtime, you can remove them from this PR.

#19518

Pilchie · 2020-07-01T18:50:59Z

@sharwell - sorry for letting this sit. Can you either re-do, or teach me how to re-do, and I'll make sure to get it going this time?

jkotalik · 2020-11-05T19:19:07Z

@Pilchie should someone take over this PR? I can take a look as this has been sitting for many months.

Pilchie · 2020-11-05T19:40:49Z

If you want, but I had pinged @sharwell in email, and he was going to take another stab at it based on some tooling/scripts he had. @sharwell - do you have an ETA for that? Should we wait for you or take this over?

jkotalik · 2020-11-05T19:45:16Z

Ah didn't know there was tooling. I'll wait to do this then.

JunTaoLuo · 2020-12-03T22:53:36Z

Any update @sharwell @Pilchie ?

sharwell · 2020-12-03T22:55:41Z

I wouldn't mind someone else taking this over. It turned out to be more complex than expected on two fronts:

There are a bunch of special cases (files that aren't expected to match headers)
The analyzers only cover C# and Visual Basic source files, but this repository has several others

For cases that are expected to follow a standard header, the new analyzers certainly do work. 😄

dougbu · 2021-01-28T21:51:22Z

src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs

@@ -1,5 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.using Microsoft.AspNetCore.Authorization;
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.


Just wondering: Where did all of the using Microsoft.AspNetCore.Authorization; typos creep in?

dougbu

Updating the files under src/Shared/runtime/ is pointless because those files be overwritten by dotnet/runtime changes (see .github/workflows/runtime-sync.yml). And, they already have MIT licenses.

pranavkm · 2021-07-21T22:21:06Z

Closing this in lieu of #34573.

Normalize all file headers to the expected Apache 2.0 license

0f4f941

sharwell requested review from analogrelay, BrennanConroy, halter73, jkotalik, SteveSandersonMS and Tratcher as code owners February 27, 2020 17:11

sharwell requested a review from a team February 27, 2020 17:11

analogrelay reviewed Feb 27, 2020

View reviewed changes

...ure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs Show resolved Hide resolved

SteveSandersonMS reviewed Feb 27, 2020

View reviewed changes

analogrelay reviewed Feb 27, 2020

View reviewed changes

analogrelay approved these changes Feb 27, 2020

View reviewed changes

Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Feb 27, 2020

analogrelay added this to the 5.0.0-preview2 milestone Mar 3, 2020

pranavkm modified the milestones: 5.0.0-preview2, 5.0.0-preview4 Apr 15, 2020

Tratcher removed this from the 5.0.0-preview4 milestone May 18, 2020

mkArtakMSFT assigned Pilchie Jun 29, 2020

jkotalik self-assigned this Nov 5, 2020

jkotalik removed their assignment Nov 5, 2020

Tratcher removed their request for review December 8, 2020 01:08

Base automatically changed from master to main January 22, 2021 01:32

dougbu requested review from javiercn, pranavkm and a team as code owners January 22, 2021 01:32

dougbu reviewed Jan 28, 2021

View reviewed changes

Pilchie mentioned this pull request Jan 28, 2021

Switch to MIT license #18873

Closed

pranavkm closed this Jul 21, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Normalize all file headers to the expected Apache 2.0 license #19409

Normalize all file headers to the expected Apache 2.0 license #19409

sharwell commented Feb 27, 2020 •

edited

Loading

SteveSandersonMS Feb 27, 2020

sharwell Feb 27, 2020

SteveSandersonMS Feb 27, 2020

SteveSandersonMS Feb 27, 2020

analogrelay Feb 27, 2020

sharwell Feb 27, 2020

analogrelay Feb 27, 2020

Tratcher Feb 27, 2020

Tratcher Feb 27, 2020

Pilchie Feb 27, 2020

Tratcher Feb 27, 2020 •

edited

Loading

Tratcher Feb 27, 2020

analogrelay Feb 27, 2020 •

edited

Loading

Tratcher Feb 27, 2020

analogrelay left a comment

BrennanConroy commented Feb 27, 2020

analogrelay commented Feb 27, 2020

sharwell commented Feb 27, 2020 •

edited

Loading

BrennanConroy commented Feb 28, 2020

Tratcher commented Mar 3, 2020

Pilchie commented Jul 1, 2020

jkotalik commented Nov 5, 2020

Pilchie commented Nov 5, 2020

jkotalik commented Nov 5, 2020

JunTaoLuo commented Dec 3, 2020

sharwell commented Dec 3, 2020

dougbu Jan 28, 2021

dougbu left a comment

pranavkm commented Jul 21, 2021

		@@ -1,3 +1,6 @@
		// Copyright (c) .NET Foundation. All rights reserved.
		// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

		@@ -1,6 +1,5 @@
		// Copyright (c) .NET Foundation. All rights reserved.
		// Licensed under the Apache License, Version 2.0.

Normalize all file headers to the expected Apache 2.0 license #19409

Normalize all file headers to the expected Apache 2.0 license #19409

Conversation

sharwell commented Feb 27, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tratcher Feb 27, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

analogrelay Feb 27, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

analogrelay left a comment

Choose a reason for hiding this comment

BrennanConroy commented Feb 27, 2020

analogrelay commented Feb 27, 2020

sharwell commented Feb 27, 2020 • edited Loading

BrennanConroy commented Feb 28, 2020

Tratcher commented Mar 3, 2020

Pilchie commented Jul 1, 2020

jkotalik commented Nov 5, 2020

Pilchie commented Nov 5, 2020

jkotalik commented Nov 5, 2020

JunTaoLuo commented Dec 3, 2020

sharwell commented Dec 3, 2020

Choose a reason for hiding this comment

dougbu left a comment

Choose a reason for hiding this comment

pranavkm commented Jul 21, 2021

sharwell commented Feb 27, 2020 •

edited

Loading

Tratcher Feb 27, 2020 •

edited

Loading

analogrelay Feb 27, 2020 •

edited

Loading

sharwell commented Feb 27, 2020 •

edited

Loading