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.

Sign up for GitHub

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

Jump to bottom

Fix/#3885 aad conditional access policy #3953

Merged
merged 13 commits into from
Jan 8, 2024
Merged

Fix/#3885 aad conditional access policy #3953

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
30755ce
Always include 'ExcludeApplication' AADConditionalAccessPolicy: Exclu…
sandrola Nov 20, 2023
f23e022
Add fix to Changelog
sandrola Nov 20, 2023
aaa6e98
Add condition to check attribute presence
sandrola Nov 22, 2023
a402fa1
Merge branch 'fix/#3885-AADConditionalAccessPolicy' of https://github…
sandrola Nov 28, 2023
4ad1c3a
Add Fix to Changelog
sandrola Nov 28, 2023
1758b9f
remove duplicate entry
sandrola Dec 8, 2023
50d687c
Update Changelog
sandrola Dec 21, 2023
e65a194
Merge branch 'Dev' into fix/#3885-AADConditionalAccessPolicy
sandrola Dec 21, 2023
4a6fed7
Merge branch 'microsoft:Dev' into fix/#3885-AADConditionalAccessPolicy
sandrola Jan 3, 2024
e98e6c6
Move to unreleased ChangeLog
sandrola Jan 3, 2024
d9a64e1
wip
sandrola Jan 8, 2024
ca44648
Add to unreased
sandrola Jan 8, 2024
0b3b719
Merge branch 'Dev' into fix/#3885-AADConditionalAccessPolicy
sandrola Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Change log for Microsoft365DSC

# UNRELEASED
* AADConditionalAccessPolicy
* FIXES [[#3885](https://github.com/microsoft/Microsoft365DSC/issues/3885)]
* AADRoleSetting
* Export sorted by DisplayName for better comparison
* Enable Filter property to be used on export
Expand All @@ -27,6 +29,8 @@
* AADServicePrincipal
* Added support to define members.
FIXES [#3902](https://github.com/microsoft/Microsoft365DSC/issues/3902)
* AADConditionalAccessPolicy
NikCharlebois marked this conversation as resolved.
Show resolved Hide resolved
* FIXES [[#3885](https://github.com/microsoft/Microsoft365DSC/issues/3885)]
* EXOCASMailboxPlan
* Fixes an issue where we are not able to set the settings of a CAS
Mailbox Plan by specifying the Identity without the GUID in the name.
Expand Down
2 changes: 1 addition & 1 deletion ...t365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ function Set-TargetResource
{
$conditions.Applications.Add('IncludeApplications', $IncludeApplications)
}
if ($ExcludeApplications)
if ($currentParameters.ContainsKey("ExcludeApplications"))
sandrola marked this conversation as resolved.
Show resolved Hide resolved
{
$conditions.Applications.Add('ExcludeApplications', $ExcludeApplications)
}
Expand Down