Skip to content

Commit 91726c8

Browse files
gautamdshethgautamdsheth
authored
Merge pull request #3237 from pnp/dev
Merge to master for 2.2.0
2 parents 4e9ba28 + d486336 commit 91726c8

File tree

673 files changed

+10989
-4332
lines changed

Some content is hidden

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

673 files changed

+10989
-4332
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<!-- The PnP PowerShell team is currently a beta pilot for GitHub Copilot for Pull Requests, please leave this template unchanged for now -->
2+
13
Before creating a pull request, make sure that you have read the contribution file located at
24

35
https://github.com/pnp/powerShell/blob/dev/CONTRIBUTING.md
@@ -17,3 +19,12 @@ Please describe the changes in the PR.
1719
* You can delete this section when you are submitting the pull request.*
1820
* *Please update this PR information accordingly. We use this as part of our release notes in monthly communications.*
1921
* **Please target your PR to Dev branch. If you do not target the Dev branch we will not accept this PR.**
22+
23+
24+
## Summary
25+
<!-- cspell:disable-next-line -->
26+
copilot:summary
27+
28+
## Details
29+
<!-- cspell:disable-next-line -->
30+
copilot:walkthrough

‎.github/workflows/builddocsite.yml‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,33 @@ jobs:
1313
env:
1414
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1515
- name: Checkout master branch
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
with:
1818
ref: master
1919
path: master
2020
- name: Checkout dev branch
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222
with:
2323
ref: dev
2424
path: dev
2525
- name: Checkout gh-pages branch
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2727
with:
2828
ref: gh-pages
2929
path: gh-pages
30-
- name : Install dependencies
31-
run: |
32-
wget https://github.com/dotnet/docfx/releases/download/v2.51/docfx.zip
33-
sudo unzip docfx.zip -d /usr/local/lib/docfx
34-
rm docfx.zip
35-
echo '#!/bin/sh' | sudo tee -a /usr/local/bin/docfx > /dev/null
36-
echo 'exec `which mono` $MONO_OPTIONS /usr/local/lib/docfx/docfx.exe "$@"' | sudo tee -a /usr/local/bin/docfx > /dev/null
37-
sudo chmod +x /usr/local/bin/docfx
30+
- name: Setup .NET 7.0
31+
uses: actions/setup-dotnet@v3
32+
with:
33+
dotnet-version: 7.x
34+
35+
- run: dotnet tool update -g docfx
36+
3837
- name: Build docs
3938
shell: pwsh
4039
run: |
4140
./dev/pages/Build-Site.ps1
4241
- name: Add & Commit & Push
43-
uses: EndBug/add-and-commit@v6
42+
uses: EndBug/add-and-commit@v9
4443
with:
45-
cwd: ./gh-pages
46-
branch: gh-pages
47-
push: true
48-
token: ${{ secrets.GITHUB_TOKEN }}
44+
cwd: ./gh-pages
45+
push: true

‎.github/workflows/buildexternalhelp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- name: Building Help File
1818
env:
1919
RUNSINACTION: 1

‎.github/workflows/buildpr.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout PnP.Framework
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121
with:
2222
repository: pnp/pnpframework
2323
path: pnpframework
2424
ref: 'dev'
2525
- name: Checkout PnP.Core
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2727
with:
2828
repository: pnp/pnpcore
2929
path: pnpcore
3030
ref: 'dev'
3131
- name: Checkout PnP.PowerShell
32-
uses: actions/checkout@v2
32+
uses: actions/checkout@v3
3333
with:
3434
path: powershell
3535
- name: Setup .NET Core
36-
uses: actions/setup-dotnet@v1
36+
uses: actions/setup-dotnet@v3
3737
with:
3838
dotnet-version: |
3939
6.0.x
@@ -45,10 +45,10 @@ jobs:
4545
run: dotnet build --configuration Debug --no-restore -p:WarningLevel=0
4646
working-directory: pnpcore/src/sdk/PnP.Core
4747
- name: Install PnP.Framework dependencies
48-
run: dotnet restore -p:PnPCoreSdkPath="..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\netstandard2.0\PnP.Core.dll" -p:PnPCoreSdkPathNet5="..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net5.0\PnP.Core.dll" -p:PnPCoreSdkPathNet6="..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net6.0\PnP.Core.dll" -p:PnPCoreSdkPathNet7="..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net7.0\PnP.Core.dll"
48+
run: dotnet restore -p:PnPCoreSdkPath="..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\netstandard2.0\PnP.Core.dll" -p:PnPCoreSdkPathNet6="..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net6.0\PnP.Core.dll" -p:PnPCoreSdkPathNet7="..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net7.0\PnP.Core.dll"
4949
working-directory: pnpframework/src/lib
5050
- name: Build PnP.Framework
51-
run: dotnet build --configuration Debug --no-restore -p:WarningLevel=0 -p:PnPCoreSdkPath="..\..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\netstandard2.0\PnP.Core.dll" -p:PnPCoreSdkPathNet5="..\..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net5.0\PnP.Core.dll" -p:PnPCoreSdkPathNet6="..\..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net6.0\PnP.Core.dll" -p:PnPCoreSdkPathNet7="..\..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net7.0\PnP.Core.dll"
51+
run: dotnet build --configuration Debug --no-restore -p:WarningLevel=0 -p:PnPCoreSdkPath="..\..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\netstandard2.0\PnP.Core.dll" -p:PnPCoreSdkPathNet6="..\..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net6.0\PnP.Core.dll" -p:PnPCoreSdkPathNet7="..\..\..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net7.0\PnP.Core.dll"
5252
working-directory: pnpframework/src/lib/PnP.Framework
5353
- name: Install PnP.PowerShell dependencies
5454
run: dotnet restore -p:PnPFrameworkPath="..\..\..\pnpframework\src\lib\" -p:PnPCoreSdkPath="..\..\..\pnpcore\src\sdk\"

‎.github/workflows/checkdocumentationbuild.yml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,25 @@ jobs:
1212

1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
with:
1717
ref: master
1818
path: master
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
with:
2121
ref: dev
2222
path: dev
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v3
2424
with:
2525
ref: gh-pages
2626
path: gh-pages
27-
- name : Install dependencies
28-
run: |
29-
wget https://github.com/dotnet/docfx/releases/download/v2.51/docfx.zip
30-
sudo unzip docfx.zip -d /usr/local/lib/docfx
31-
rm docfx.zip
32-
echo '#!/bin/sh' | sudo tee -a /usr/local/bin/docfx > /dev/null
33-
echo 'exec `which mono` $MONO_OPTIONS /usr/local/lib/docfx/docfx.exe "$@"' | sudo tee -a /usr/local/bin/docfx > /dev/null
34-
sudo chmod +x /usr/local/bin/docfx
27+
- name: Setup .NET 7.0
28+
uses: actions/setup-dotnet@v3
29+
with:
30+
dotnet-version: 7.x
31+
32+
- run: dotnet tool update -g docfx
33+
3534
- name: Build docs
3635
shell: pwsh
3736
run: |

‎.github/workflows/cleanupnightlyreleases.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
# Steps represent a sequence of tasks that will be executed as part of the job
1515
steps:
1616
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
with:
1919
ref: dev
20-
- name: Setup .NET Core
21-
uses: actions/setup-dotnet@v1
20+
- name: Setup .NET 6.0
21+
uses: actions/setup-dotnet@v3
2222
with:
23-
dotnet-version: '5.0.x'
23+
dotnet-version: '6.0.x'
2424
- name: Unlist nightly nuget packages
2525
env:
2626
POWERSHELLGALLERY_API_KEY : ${{ secrets.POWERSHELLGALLERY_API_KEY }}

‎.github/workflows/nightlyrelease.yml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ jobs:
1111

1212
steps:
1313
- name: Setup .NET Core
14-
uses: actions/setup-dotnet@v1
14+
uses: actions/setup-dotnet@v3
1515
with:
1616
dotnet-version: |
17-
3.1.301
18-
5.x
1917
6.x
2018
7.x
21-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2220
with:
2321
ref: dev
2422
token: ${{ secrets.PAT }}
@@ -34,18 +32,16 @@ jobs:
3432
$version = Get-Content version.txt -raw
3533
"BUILDVERSION=$version" | Out-File $env:GITHUB_ENV -Encoding utf8 -Append
3634
- name: Add & Commit
37-
uses: EndBug/add-and-commit@v6
35+
uses: EndBug/add-and-commit@v9
3836
with:
3937
message: 'Nightly publish to PowerShell Gallery'
4038
tag: '${{env.BUILDVERSION}}-nightly --force'
41-
push: true
42-
branch: dev
43-
token: ${{ secrets.PAT }}
39+
push: true
4440
publish-docker-windows-2022:
4541
runs-on: windows-2022
4642
needs: [ build ]
4743
steps:
48-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v3
4945
- name: Build an image
5046
run: |
5147
$VERSION="$(cat ./version.txt)-nightly"
@@ -59,7 +55,7 @@ jobs:
5955
runs-on: windows-2019
6056
needs: [ build ]
6157
steps:
62-
- uses: actions/checkout@v2
58+
- uses: actions/checkout@v3
6359
- name: Build an image
6460
run: |
6561
$VERSION="$(cat ./version.txt)-nightly"
@@ -73,7 +69,7 @@ jobs:
7369
runs-on: ubuntu-latest
7470
needs: [ build ]
7571
steps:
76-
- uses: actions/checkout@v2
72+
- uses: actions/checkout@v3
7773
- name: Build an image
7874
run: |
7975
VERSION=$(cat ./version.txt)-nightly

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
publish-docker-windows-2022:
99
runs-on: windows-2022
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212
- name: Build and Publish All
1313
shell: pwsh
1414
run: |
@@ -17,7 +17,7 @@ jobs:
1717
publish-docker-windows-2019:
1818
runs-on: windows-2019
1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
- name: Build and Publish All
2222
shell: pwsh
2323
run: |
@@ -26,7 +26,7 @@ jobs:
2626
publish-docker-linux:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v3
3030
- name: Build and Publish All
3131
shell: pwsh
3232
run: |

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,7 @@ ModelManifest.xml
217217
# TabsStudio generated files
218218
*.tss
219219

220+
# MacOS
221+
.DS_Store
222+
220223
#.vscode/

0 commit comments

Comments
 (0)