use consistent (c) for copyright symbol #5210

SteveL-MSFT · 2017-10-24T10:49:13Z

Looks like vscode also removed some trailing whitespace

PaulHigin

These are a lot of changes to look at, but it all looks good as far as I can tell.

adityapatwardhan

LGTM

adityapatwardhan · 2017-10-24T17:08:02Z

https://github.com/PowerShell/PowerShell/pull/5210/files?w=1 can be use to hide the whitespace only changes.

markekraus

LGTM

mirichmo · 2017-10-24T21:55:44Z

src/System.Management.Automation/engine/DscResourceInfo.cs

@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------
 // <copyright company="Microsoft">
-//    Copyright (C) 2013 Microsoft Corporation
+//    Copyright (c) 2013 Microsoft Corporation


There are a bunch of entries that include the date. It should be removed and made consistent with the others shouldn't it? This comment applies to a bunch of other changes if it needs to be addressed.

Copyright (c) Microsoft Corporation, All rights reserved.

Yeah, my understanding is that the date doesn't matter. Will update.

iSazonov · 2017-10-25T06:53:35Z

test/powershell/Modules/Microsoft.PowerShell.Core/PSSessionConfiguration.Tests.ps1

@@ -656,7 +656,7 @@ namespace PowershellTestConfigNamespace
                    SessionType = 'Default'
                    Author = 'User'
                    CompanyName = 'Microsoft Corporation'
-                    Copyright = 'Copyright (c) 2011 Microsoft Corporation. All rights reserved.'
+                    Copyright (c) Microsoft Corporation. All rights reserved.'


Typo. Please revert "Copyright = ".

iSazonov · 2017-10-25T07:00:07Z

src/Microsoft.Management.Infrastructure.CimCmdlets/AssemblyInfo.cs

@@ -1,5 +1,5 @@
 /*============================================================================
- * Copyright (C) Microsoft Corporation, All rights reserved.
+ * Copyright (c) Microsoft Corporation, All rights reserved.


Please replace "," with dot.
I believe we use common pattern "Copyright (c) Microsoft. All rights reserved."

We have many such patterns below.

I'll fix all the occurrences

iSazonov · 2017-10-25T07:01:08Z

src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimSessionCommand.cs

@@ -1,5 +1,5 @@
 //
-//    Copyright (C) Microsoft.  All rights reserved.
+//    Copyright (c) Microsoft.  All rights reserved.


Extra spaces.
I believe we use common pattern "Copyright (c) Microsoft. All rights reserved."

iSazonov · 2017-10-25T07:01:49Z

src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs

@@ -1,5 +1,5 @@
 //
-//    Copyright (C) Microsoft.  All rights reserved.
+//    Copyright (c) Microsoft.  All rights reserved.


Extra spaces.
I believe we use common pattern "Copyright (c) Microsoft. All rights reserved."

iSazonov · 2017-10-25T07:02:05Z

src/Microsoft.PowerShell.Commands.Diagnostics/PdhSafeHandle.cs

@@ -1,5 +1,5 @@
 //
-//    Copyright (C) Microsoft.  All rights reserved.
+//    Copyright (c) Microsoft.  All rights reserved.


Extra spaces.
I believe we use common pattern "Copyright (c) Microsoft. All rights reserved."

iSazonov · 2017-10-25T07:02:53Z

src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.txt

@@ -1,4 +1,4 @@
-#Copyright (c) 2008 Microsoft Corporation
+#Copyright (c) Microsoft Corporation


iSazonov · 2017-10-25T07:03:03Z

src/Microsoft.PowerShell.Commands.Management/commands/management/ControlPanelItemCommand.cs

@@ -1,5 +1,5 @@
 //
-//    Copyright (C) Microsoft.  All rights reserved.
+//    Copyright (c) Microsoft.  All rights reserved.


Extra spaces.
I believe we use common pattern "Copyright (c) Microsoft. All rights reserved."

iSazonov · 2017-10-25T07:03:35Z

src/Microsoft.PowerShell.Commands.Management/commands/management/InvokeWMIMethodCommand.cs

@@ -1,5 +1,5 @@
 //
-//    Copyright (C) Microsoft.  All rights reserved.
+//    Copyright (c) Microsoft.  All rights reserved.


Extra spaces.
I believe we use common pattern "Copyright (c) Microsoft. All rights reserved."

iSazonov · 2017-10-25T07:10:32Z

src/powershell-native/nativemsh/pwrshcommon/ClrHostWrapper.h

@@ -1,7 +1,7 @@
 // ----------------------------------------------------------------------
 //
 //  Microsoft Windows NT
-//  Copyright (C) Microsoft Corporation, 2014.
+//  Copyright (c) Microsoft Corporation, 2014.


iSazonov · 2017-10-25T07:10:55Z

src/powershell-native/nativemsh/pwrshcommon/NativeMsh.h

@@ -1,7 +1,7 @@
 // ----------------------------------------------------------------------
 //
 //  Microsoft Windows NT
-//  Copyright (C) Microsoft Corporation, 2005.
+//  Copyright (c) Microsoft Corporation, 2005.


iSazonov · 2017-10-25T07:11:18Z

src/powershell-native/nativemsh/pwrshexe/MshResources.rc

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 Microsoft Corporation
+// Copyright (c) Microsoft Corporation


iSazonov · 2017-10-25T07:11:56Z

src/powershell-native/nativemsh/pwrshplugin/pwrshheaders.h

@@ -1,7 +1,7 @@
 // ----------------------------------------------------------------------
 //
 //  Microsoft Windows NT
-//  Copyright (C) Microsoft Corporation, 2008.
+//  Copyright (c) Microsoft Corporation, 2008.


iSazonov · 2017-10-25T07:13:20Z

...es/Microsoft.PowerShell.Security/TestData/CatalogTestData/UserConfigProv/UserConfigProv.psd1

@@ -2,7 +2,7 @@
    ModuleVersion = '3.0.0.1'
    Author = 'fayzas'
    CompanyName = 'Microsoft Corporation'
-    Copyright = '(c) 2013 Microsoft Corporation. All rights reserved.'
+    Copyright (c) Microsoft Corporation. All rights reserved.'


Typo. Please revert "Copyright = "

iSazonov · 2017-10-25T07:13:54Z

test/tools/Modules/HelpersCommon/HelpersCommon.psd1

@@ -12,7 +12,7 @@ GUID = 'cc1c8e94-51d1-4bc1-b508-62bc09f02f54'

 CompanyName = 'Microsoft Corporation'

-Copyright = 'Copyright (C) Microsoft Corporation, All rights reserved.'
+Copyright = 'Copyright (c) Microsoft Corporation, All rights reserved.'


Please replace "," with dot.
I believe we use common pattern "Copyright (c) Microsoft. All rights reserved."

Below too.

iSazonov · 2017-10-25T07:14:29Z

tools/packaging/packaging.psd1

@@ -2,7 +2,7 @@
 GUID="41857994-4283-4757-a932-0b0edb104913"
 Author="Microsoft Corporation"
 CompanyName="Microsoft Corporation"
-Copyright="© Microsoft Corporation. All rights reserved."
+Copyright="(c) Microsoft Corporation. All rights reserved."


iSazonov · 2017-10-25T07:14:43Z

tools/packaging/project/powershell.nuspec

@@ -11,7 +11,7 @@
    <projectUrl>https://github.com/powershell/powershell</projectUrl>
    <iconUrl>https://github.com/PowerShell/PowerShell/blob/master/assets/Powershell_64.png</iconUrl>
    <description>This package contains the PowerShell Core for $runtime$.</description>
-    <copyright>Copyright © Microsoft Corporation</copyright>
+    <copyright>Copyright (c) Microsoft Corporation</copyright>


SteveL-MSFT · 2017-10-25T08:45:41Z

@iSazonov I think I got all of them.

iSazonov

Oh, so many unrelated formatting changes! - I'm afraid I missed something.

iSazonov · 2017-10-25T08:54:36Z

src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimSessionCommand.cs

@@ -1,5 +1,5 @@
 //
-//    Copyright (C) Microsoft.  All rights reserved.
+//    Copyright (c) Microsoft Corporation. All Rights Reserved.


Rights Reserved -> rights reserved.

I see some files has the inconsistency.

I'll replace them all

iSazonov · 2017-10-25T09:08:30Z

src/System.Management.Automation/engine/InternalCommands.cs

@@ -295,12 +295,12 @@ protected override void ProcessRecord()
                                else
                                {
                                    // we write null out because:
-                                    // PS C:\> �$null | ForEach-object {$_.aa} | ForEach-Object {$_ + 3}�
+                                    // PS C:\> �$null | ForEach-object {$_.aa} | ForEach-Object {$_ + 3}�


Ah, @SteveL-MSFT please review the whole file - unicode chars?

Will fix and replace the 'fancy quote' with a 'regular quote' character

iSazonov · 2017-10-25T09:45:23Z

src/System.Management.Automation/help/CommandHelpProvider.cs

@@ -585,7 +585,7 @@ private string FindHelpFile(CmdletInfo cmdletInfo)
                // e.g., <AssemblyName>.ni.dll as supposed to <AssemblyName>.dll.

                // When cmdlet metadata is generated for the 'HelpFile' field, we use the name assembly and we append '-Help.xml' to it.
-                // Because of this, if the cmdlet is part of an N�gen assembly, then 'HelpFile' field will be pointing to a help file which does not exist.
+                // Because of this, if the cmdlet is part of an N�gen assembly, then 'HelpFile' field will be pointing to a help file which does not exist.


Unicode char?

iSazonov · 2017-10-25T09:46:20Z

src/System.Management.Automation/help/CommandHelpProvider.cs

@@ -604,7 +604,7 @@ private string FindHelpFile(CmdletInfo cmdletInfo)
                    if (String.IsNullOrEmpty(location))
                    {
                        // If the help file could not be found, then it is possible that the actual assembly name is something like
-                        // <Name>.ni.dll, e.g., MyAssembly.ni.dll, so let�s try to find the original help file in the cmdlet metadata.
+                        // <Name>.ni.dll, e.g., MyAssembly.ni.dll, so let�s try to find the original help file in the cmdlet metadata.


Unicode char?

iSazonov · 2017-10-25T09:52:18Z

src/System.Management.Automation/engine/remoting/commands/NewPSSessionOptionCommand.cs

+        /// The duration for which PowerShell should wait before it times out on cancel operations
+        /// (close runspace or stop powershell). For instance, when the user hits ctrl-C,
+        /// New-PSSession cmdlet tries to call a stop on all remote runspaces which are in the Opening state.
+        /// The user wouldn�t mind waiting for 15 seconds, but this should be time bound and of a shorter duration.


Unicode char?

iSazonov · 2017-10-25T09:52:54Z

src/System.Management.Automation/engine/remoting/commands/NewPSSessionOptionCommand.cs

-        /// stop on all remote runspaces which are in the Opening state. The user 
-        /// wouldn�t mind waiting for 15 seconds, but this should be time bound and of a 
+        /// stop on all remote runspaces which are in the Opening state. The user
+        /// wouldn�t mind waiting for 15 seconds, but this should be time bound and of a


Unicode char?

SteveL-MSFT · 2017-10-26T04:17:23Z

Well, this turned out to be a much bigger set of changes than originally anticipated, but @iSazonov I appreciate your attention to detail. I think I got them all and reviewed them with https://github.com/PowerShell/PowerShell/pull/5210/files?w=1

iSazonov · 2017-10-26T04:42:32Z

src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1

@@ -2,7 +2,7 @@
 GUID="1DA87E53-152B-403E-98DC-74D7B4D63D59"
 Author="Microsoft Corporation"
 CompanyName="Microsoft Corporation"
-Copyright="© Microsoft Corporation. All rights reserved."
+Copyright="(c) Microsoft Corporation. All rights reserved."


Skipped "Copyright"
Copyright="Copyright (c) Microsoft Corporation. All rights reserved."

iSazonov · 2017-10-26T04:43:22Z

src/Modules/Windows-Core+Full/PSDiagnostics/PSDiagnostics.psd1

@@ -2,7 +2,7 @@
    GUID="c61d6278-02a3-4618-ae37-a524d40a7f44 "
    Author="Microsoft Corporation"
    CompanyName="Microsoft Corporation"
-    Copyright="© Microsoft Corporation. All rights reserved."
+    Copyright="(c) Microsoft Corporation. All rights reserved."


Skipped "Copyright"
Copyright="Copyright (c) Microsoft Corporation. All rights reserved."

iSazonov · 2017-10-26T04:43:49Z

src/Modules/Windows-Core/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1

@@ -2,7 +2,7 @@
 GUID="CA046F10-CA64-4740-8FF9-2565DBA61A4F"
 Author="Microsoft Corporation"
 CompanyName="Microsoft Corporation"
-Copyright="© Microsoft Corporation. All rights reserved."
+Copyright="(c) Microsoft Corporation. All rights reserved."


Skipped "Copyright"
Copyright="Copyright (c) Microsoft Corporation. All rights reserved."

iSazonov · 2017-10-26T04:44:14Z

src/Modules/Windows-Core/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1

@@ -2,7 +2,7 @@
 GUID="1DA87E53-152B-403E-98DC-74D7B4D63D59"
 Author="Microsoft Corporation"
 CompanyName="Microsoft Corporation"
-Copyright="© Microsoft Corporation. All rights reserved."
+Copyright="(c) Microsoft Corporation. All rights reserved."


Skipped "Copyright"
Copyright="Copyright (c) Microsoft Corporation. All rights reserved."

iSazonov · 2017-10-26T04:44:42Z

...ules/Windows-Full/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.psd1

@@ -4,7 +4,7 @@ ModuleVersion = '1.0.0.0'
 GUID = '8e362604-2c0b-448f-a414-a6a690a644e2'
 Author = 'Microsoft Corporation'
 CompanyName = 'Microsoft Corporation'
-Copyright = '© Microsoft Corporation. All rights reserved.'
+Copyright = '(c) Microsoft Corporation. All rights reserved.'


replaced unicode character representing single quote with a single quote

iSazonov

LGTM but I think we need someone else to check line by line because there's changes in code lines in cs files.

iSazonov · 2017-10-27T03:19:50Z

@SteveL-MSFT Many thanks that now we have nice copyright strings!

Please clarify (it seems I already asked):

We have Microsoft Copyright in most files and MIT for the Repo - is there a conflict? CoreFX has MIT copyright in all files and Repo. We have both Microsoft Copyright and MIT in LICENSE.txt and MIT in README.md.
What copyright should we add in new files or shouldn't?

SteveL-MSFT · 2017-10-27T04:14:13Z

@iSazonov

let me follow-up on that, but I don't think the copyright notice is really necessary
my understanding is that we really don't need to add it to new files

use consistent (c) for copyright symbol

029b5d5

SteveL-MSFT assigned daxian-dbw Oct 24, 2017

SteveL-MSFT requested a review from daxian-dbw October 24, 2017 10:49

SteveL-MSFT requested review from adityapatwardhan, anmenaga, BrucePay, dantraMSFT, HemantMahawar, JamesWTruher, joeyaiello, lzybkr, mirichmo, PaulHigin, TravisEz13 and vors as code owners October 24, 2017 10:49

PaulHigin approved these changes Oct 24, 2017

View reviewed changes

adityapatwardhan approved these changes Oct 24, 2017

View reviewed changes

markekraus approved these changes Oct 24, 2017

View reviewed changes

mirichmo suggested changes Oct 24, 2017

View reviewed changes

address Mike's comments to remove year from copyright notice

5c13c5c

mirichmo approved these changes Oct 25, 2017

View reviewed changes

iSazonov reviewed Oct 25, 2017

View reviewed changes

SteveL-MSFT force-pushed the copyright branch 2 times, most recently from abfcda3 to 78feb29 Compare October 25, 2017 08:34

address iSazonov's feedback

fa9a3d8

SteveL-MSFT force-pushed the copyright branch from 78feb29 to fa9a3d8 Compare October 25, 2017 08:45

SteveL-MSFT requested review from charub and Francisco-Gamino as code owners October 25, 2017 08:45

iSazonov reviewed Oct 25, 2017

View reviewed changes

SteveL-MSFT force-pushed the copyright branch 2 times, most recently from ed386da to f47fb18 Compare October 26, 2017 04:16

SteveL-MSFT force-pushed the copyright branch from f47fb18 to 0ea1015 Compare October 26, 2017 04:22

iSazonov reviewed Oct 26, 2017

View reviewed changes

SteveL-MSFT force-pushed the copyright branch 2 times, most recently from 4ab26f4 to 7c402e2 Compare October 26, 2017 05:04

SteveL-MSFT force-pushed the copyright branch from 7c402e2 to 079596e Compare October 26, 2017 05:10

iSazonov approved these changes Oct 26, 2017

View reviewed changes

daxian-dbw merged commit 4bc52d2 into PowerShell:master Oct 26, 2017

		@@ -1,4 +1,4 @@
		#Copyright (c) 2008 Microsoft Corporation
		#Copyright (c) Microsoft Corporation

		@@ -1,4 +1,4 @@
		// Copyright (C) 2005 Microsoft Corporation
		// Copyright (c) Microsoft Corporation

use consistent (c) for copyright symbol #5210

use consistent (c) for copyright symbol #5210

Conversation

SteveL-MSFT commented Oct 24, 2017

PaulHigin left a comment

Choose a reason for hiding this comment

adityapatwardhan left a comment

Choose a reason for hiding this comment

adityapatwardhan commented Oct 24, 2017

markekraus left a 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iSazonov Oct 25, 2017 • 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

iSazonov Oct 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SteveL-MSFT commented Oct 25, 2017

iSazonov left a 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

SteveL-MSFT commented Oct 26, 2017

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

iSazonov left a comment

Choose a reason for hiding this comment

iSazonov commented Oct 27, 2017

SteveL-MSFT commented Oct 27, 2017

iSazonov Oct 25, 2017 •

edited

Loading

iSazonov Oct 25, 2017 •

edited

Loading