fix: Added Parameter ConditionalAccessPolicy to Resource SPOAccessControlSettings

[hosebei]

Pull Request (PR) description

Added Parameter ConditionalAccessPolicy to Resource SPOAccessControlSettings. Based on the PNP Module documentation:
https://pnp.github.io/powershell/cmdlets/Set-PnPTenant.html#-conditionalaccesspolicy

This Pull Request (PR) fixes the following issues

None

[hosebei]

@microsoft-github-policy-service agree

@microsoft-github-policy-service agree

[hosebei]

Hello, I'm unsure If I did something wrong with my second commit to correct the issues outlined by @NikCharlebois .
Or if I just need to wait, until this get checked again. Thanks a lot for a response in advance.

[andikrueger]

Could you please add a changelog entry within the unrelease section and outline this addition? Thanks!

[hosebei]

I have added the parameter to the unreleased section. I hope I did no mistake. Since I do not know how to resolve the Conflict furthermore.

[andikrueger]

I just resolved the conflict. Thanks for looking into it and your contribution!

[hosebei]

Thank you very much for correcting the conflict. I was unable to do it correctly.

[hosebei]

Hello @NikCharlebois , is there more to deliver, or can this be merged now?
Please tell me if I can adjust something to smoothen the process.

[hosebei]

hello @andikrueger , sorry to bother you again. since there was created a new release, the addition from this MR to the unreleased section does have a conflict again. I kindly ask you to resolve this conflict, since I think my changes would worsen the current situation.
do you have an idea why this MR was not included in the last version?

[andikrueger]

Just one minor comment.

[hosebei]

Hi @andikrueger please review my recent changes. :)

[hosebei]

Hi @andikrueger , I tried to fix the condlict with the last release by myself. but I still ended up with a conflict. I used this command to update my branch with the incoming commits from dev:
git checkout "pr/4290" && git merge dev
but the last released version of DSC in my code is now "1.24.214.1" instead of "1.24.214.2", when I check the changelog.md file in the dev branch.
I kindly ask you or @NikCharlebois to check if the parameter addition can be merged, and if you could resolve the conflict. thank you very much

[hosebei]

hello @andikrueger and @NikCharlebois, is there something that hinders this addition to the dev tree?

[hosebei]

Hi @NikCharlebois since your approval is required too, can you approve the merge request as well? thank you very much

[hosebei]

hi @andikrueger, i allowing myself to kindly ask you, if there is something to provide, so nik could approve this change?