Merge branch 'dev' of https://github.com/gautamdsheth/powershell into…

… dev
gautamdsheth · Apr 5, 2023 · 0766834 · 0766834
2 parents 47c5f6e + f8d82d4
commit 0766834
Show file tree

Hide file tree

Showing 8 changed files with 4,496 additions and 4,474 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Added
 
+### Contributors
+
+- [dhiabedoui]
+
+## [2.1.1]
+
+### Fixed
+
+- Fixed an issue with the signing of the PnP PowerShell 2.1.0 release
+
+## [2.1.0]
+
+### Added
+
 - Added support for `.NET 6.0` since `.NET Core 3.1` support is getting deprecated. We have **removed** support for .NET Core 3.1, so users will have to update from `PowerShell 7.0.x` to `PowerShell 7.2.x or later` [#2292](https://github.com/pnp/powershell/pull/2292)
 - Added default table formatted output for `Get-PnPVivaConnectionsDashboardACE`
 - Added `Get-PnPAzureADServicePrincipal` which allows for service principals/application registrations to be retrieved from Azure Active Directory [#2551](https://github.com/pnp/powershell/pull/2551)
@@ -115,7 +129,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Sumit Kumar [sumitkumar0608]
 - [msjennywu]
 - [enthusol]
-- Ganesh Sanap [ganesh-sanap]
 - Chris R. [ChrisRo89]
 - Aimery Thomas [a1mery]
 - Ganesh Sanap [ganesh-sanap]
@@ -131,7 +144,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Leon Armston [LeonArmston]
 - Robin Meure [robinmeure]
 - Rohit Varghese [rohitvarghese96]
-- Arleta Wanat [PowershellScripts]
 - Erwin van Hunen [erwinvanhunen]
 - Marc Studer [studermarc]
 - [vin-ol]

diff --git a/README.md b/README.md
@@ -30,8 +30,11 @@ This library is open-source and community provided library with active community
 ---
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
 
-<img src="https://m365-visitor-stats.azurewebsites.net/pnp-powershell/readme" /> 
+
+<img src="https://m365-visitor-stats.azurewebsites.net/pnp-powershell/readme" />
+
 
 ## Updating from 1.x to 2.x
 
 Please refer to [this page](MIGRATE-1.0-to-2.0.md) while performing an update from your 1.x version to 2.x version of PnP PowerShell.
+
diff --git a/pages/articles/gettingstartedcontributing.md b/pages/articles/gettingstartedcontributing.md
@@ -187,7 +187,8 @@ If you have only updated documentation, so called .md files, there's no need to
 
    ![Build succeeded](./../images/contributing/vscodebuildsucceeded.png)
 
-   If it instead shows error like the one below, it means you still have a PowerShell session open somewhere your machine which has PnP PowerShell loaded and which blocks the build process to update the files. It can be frustrating at times to find the PowerShell session that is blocking the build process. If you're not sure which session is blocking the build process, you can try to close all PowerShell sessions and try again. If that doesn't work, you can try restarting Visual Studio Code.
+   If it instead shows an error like the one below, it means you still have a PowerShell session open somewhere your machine which has PnP PowerShell loaded and which blocks the build process to update the files. It can be frustrating at times to find the PowerShell session that is blocking the build process. If you're not sure which session is blocking the build process, you can try to close all PowerShell sessions and try again. If that doesn't work, you can try restarting Visual Studio Code.
+   If it you get the error "Path to shell executable "pwsh.exe" does not exist", open tasks.json file and change executable path "pwsh.exe" to the full path of your "C:\\Program Files\\PowerShell\\7\\pwsh.exe". 
 
    ![Build failed](./../images/contributing/vscodebuildfailed.png)
 

diff --git a/pages/articles/installation.md b/pages/articles/installation.md
@@ -49,7 +49,7 @@ Update-Module PnP.PowerShell -Scope CurrentUser
 If you want to update to the latest nightly built prerelease of PnP PowerShell for the current user, run:
 
 ```powershell
-Install-Module PnP.PowerShell -Scope CurrentUser -AllowPrerelease -Force
+Update-Module PnP.PowerShell -Scope CurrentUser -AllowPrerelease -Force
 ```
 
 # Uninstalling PnP PowerShell

diff --git a/pnpframework_hash.txt b/pnpframework_hash.txt
@@ -1 +1 @@
-0272579ce7ef7302410793b0cb0d54e49ab1455e
+82309d0abda1f1e48d6ace079b2085cd3f2a7e9d
diff --git a/pnppowershell_hash.txt b/pnppowershell_hash.txt
@@ -1 +1 @@
-b237ce45e2986de8c5b762aa3ac24fea3cab3f48
+081a4a4bdee77249944ffba242d4904c82e921ca
diff --git a/resources/predictor/PnP.PowerShell.Suggestions.nightly.json b/resources/predictor/PnP.PowerShell.Suggestions.nightly.json
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.0.56
+2.1.6
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0272579ce7ef7302410793b0cb0d54e49ab1455e
		82309d0abda1f1e48d6ace079b2085cd3f2a7e9d
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b237ce45e2986de8c5b762aa3ac24fea3cab3f48
		081a4a4bdee77249944ffba242d4904c82e921ca