Skip to content

Commit a0cb77a

Browse files
authored
Merge branch 'master' into pses-fixes
2 parents e85f09d + 3274c23 commit a0cb77a

File tree

311 files changed

+692
-1142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

311 files changed

+692
-1142
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
#-------------------------------------------------------------------------------------------------------------
2-
# Copyright (c) Microsoft Corporation. All rights reserved.
3-
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
4-
#-------------------------------------------------------------------------------------------------------------
1+
# Copyright (c) Microsoft Corporation.
2+
# Licensed under the MIT License.
53

64
FROM mcr.microsoft.com/dotnet/core/sdk:2.1.802
75

.github/workflows/codeql-analysis.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
tags: [ v* ]
7+
pull_request:
8+
# The branches below must be a subset of the branches above
9+
branches: [ master ]
10+
paths-ignore: [ '**/*.md' ]
11+
schedule:
12+
- cron: '00 14 * * *' # Every morning at 7:00am PDT
13+
14+
jobs:
15+
analyze:
16+
name: Analyze
17+
runs-on: ubuntu-latest
18+
permissions:
19+
actions: read
20+
contents: read
21+
security-events: write
22+
23+
strategy:
24+
fail-fast: false
25+
matrix:
26+
language: [ 'csharp' ]
27+
28+
steps:
29+
- name: Checkout repository
30+
uses: actions/checkout@v2
31+
32+
# Initializes the CodeQL tools for scanning.
33+
- name: Initialize CodeQL
34+
uses: github/codeql-action/init@v1
35+
with:
36+
languages: ${{ matrix.language }}
37+
38+
- name: Build
39+
shell: pwsh
40+
run: scripts/azurePipelinesBuild.ps1
41+
42+
- name: Perform CodeQL Analysis
43+
uses: github/codeql-action/analyze@v1

.vscode/snippets.code-snippets

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@
3030
"Copyright header": {
3131
"prefix": "CopyrightHeader",
3232
"body": [
33-
"//",
34-
"// Copyright (c) Microsoft. All rights reserved.",
35-
"// Licensed under the MIT license. See LICENSE file in the project root for full license information.",
36-
"//"
33+
"// Copyright (c) Microsoft Corporation.",
34+
"// Licensed under the MIT License."
3735
],
3836
"description": "Copyright header"
3937
}

PowerShellEditorServices.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<VersionPrefix>2.4.1</VersionPrefix>
44
<VersionSuffix>preview.1</VersionSuffix>
55
<Company>Microsoft</Company>
6-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
6+
<Copyright>© Microsoft Corporation.</Copyright>
77
<LangVersion>9.0</LangVersion>
88
<PackageTags>PowerShell;editor;development;language;debugging</PackageTags>
99
<PackageLicenseUrl>https://raw.githubusercontent.com/PowerShell/PowerShellEditorServices/master/LICENSE</PackageLicenseUrl>

PowerShellEditorServices.build.ps1

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
#
2-
# Copyright (c) Microsoft. All rights reserved.
3-
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
4-
#
1+
# Copyright (c) Microsoft Corporation.
2+
# Licensed under the MIT License.
53

64
param(
75
[ValidateSet("Debug", "Release")]

build.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#!/usr/bin/env pwsh
2+
3+
# Copyright (c) Microsoft Corporation.
4+
# Licensed under the MIT License.
5+
26
param(
37
[Parameter()]
48
[switch]
@@ -96,4 +100,4 @@ if ($Bootstrap) {
96100
if($Test) {
97101
Invoke-Build Test
98102
}
99-
}
103+
}

docs/template/conceptual.html.primary.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
1+
{{!Copyright (c) Microsoft Corporation. Licensed under the MIT License.}}
22
{{!include(/^styles/.*/)}}
33
{{!include(/^fonts/.*/)}}
44
{{!include(favicon.ico)}}

docs/template/partials/class.tmpl.partial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
1+
{{!Copyright (c) Microsoft Corporation. Licensed under the MIT License.}}
22

33
{{^_disableContribution}}
44
{{#docurl}}<a href="{{docurl}}" class="pull-right mobile-hide"><span class="fa fa-github"></span>{{__global.improveThisDoc}}</a>{{/docurl}}

docs/template/partials/footer.tmpl.partial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
1+
{{!Copyright (c) Microsoft Corporation. Licensed under the MIT License.}}
22

33
<footer>
44
<div class="inner-footer">

docs/template/partials/head.tmpl.partial

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
1+
{{!Copyright (c) Microsoft Corporation. Licensed under the MIT License.}}
22

33
<head>
44
<meta charset="utf-8">
@@ -25,4 +25,4 @@
2525
ga('send', 'pageview');
2626
</script>
2727
-->
28-
</head>
28+
</head>

0 commit comments

Comments
 (0)