-
Notifications
You must be signed in to change notification settings - Fork 517
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4075 from microsoft/Dev
Release 1.23.1220.1
- Loading branch information
Showing
471 changed files
with
17,050 additions
and
1,506 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| name: Global - Integration - AAD | ||
| on: [push] | ||
|
|
||
| jobs: | ||
| Integration-Global-AAD: | ||
| # 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: powershell | ||
| 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: powershell | ||
| 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 {Create} Integration Tests from Examples | ||
| shell: powershell | ||
| run: | | ||
| Import-Module './Tests/Integration/M365DSCTestEngine.psm1' | ||
| New-M365DSCIntegrationTest -Workload AAD -Step '1-Create' | ||
| - name: Commit {Create} Integration Tests | ||
| shell: powershell | ||
| 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 {Create} AAD Integration Tests" | ||
| git push | ||
| $SHA = git rev-parse HEAD | ||
| echo "commitid=$SHA" >> $env:GITHUB_OUTPUT | ||
| - name: Run {Create} Integration Tests | ||
| shell: powershell | ||
| env: | ||
| INTEGRATION_USERNAME: ${{ secrets.INTEGRATION_USERNAME }} | ||
| INTEGRATION_PASSWORD: ${{ secrets.INTEGRATION_PASSWORD }} | ||
| run: | | ||
| $CredPassword = ConvertTo-SecureString $env:INTEGRATION_PASSWORD -AsPlainText -Force | ||
| $Credential = New-Object System.Management.Automation.PSCredential ($env:INTEGRATION_USERNAME, $CredPassword) | ||
| try | ||
| { | ||
| & .\Tests\Integration\Microsoft365DSC\M365DSCIntegration.AAD.Create.Tests.ps1 -Credential $Credential | ||
| } | ||
| catch | ||
| { | ||
| throw $_ | ||
| } | ||
| try | ||
| { | ||
| $Result = Test-DSCConfiguration -Detailed -Verbose -ErrorAction Stop | ||
| } | ||
| catch | ||
| { | ||
| throw $_ | ||
| } | ||
| Write-Host "" | ||
| 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" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,47 +14,47 @@ jobs: | |
| # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it | ||
| - uses: actions/checkout@v3 | ||
| - name: Install Microsoft365DSC | ||
| shell: pwsh | ||
| shell: powershell | ||
| 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 | ||
| shell: powershell | ||
| 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 | ||
| - name: Generate {Create} Integration Tests from Examples | ||
| shell: powershell | ||
| run: | | ||
| Import-Module './Tests/Integration/M365DSCTestEngine.psm1' | ||
| New-M365DSCIntegrationTest -Workload INTUNE | ||
| - name: Commit Integration Tests | ||
| shell: pwsh | ||
| New-M365DSCIntegrationTest -Workload INTUNE -Step '1-Create' | ||
| - name: Commit {Create} Integration Tests | ||
| shell: powershell | ||
| 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 commit -m "Updated {Create} Intune Integration Tests" | ||
| git push | ||
| $SHA = git rev-parse HEAD | ||
| echo "commitid=$SHA" >> $env:GITHUB_OUTPUT | ||
| - name: Run Integration Tests | ||
| - name: Run {Create} Integration Tests | ||
| shell: powershell | ||
| env: | ||
| PUBLIC_USERNAME: ${{ secrets.PUBLIC_USERNAME }} | ||
| PUBLIC_PASSWORD: ${{ secrets.PUBLIC_PASSWORD }} | ||
| INTEGRATION_USERNAME: ${{ secrets.INTEGRATION_USERNAME }} | ||
| INTEGRATION_PASSWORD: ${{ secrets.INTEGRATION_PASSWORD }} | ||
| run: | | ||
| $CredPassword = ConvertTo-SecureString $env:PUBLIC_PASSWORD -AsPlainText -Force | ||
| $Credential = New-Object System.Management.Automation.PSCredential ($env:PUBLIC_USERNAME, $CredPassword) | ||
| $CredPassword = ConvertTo-SecureString $env:INTEGRATION_PASSWORD -AsPlainText -Force | ||
| $Credential = New-Object System.Management.Automation.PSCredential ($env:INTEGRATION_USERNAME, $CredPassword) | ||
| try | ||
| { | ||
| & .\Tests\Integration\Microsoft365DSC\M365DSCIntegration.INTUNE.Tests.ps1 -Credential $Credential | ||
| & .\Tests\Integration\Microsoft365DSC\M365DSCIntegration.INTUNE.Create.Tests.ps1 -Credential $Credential | ||
| } | ||
| catch | ||
| { | ||
|
|
@@ -63,13 +63,15 @@ jobs: | |
| try | ||
| { | ||
| $Result = Test-DSCConfiguration -Detailed -Verbose | ||
| $Result = Test-DSCConfiguration -Detailed -Verbose -ErrorAction Stop | ||
| } | ||
| catch | ||
| { | ||
| throw $_ | ||
| } | ||
| Write-Host "" | ||
| if ($Result.InDesiredState -eq $false) | ||
| { | ||
| Write-Host -Message "Resources below are not in the Desired State:" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.