PowerShell · andyleejordan · Apr 29, 2021 · Apr 28, 2021 · Apr 28, 2021 · andyleejordan
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,7 +1,5 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 FROM mcr.microsoft.com/dotnet/core/sdk:2.1.802
 

diff --git a/.vscode/snippets.code-snippets b/.vscode/snippets.code-snippets
@@ -30,10 +30,8 @@
 	"Copyright header": {
 		"prefix": "CopyrightHeader",
 		"body": [
-			"//",
-			"// Copyright (c) Microsoft. All rights reserved.",
-			"// Licensed under the MIT license. See LICENSE file in the project root for full license information.",
-			"//"
+			"// Copyright (c) Microsoft Corporation.",
+			"// Licensed under the MIT License."
 		],
 		"description": "Copyright header"
 	}

diff --git a/PowerShellEditorServices.Common.props b/PowerShellEditorServices.Common.props
@@ -3,7 +3,7 @@
     <VersionPrefix>2.4.1</VersionPrefix>
     <VersionSuffix>preview.1</VersionSuffix>
     <Company>Microsoft</Company>
-    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <Copyright>© Microsoft Corporation.</Copyright>
     <LangVersion>9.0</LangVersion>
     <PackageTags>PowerShell;editor;development;language;debugging</PackageTags>
     <PackageLicenseUrl>https://raw.githubusercontent.com/PowerShell/PowerShellEditorServices/master/LICENSE</PackageLicenseUrl>

diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 param(
     [ValidateSet("Debug", "Release")]

diff --git a/build.ps1 b/build.ps1
@@ -1,4 +1,8 @@
 #!/usr/bin/env pwsh
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 param(
     [Parameter()]
     [switch]
@@ -96,4 +100,4 @@ if ($Bootstrap) {
     if($Test) {
         Invoke-Build Test
     }
-}
+}
diff --git a/docs/template/conceptual.html.primary.tmpl b/docs/template/conceptual.html.primary.tmpl
@@ -1,4 +1,4 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+{{!Copyright (c) Microsoft Corporation. Licensed under the MIT License.}}
 {{!include(/^styles/.*/)}}
 {{!include(/^fonts/.*/)}}
 {{!include(favicon.ico)}}

diff --git a/docs/template/partials/class.tmpl.partial b/docs/template/partials/class.tmpl.partial
@@ -1,4 +1,4 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+{{!Copyright (c) Microsoft Corporation. Licensed under the MIT License.}}
 
 {{^_disableContribution}}
 {{#docurl}}<a href="{{docurl}}" class="pull-right mobile-hide"><span class="fa fa-github"></span>{{__global.improveThisDoc}}</a>{{/docurl}}

diff --git a/docs/template/partials/footer.tmpl.partial b/docs/template/partials/footer.tmpl.partial
@@ -1,4 +1,4 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+{{!Copyright (c) Microsoft Corporation. Licensed under the MIT License.}}
 
 <footer>
   <div class="inner-footer">

diff --git a/docs/template/partials/head.tmpl.partial b/docs/template/partials/head.tmpl.partial
@@ -1,4 +1,4 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+{{!Copyright (c) Microsoft Corporation. Licensed under the MIT License.}}
 
 <head>
   <meta charset="utf-8">
@@ -25,4 +25,4 @@
   ga('send', 'pageview');
   </script>
   -->
-</head>
+</head>
diff --git a/docs/template/partials/namespace.tmpl.partial b/docs/template/partials/namespace.tmpl.partial
@@ -1,4 +1,4 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+{{!Copyright (c) Microsoft Corporation. Licensed under the MIT License.}}
 
 {{^_disableContribution}}
 {{#docurl}}

diff --git a/docs/template/partials/navbar.tmpl.partial b/docs/template/partials/navbar.tmpl.partial
@@ -1,4 +1,4 @@
-{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+{{!Copyright (c) Microsoft Corporation. Licensed under the MIT License.}}
 
 <nav class="navbar navbar-inverse">
      <div class="container">

diff --git a/module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1 b/module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1
@@ -27,7 +27,7 @@ Author = 'Microsoft'
 CompanyName = 'Microsoft'
 
 # Copyright statement for this module
-Copyright = '(c) 2017 Microsoft. All rights reserved.'
+Copyright = '(c) 2021 Microsoft Corporation.'
 
 # Description of the functionality provided by this module
 Description = 'Provides added functionality to PowerShell Editor Services for the Visual Studio Code editor.'

diff --git a/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psd1 b/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psd1
@@ -24,7 +24,7 @@ Author = 'Microsoft'
 CompanyName = 'Microsoft'
 
 # Copyright statement for this module
-Copyright = '(c) 2017 Microsoft. All rights reserved.'
+Copyright = '(c) 2021 Microsoft Corporation.'
 
 # Description of the functionality provided by this module
 Description = 'Provides internal commands for PowerShell Editor Services that only work in an editor session.'

diff --git a/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psm1 b/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psm1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 Microsoft.PowerShell.Utility\Import-LocalizedData -BindingVariable Strings -FileName Strings -ErrorAction Ignore
 

diff --git a/module/PowerShellEditorServices/Commands/Private/BuiltInCommands.ps1 b/module/PowerShellEditorServices/Commands/Private/BuiltInCommands.ps1
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 Register-EditorCommand `
     -Name 'PowerShellEditorServices.OpenEditorProfile' `
     -DisplayName 'Open Editor Profile' `

diff --git a/module/PowerShellEditorServices/Commands/Public/Clear-Host.ps1 b/module/PowerShellEditorServices/Commands/Public/Clear-Host.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 Microsoft.PowerShell.Management\Get-Item function:Clear-Host | Microsoft.PowerShell.Management\Set-Item function:__clearhost
 

diff --git a/module/PowerShellEditorServices/Commands/Public/CmdletInterface.ps1 b/module/PowerShellEditorServices/Commands/Public/CmdletInterface.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 <#
 .EXTERNALHELP ..\PowerShellEditorServices.Commands-help.xml

diff --git a/module/PowerShellEditorServices/Commands/Public/ConvertFrom-ScriptExtent.ps1 b/module/PowerShellEditorServices/Commands/Public/ConvertFrom-ScriptExtent.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 function ConvertFrom-ScriptExtent {
     <#

diff --git a/module/PowerShellEditorServices/Commands/Public/ConvertTo-ScriptExtent.ps1 b/module/PowerShellEditorServices/Commands/Public/ConvertTo-ScriptExtent.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 function ConvertTo-ScriptExtent {
     <#

diff --git a/module/PowerShellEditorServices/Commands/Public/Find-Ast.ps1 b/module/PowerShellEditorServices/Commands/Public/Find-Ast.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 function Find-Ast {
     <#

diff --git a/module/PowerShellEditorServices/Commands/Public/Get-Token.ps1 b/module/PowerShellEditorServices/Commands/Public/Get-Token.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 function Get-Token {
     <#

diff --git a/module/PowerShellEditorServices/Commands/Public/Import-EditorCommand.ps1 b/module/PowerShellEditorServices/Commands/Public/Import-EditorCommand.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 function Import-EditorCommand {
     <#

diff --git a/module/PowerShellEditorServices/Commands/Public/Join-ScriptExtent.ps1 b/module/PowerShellEditorServices/Commands/Public/Join-ScriptExtent.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 function Join-ScriptExtent {
     <#

diff --git a/module/PowerShellEditorServices/Commands/Public/Out-CurrentFile.ps1 b/module/PowerShellEditorServices/Commands/Public/Out-CurrentFile.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 function Out-CurrentFile {
     <#

diff --git a/module/PowerShellEditorServices/Commands/Public/Set-ScriptExtent.ps1 b/module/PowerShellEditorServices/Commands/Public/Set-ScriptExtent.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 function Set-ScriptExtent {
     <#

diff --git a/module/PowerShellEditorServices/Commands/Public/Test-ScriptExtent.ps1 b/module/PowerShellEditorServices/Commands/Public/Test-ScriptExtent.ps1
@@ -1,7 +1,5 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 function Test-ScriptExtent {
     <#

diff --git a/module/PowerShellEditorServices/Start-EditorServices.ps1 b/module/PowerShellEditorServices/Start-EditorServices.ps1
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 <#
 .SYNOPSIS
     Starts the language and debug services from the PowerShellEditorServices module.

diff --git a/scripts/AddCopyrightHeaders.ps1 b/scripts/AddCopyrightHeaders.ps1
@@ -1,14 +1,10 @@
-#
-# Copyright (c) Microsoft. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 $copyrightHeaderString =
 @'
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 '@
 
 $global:updateCount = 0;
@@ -25,7 +21,7 @@ function Add-CopyrightHeaders($basePath)
 		if ($fileContent.StartsWith($copyrightHeaderString) -eq $false)
 		{
 			# Add the copyright header to the file
-			Set-Content $sourceFile.FullName ($copyrightHeaderString + "`r`n`r`n" + $fileContent)
+			Set-Content $sourceFile.FullName ($copyrightHeaderString + [Environment]::NewLine + [Environment]::NewLine + $fileContent)
 			Write-Output ("Updated {0}" -f (Resolve-Path $sourceFile.FullName -Relative))
 			$global:updateCount++
 		}

diff --git a/scripts/BuildDocs.ps1 b/scripts/BuildDocs.ps1
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 param([switch]$Serve, [switch]$Clean, [switch]$Publish)
 
 $toolsPath = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\tools")

diff --git a/scripts/FetchLatestBuild.ps1 b/scripts/FetchLatestBuild.ps1
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 param($buildVersion = $null)
 
 $releasePath = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\release")

diff --git a/scripts/PackageSignedBinaries.ps1 b/scripts/PackageSignedBinaries.ps1
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # This script assumes the FetchBuildBinaries.ps1 has been run and
 # the binaries in 'release\BinariesToSign' have been signed and
 # replaced.

diff --git a/scripts/PublishPackages.ps1 b/scripts/PublishPackages.ps1
@@ -1,3 +1,5 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 $releasePath = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\release")
 $finalPackagePath = [System.IO.Path]::GetFullPath("$releasePath\FinalPackages")
@@ -15,8 +17,8 @@ foreach ($package in $packages) {
     }
     else
     {
-        Write-Output "Pushed package $package.FullName"   
+        Write-Output "Pushed package $package.FullName"
     }
 }
 
-# TODO: Use Find-Package to verify that the package is there?
+# TODO: Use Find-Package to verify that the package is there?
diff --git a/scripts/azurePipelinesBuild.ps1 b/scripts/azurePipelinesBuild.ps1
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 $ErrorActionPreference = 'Stop'
 
 Set-PSRepository -Name PSGallery -InstallationPolicy Trusted | Out-Null

diff --git a/src/PowerShellEditorServices.Hosting/Commands/InvokeReadLineConstructorCommand.cs b/src/PowerShellEditorServices.Hosting/Commands/InvokeReadLineConstructorCommand.cs
@@ -1,7 +1,5 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using System;
 using System.Management.Automation;

diff --git a/src/PowerShellEditorServices.Hosting/Commands/InvokeReadLineForEditorServicesCommand.cs b/src/PowerShellEditorServices.Hosting/Commands/InvokeReadLineForEditorServicesCommand.cs
@@ -1,7 +1,5 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using System;
 using System.Management.Automation;

diff --git a/src/PowerShellEditorServices.Hosting/Commands/StartEditorServicesCommand.cs b/src/PowerShellEditorServices.Hosting/Commands/StartEditorServicesCommand.cs
@@ -1,7 +1,5 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using Microsoft.PowerShell.Commands;
 using System;

diff --git a/src/PowerShellEditorServices.Hosting/Configuration/EditorServicesConfig.cs b/src/PowerShellEditorServices.Hosting/Configuration/EditorServicesConfig.cs
@@ -1,7 +1,5 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using System.Collections.Generic;
 using System.Management.Automation;

diff --git a/src/PowerShellEditorServices.Hosting/Configuration/HostInfo.cs b/src/PowerShellEditorServices.Hosting/Configuration/HostInfo.cs
@@ -1,7 +1,5 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using System;
 

diff --git a/src/PowerShellEditorServices.Hosting/Configuration/HostLogger.cs b/src/PowerShellEditorServices.Hosting/Configuration/HostLogger.cs
@@ -1,7 +1,5 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using System;
 using System.Collections.Concurrent;

diff --git a/src/PowerShellEditorServices.Hosting/Configuration/SessionFileWriter.cs b/src/PowerShellEditorServices.Hosting/Configuration/SessionFileWriter.cs
@@ -1,7 +1,5 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 
 using System;
 using System.Collections.Generic;