Merge pull request #650 from MicrosoftDocs/main

Changes from main to live

Author: msewaweru

.openpublishing.redirection.json

@@ -7,12 +7,12 @@
         },
         {
             "source_path": "microsoftgraph/docs-conceptual/tutorial-grant-delegated-api-permissions.md",
-            "redirect_url": "https://learn.microsoft.com/powershell/microsoftgraph/how-to-grant-revoke-api-permissions&pivots=grant-delegated-permissions",
+            "redirect_url": "https://learn.microsoft.com/powershell/microsoftgraph/how-to-grant-revoke-api-permissions?pivots=grant-delegated-permissions",
             "redirect_document_id": false
         },
         {
             "source_path": "microsoftgraph/docs-conceptual/tutorial-grant-app-only-api-permissions.md",
-            "redirect_url": "https://learn.microsoft.com/powershell/microsoftgraph/how-to-grant-revoke-api-permissions&pivots=grant-application-permissions",
+            "redirect_url": "https://learn.microsoft.com/powershell/microsoftgraph/how-to-grant-revoke-api-permissions?pivots=grant-application-permissions",
             "redirect_document_id": false
         },
         {

azure-pipelines/powershell-docs.yml

@@ -137,6 +137,13 @@ extends:
             targetType: 'filePath'
             pwsh: true
             filePath: scripts/RemoveBoilerPlateCode.ps1
+        - task: PowerShell@2
+          displayName: 'Remove invalid fullstops'
+          continueOnError: false
+          inputs:
+            targetType: 'filePath'
+            pwsh: true
+            filePath: scripts/RemoveInvalidFullStops.ps1
         - task: PowerShell@2
           displayName: 'Generate missing docs for aliased cmdlets'
           continueOnError: false

scripts/RemoveInvalidFullStops.ps1

@@ -0,0 +1,95 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+Param(
+    $ModulesToGenerate = @(),
+    [string] $ModuleMappingConfigPath = (Join-Path $PSScriptRoot "../microsoftgraph/config/ModulesMapping.jsonc")
+)
+function Get-GraphMapping {
+    $graphMapping = @{}
+    $graphMapping.Add("v1.0", "graph-powershell-1.0")
+    $graphMapping.Add("beta", "graph-powershell-beta")
+    return $graphMapping
+}
+
+function Remove-InvalidFullStops {
+    Param(
+        $ModulesToGenerate = @()
+    )
+
+    $ModulePrefix = "Microsoft.Graph"
+    $GraphMapping = Get-GraphMapping 
+    $GraphMapping.Keys | ForEach-Object {
+        $graphProfile = $_
+        Get-FilesByProfile -GraphProfile $graphProfile -GraphProfilePath $GraphMapping[$graphProfile] -ModulePrefix $ModulePrefix -ModulesToGenerate $ModulesToGenerate 
+    }
+    
+    git config --global user.email "[email protected]"
+    git config --global user.name "Timothy Wamalwa"
+    git add .
+    git commit -m "Removed invalid full stops from the beginning of lines" 	
+}
+function Get-FilesByProfile {
+    Param(
+        [ValidateSet("beta", "v1.0")]
+        [string] $GraphProfile = "v1.0",
+        [ValidateNotNullOrEmpty()]
+        [string] $GraphProfilePath = "graph-powershell-1.0",
+        [ValidateNotNullOrEmpty()]
+        [string] $ModulePrefix = "Microsoft.Graph",
+        [ValidateNotNullOrEmpty()]
+        $ModulesToGenerate = @()
+    )
+
+    $ModulesToGenerate | ForEach-Object {
+        $ModuleName = $_
+        Get-Files -GraphProfile $GraphProfile -GraphProfilePath $GraphProfilePath -Module $ModuleName -ModulePrefix $ModulePrefix
+    }
+
+}
+function Get-Files {
+    param(
+        [ValidateSet("beta", "v1.0")]
+        [string] $GraphProfile = "v1.0",
+        [ValidateNotNullOrEmpty()]
+        [string] $GraphProfilePath = "graph-powershell-1.0",
+        [ValidateNotNullOrEmpty()]
+        [string] $Module = "Users",
+        [ValidateNotNullOrEmpty()]
+        [string] $ModulePrefix = "Microsoft.Graph"
+    )
+    if ($GraphProfile -eq "beta") {
+        $ModulePrefix = "Microsoft.Graph.Beta"
+    }
+    $moduleImportName = "$ModulePrefix.$ModuleName"
+    $moduleDocsPath = Join-Path $PSScriptRoot "..\microsoftgraph\$GraphProfilePath\$moduleImportName"
+    Update-Files -ModuleDocsPath $moduleDocsPath
+     
+}
+
+
+
+function Update-Files {
+    Param(
+        [ValidateNotNullOrEmpty()]
+        [string] $ModuleDocsPath
+    )
+    $files = Get-ChildItem -Path $ModuleDocsPath -Filter *.md -Recurse
+    $files | ForEach-Object {
+        $FilePath = $_.FullName
+        # Read the file and remove any full stops at the beginning of a line
+        (Get-Content $FilePath) -replace '^\.', '' | Set-Content $FilePath
+    }
+}
+
+if (-not (Test-Path $ModuleMappingConfigPath)) {
+    Write-Error "Module mapping file not be found: $ModuleMappingConfigPath."
+}
+if ($ModulesToGenerate.Count -eq 0) {
+    [HashTable] $ModuleMapping = Get-Content $ModuleMappingConfigPath | ConvertFrom-Json -AsHashTable
+    $ModulesToGenerate = $ModuleMapping.Keys
+}
+Remove-InvalidFullStops -ModulesToGenerate $ModulesToGenerate
+
+
+
+