Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.23.1213.1 #4039

Merged
merged 49 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
866ad6e
Fix parameter name in assignment cmdlet
ricmestre Dec 7, 2023
a9fac38
Fixes 3904 and 4003
William-Francillette Dec 8, 2023
4f52508
Updated Microsoft.Graph to 2.11.0
NikCharlebois Dec 11, 2023
cc5d940
Merge pull request #4015 from NikCharlebois/Updated-MicrosoftGraph
NikCharlebois Dec 11, 2023
3ba89db
Merge branch 'Dev' of https://github.com/microsoft/Microsoft365DSC in…
ricmestre Dec 11, 2023
12cc4d2
Updated MSCloudLoginAssistant to 1.1.3
NikCharlebois Dec 11, 2023
365c23a
Merge pull request #4017 from NikCharlebois/Updated-MSCloudLoginAssis…
NikCharlebois Dec 11, 2023
8ed33e2
Merge branch 'Dev' of https://github.com/microsoft/Microsoft365DSC in…
ricmestre Dec 11, 2023
691f0b5
First Commit of Multiple Ones
NikCharlebois Dec 12, 2023
7a9bc98
Merge pull request #4022 from NikCharlebois/Integration-Test-Improvem…
NikCharlebois Dec 12, 2023
d0ba1f7
Update Global - Integration - INTUNE.yml
NikCharlebois Dec 12, 2023
ee83004
Merge pull request #4023 from NikCharlebois/Integration-Test-Improvem…
NikCharlebois Dec 12, 2023
7c9e6a6
Update M365DSCTestEngine.psm1
NikCharlebois Dec 12, 2023
fc117da
Merge pull request #4024 from NikCharlebois/Integration-Test-Improvem…
NikCharlebois Dec 12, 2023
8c2e329
Update M365DSCTestEngine.psm1
NikCharlebois Dec 12, 2023
5cffcdb
Merge pull request #4025 from NikCharlebois/Integration-Test-Improvem…
NikCharlebois Dec 12, 2023
3a388f7
Update M365DSCTestEngine.psm1
NikCharlebois Dec 12, 2023
db57a10
Merge pull request #4026 from NikCharlebois/Integration-Test-Improvem…
NikCharlebois Dec 12, 2023
779ce98
Fixes Examples
NikCharlebois Dec 12, 2023
060a537
Merge pull request #4027 from NikCharlebois/Integration-Test-Improvem…
NikCharlebois Dec 12, 2023
fea9798
Updated Resources and Cmdlet documentation pages
NikCharlebois Dec 12, 2023
ceec365
Updated Intune Integration Tests
NikCharlebois Dec 12, 2023
7ee456d
Update Global - Integration - INTUNE.yml
NikCharlebois Dec 12, 2023
846720c
Merge pull request #4028 from NikCharlebois/Integration-Test-Improvem…
NikCharlebois Dec 12, 2023
2421132
Update Global - Integration - INTUNE.yml
NikCharlebois Dec 12, 2023
f93e29b
Merge pull request #4030 from NikCharlebois/Integration-Test-Improvem…
NikCharlebois Dec 12, 2023
781eae1
Update 2-RemoveDeviceCompliancePolicyAndroidDeviceOwner.ps1
NikCharlebois Dec 12, 2023
f830919
Merge pull request #4031 from NikCharlebois/Integration-Test-Improvem…
NikCharlebois Dec 12, 2023
9d283cd
Updated Resources and Cmdlet documentation pages
NikCharlebois Dec 12, 2023
2b583d0
Updated Intune Integration Tests
NikCharlebois Dec 12, 2023
15b5d8b
Merge branch 'fix4007' of github.com:ricmestre/Microsoft365DSC; branc…
ricmestre Dec 13, 2023
33c1499
Test deployed config and add error handling
ricmestre Dec 13, 2023
19682e8
This workflow is not required anymore
ricmestre Dec 13, 2023
4bea0d9
Release 1.23.1213.1
NikCharlebois Dec 13, 2023
292952e
Update M365DSCTestEngine.psm1
NikCharlebois Dec 14, 2023
588f19e
Merge pull request #4033 from ricmestre/integration
NikCharlebois Dec 14, 2023
5c5002d
Merge remote-tracking branch 'upstream/dev' into Release-1.23.1213.1
NikCharlebois Dec 14, 2023
609350a
Merge branch 'Dev' into fix3904
NikCharlebois Dec 14, 2023
9550254
Updated Intune Integration Tests
NikCharlebois Dec 14, 2023
02642a2
Merge pull request #4014 from William-Francillette/fix3904
NikCharlebois Dec 14, 2023
c5752a1
Merge branch 'Dev' into fix4007
NikCharlebois Dec 14, 2023
20f0116
Merge branch 'Dev' of https://github.com/microsoft/Microsoft365DSC in…
ricmestre Dec 14, 2023
e0d1c37
Merge branch 'fix4007' of github.com:ricmestre/Microsoft365DSC into f…
ricmestre Dec 14, 2023
345ec07
Fix typo
ricmestre Dec 14, 2023
5cc948a
Merge pull request #4008 from ricmestre/fix4007
NikCharlebois Dec 14, 2023
66cb7f5
Merge remote-tracking branch 'upstream/dev' into Release-1.23.1213.1
NikCharlebois Dec 14, 2023
6c5ab6a
Updated Graph
NikCharlebois Dec 14, 2023
3c1781c
Merge pull request #4034 from NikCharlebois/Release-1.23.1213.1
NikCharlebois Dec 14, 2023
cd6b223
Merge branch 'master' into Dev
NikCharlebois Dec 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
49 changes: 0 additions & 49 deletions .github/workflows/AzureCloud - Integration.yml

This file was deleted.

86 changes: 86 additions & 0 deletions .github/workflows/Global - Integration - INTUNE.yml
Original file line number Diff line number Diff line change
@@ -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 "[email protected]"
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"
}
4 changes: 2 additions & 2 deletions .github/workflows/PublishGitHubPages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ function Set-TargetResource
-TemplateReferenceId $templateReferenceId

Update-IntuneDeviceConfigurationPolicy `
-DeviceConfigurationPolicyId $Identity `
-DeviceConfigurationPolicyId $currentPolicy.Identity `
-Name $DisplayName `
-Description $Description `
-TemplateReferenceId $templateReferenceId `
Expand Down
Loading
Loading