Merge pull request #3237 from pnp/dev

Merge to master for 2.2.0

Author: gautamdsheth

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,5 @@
+<!-- The PnP PowerShell team is currently a beta pilot for GitHub Copilot for Pull Requests, please leave this template unchanged for now -->
+
 Before creating a pull request, make sure that you have read the contribution file located at
 
 https://github.com/pnp/powerShell/blob/dev/CONTRIBUTING.md
@@ -17,3 +19,12 @@ Please describe the changes in the PR.
 * You can delete this section when you are submitting the pull request.* 
 * *Please update this PR information accordingly. We use this as part of our release notes in monthly communications.*
 * **Please target your PR to Dev branch. If you do not target the Dev branch we will not accept this PR.**
+
+
+## Summary 
+<!-- cspell:disable-next-line -->
+copilot:summary
+
+## Details 
+<!-- cspell:disable-next-line -->
+copilot:walkthrough

.github/workflows/builddocsite.yml

@@ -13,36 +13,33 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout master branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: master
           path: master
       - name: Checkout dev branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: dev
           path: dev
       - name: Checkout gh-pages branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: gh-pages
           path: gh-pages
-      - name : Install dependencies
-        run: |
-          wget https://github.com/dotnet/docfx/releases/download/v2.51/docfx.zip
-          sudo unzip docfx.zip -d /usr/local/lib/docfx
-          rm docfx.zip
-          echo '#!/bin/sh' | sudo tee -a /usr/local/bin/docfx > /dev/null
-          echo 'exec `which mono` $MONO_OPTIONS /usr/local/lib/docfx/docfx.exe "$@"' | sudo tee -a /usr/local/bin/docfx > /dev/null
-          sudo chmod +x /usr/local/bin/docfx
+      - name: Setup .NET 7.0
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.x
+      
+      - run: dotnet tool update -g docfx
+      
       - name: Build docs
         shell: pwsh
         run: |
           ./dev/pages/Build-Site.ps1
       - name: Add & Commit & Push
-        uses: EndBug/add-and-commit@v6
+        uses: EndBug/add-and-commit@v9
         with:
-          cwd: ./gh-pages
-          branch: gh-pages
-          push: true
-          token: ${{ secrets.GITHUB_TOKEN }}
+          cwd: ./gh-pages          
+          push: true          

.github/workflows/buildexternalhelp.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Building Help File
       env:
         RUNSINACTION: 1

.github/workflows/buildpr.yml

@@ -17,23 +17,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout PnP.Framework
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: pnp/pnpframework
         path: pnpframework
         ref: 'dev'
     - name: Checkout PnP.Core
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: pnp/pnpcore
         path: pnpcore
         ref: 'dev'  
     - name: Checkout PnP.PowerShell
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: powershell
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
            6.0.x
@@ -45,10 +45,10 @@ jobs:
       run: dotnet build --configuration Debug --no-restore -p:WarningLevel=0
       working-directory: pnpcore/src/sdk/PnP.Core
     - name: Install PnP.Framework dependencies
-      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"
+      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"
       working-directory: pnpframework/src/lib
     - name: Build PnP.Framework
-      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"
+      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"
       working-directory: pnpframework/src/lib/PnP.Framework
     - name: Install PnP.PowerShell dependencies
       run: dotnet restore -p:PnPFrameworkPath="..\..\..\pnpframework\src\lib\" -p:PnPCoreSdkPath="..\..\..\pnpcore\src\sdk\"

.github/workflows/checkdocumentationbuild.yml

@@ -12,26 +12,25 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: master
           path: master
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: dev
           path: dev
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: gh-pages
           path: gh-pages
-      - name : Install dependencies
-        run: |
-          wget https://github.com/dotnet/docfx/releases/download/v2.51/docfx.zip
-          sudo unzip docfx.zip -d /usr/local/lib/docfx
-          rm docfx.zip
-          echo '#!/bin/sh' | sudo tee -a /usr/local/bin/docfx > /dev/null
-          echo 'exec `which mono` $MONO_OPTIONS /usr/local/lib/docfx/docfx.exe "$@"' | sudo tee -a /usr/local/bin/docfx > /dev/null
-          sudo chmod +x /usr/local/bin/docfx
+      - name: Setup .NET 7.0
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.x
+      
+      - run: dotnet tool update -g docfx
+      
       - name: Build docs
         shell: pwsh
         run: |

.github/workflows/cleanupnightlyreleases.yml

@@ -14,13 +14,13 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with: 
         ref: dev
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '5.0.x'    
+        dotnet-version: '6.0.x'
     - name: Unlist nightly nuget packages
       env:
         POWERSHELLGALLERY_API_KEY : ${{ secrets.POWERSHELLGALLERY_API_KEY }}

.github/workflows/nightlyrelease.yml

@@ -11,14 +11,12 @@ jobs:
 
     steps:
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: | 
-          3.1.301
-          5.x
           6.x
           7.x
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         ref: dev
         token: ${{ secrets.PAT }}
@@ -34,18 +32,16 @@ jobs:
           $version = Get-Content version.txt -raw
           "BUILDVERSION=$version" | Out-File $env:GITHUB_ENV -Encoding utf8 -Append
     - name: Add & Commit
-      uses: EndBug/add-and-commit@v6
+      uses: EndBug/add-and-commit@v9
       with:
         message: 'Nightly publish to PowerShell Gallery'
         tag: '${{env.BUILDVERSION}}-nightly --force'
-        push: true
-        branch: dev
-        token: ${{ secrets.PAT }}
+        push: true        
   publish-docker-windows-2022:
     runs-on: windows-2022
     needs: [ build ]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build an image
       run: |
         $VERSION="$(cat ./version.txt)-nightly"
@@ -59,7 +55,7 @@ jobs:
     runs-on: windows-2019
     needs: [ build ]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build an image
       run: |
         $VERSION="$(cat ./version.txt)-nightly"
@@ -73,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ build ]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build an image
       run: |
         VERSION=$(cat ./version.txt)-nightly

.github/workflows/release.yml

@@ -8,7 +8,7 @@ jobs:
   publish-docker-windows-2022:
     runs-on: windows-2022
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build and Publish All
       shell: pwsh
       run: |
@@ -17,7 +17,7 @@ jobs:
   publish-docker-windows-2019:
     runs-on: windows-2019
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build and Publish All
       shell: pwsh
       run: |
@@ -26,7 +26,7 @@ jobs:
   publish-docker-linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build and Publish All
       shell: pwsh
       run: |

.gitignore

@@ -217,4 +217,7 @@ ModelManifest.xml
 # TabsStudio generated files
 *.tss
 
+# MacOS
+.DS_Store
+
 #.vscode/