Merge pull request #4039 from microsoft/Dev

Release 1.23.1213.1
microsoft · Dec 14, 2023 · 683fc50 · 683fc50
2 parents dde39dd + cd6b223
commit 683fc50
Show file tree

Hide file tree

Showing 439 changed files with 3,951 additions and 2,894 deletions.
diff --git a/.github/workflows/AzureCloud - Integration.yml b/.github/workflows/AzureCloud - Integration.yml
diff --git a/.github/workflows/Global - Integration - INTUNE.yml b/.github/workflows/Global - Integration - INTUNE.yml
@@ -0,0 +1,86 @@
+name: Global - Integration - INTUNE
+on: [push]
+
+jobs:
+  Integration-Global-INTUNE:
+    # The type of runner that the job will run on
+    runs-on: windows-latest
+
+    # Only when run from the main repo
+    if: github.repository == 'microsoft/Microsoft365DSC'
+
+    # 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@v3
+      - name: Install Microsoft365DSC
+        shell: pwsh
+        run: |
+          winrm quickconfig -force
+          $source = "./Modules/Microsoft365DSC/"
+          $destination = "C:\Program Files\WindowsPowerShell\Modules"
+          Copy-Item -Path $source -Recurse -Destination $destination -Container -Force
+          Update-M365DSCDependencies
+      - name: Configure Environment
+        shell: pwsh
+        run: |
+          Set-ExecutionPolicy Unrestricted -Force
+          Get-ChildItem "C:\Program Files\WindowsPowerShell\Modules" -Recurse | Unblock-File
+          Set-M365DSCTelemetryOption -Enabled $false
+          Set-Item -Path WSMan:\localhost\MaxEnvelopeSizekb -Value 99999
+      - name: Generate Integration Tests from Examples
+        shell: pwsh
+        run: |
+          Import-Module './Tests/Integration/M365DSCTestEngine.psm1'
+          New-M365DSCIntegrationTest -Workload INTUNE
+      - name: Commit Integration Tests
+        shell: pwsh
+        run: |
+          git config --local user.email "nicharl@microsoft.com"
+          git config --local user.name "NikCharlebois"
+          git add D:/a/Microsoft365DSC/Microsoft365DSC/Tests/Integration/*
+          git pull
+          git commit -m "Updated Intune Integration Tests"
+          git push
+          $SHA = git rev-parse HEAD
+          echo "commitid=$SHA" >> $env:GITHUB_OUTPUT
+      - name: Run Integration Tests
+        shell: powershell
+        env:
+          PUBLIC_USERNAME: ${{ secrets.PUBLIC_USERNAME }}
+          PUBLIC_PASSWORD: ${{ secrets.PUBLIC_PASSWORD }}
+        run: |
+          $CredPassword = ConvertTo-SecureString $env:PUBLIC_PASSWORD -AsPlainText -Force
+          $Credential = New-Object System.Management.Automation.PSCredential ($env:PUBLIC_USERNAME, $CredPassword)
+          try
+          {
+            & .\Tests\Integration\Microsoft365DSC\M365DSCIntegration.INTUNE.Tests.ps1 -Credential $Credential
+          }
+          catch
+          {
+            throw $_
+          }
+
+          try
+          {
+            $Result = Test-DSCConfiguration -Detailed -Verbose
+          }
+          catch
+          {
+            throw $_
+          }
+
+          if ($Result.InDesiredState -eq $false)
+          {
+            Write-Host -Message "Resources below are not in the Desired State:"
+            foreach ($Resource in $Result.ResourcesNotInDesiredState)
+            {
+                Write-Host $Resource.InstanceName
+            }
+
+            throw "Could not validate that the Tenant is in the Desired State"
+          }
+          else
+          {
+            Write-Host "All resources in the Tenant are in the Desired State"
+          }
diff --git a/.github/workflows/PublishGitHubPages.yml b/.github/workflows/PublishGitHubPages.yml
@@ -23,8 +23,8 @@ jobs:
         if: always()
         shell: pwsh
         run: |
-          git config --local user.email "nik.charlebois@microsoft.com"
-          git config --local user.name "Nik Charlebois"
+          git config --local user.email "nicharl@microsoft.com"
+          git config --local user.name "NikCharlebois"
           git add D:/a/Microsoft365DSC/Microsoft365DSC/docs/docs/*
           git pull
           git commit -m "Updated Resources and Cmdlet documentation pages"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Change log for Microsoft365DSC
 
+# 1.23.1213.1
+
+* IntuneEndpointDetectionAndResponsePolicyWindows10
+  * Fix issue with assignments
+    FIXES [#3904](https://github.com/microsoft/Microsoft365DSC/issues/3904)
+* IntuneAntivirusPolicyWindows10SettingCatalog
+  * Fix issue with Set-TargetResource when retrieving a policy from displayName
+    FIXES [#4003](https://github.com/microsoft/Microsoft365DSC/issues/4003)
+* IntuneWindowsUpdateForBusinessRingUpdateProfileWindows10
+  * Fix parameter name in assignment cmdlet
+    FIXES [#4007](https://github.com/microsoft/Microsoft365DSC/issues/4007)
+* DEPENDENCIES
+  * Updated Microsoft.Graph to version 2.11.1.
+  * Updated MSCloudLoginAssistant to version 1.1.3.
+
 # 1.23.1206.1
 
 * IntuneAntivirusPolicyWindows10SettingCatalog

diff --git a/...virusPolicyWindows10SettingCatalog/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog.psm1 b/...virusPolicyWindows10SettingCatalog/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog.psm1
@@ -896,7 +896,7 @@ function Set-TargetResource
             -TemplateReferenceId $templateReferenceId
 
         Update-IntuneDeviceConfigurationPolicy `
-            -DeviceConfigurationPolicyId $Identity `
+            -DeviceConfigurationPolicyId $currentPolicy.Identity `
             -Name $DisplayName `
             -Description $Description `
             -TemplateReferenceId $templateReferenceId `