From 6ffe09b60ab76ee81e3870fb38da184e9e21f43f Mon Sep 17 00:00:00 2001 From: Nick Ellis Date: Wed, 14 Sep 2022 11:46:03 -0400 Subject: [PATCH 1/2] Updating Resources for new DSCResource.Common --- CHANGELOG.md | 3 +++ .../DSC_CMDistributionPoint/DSC_CMDistributionPoint.psm1 | 2 +- .../DSC_CMPxeDistributionPoint/DSC_CMPxeDistributionPoint.psm1 | 2 +- .../DSC_CMReportingServicePoint.psm1 | 2 +- .../DSC_CMSiteSystemServer/DSC_CMSiteSystemServer.psm1 | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dbc67a4..0f72c976 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed issue in Reverse DSC that affected collection query capture when collection queries have quotes. +- Fixed an issue causing some tests to unexpectedly fail with a newer +version of DSCResource.Common + ## [3.0.0] - 2022-01-03 ### Added diff --git a/source/DSCResources/DSC_CMDistributionPoint/DSC_CMDistributionPoint.psm1 b/source/DSCResources/DSC_CMDistributionPoint/DSC_CMDistributionPoint.psm1 index 44a66df0..af322e4b 100644 --- a/source/DSCResources/DSC_CMDistributionPoint/DSC_CMDistributionPoint.psm1 +++ b/source/DSCResources/DSC_CMDistributionPoint/DSC_CMDistributionPoint.psm1 @@ -592,7 +592,7 @@ function Test-TargetResource 'EnableBranchCache','EnableLedbat') } - $result = Test-DscParameterState @testParams -Verbose + $result = Test-DscParameterState @testParams -Verbose -TurnOffTypeChecking if ($BoundaryGroups) { diff --git a/source/DSCResources/DSC_CMPxeDistributionPoint/DSC_CMPxeDistributionPoint.psm1 b/source/DSCResources/DSC_CMPxeDistributionPoint/DSC_CMPxeDistributionPoint.psm1 index 2e235ed0..407f33d8 100644 --- a/source/DSCResources/DSC_CMPxeDistributionPoint/DSC_CMPxeDistributionPoint.psm1 +++ b/source/DSCResources/DSC_CMPxeDistributionPoint/DSC_CMPxeDistributionPoint.psm1 @@ -331,7 +331,7 @@ function Test-TargetResource 'PxeServerResponseDelaySec','UserDeviceAffinity') } - $returnValue = Test-DscParameterState @testParams -Verbose + $returnValue = Test-DscParameterState @testParams -Verbose -TurnOffTypeChecking if ((-not [string]::IsNullOrEmpty($PxePassword)) -and ([string]::IsNullOrEmpty($state.PxePassword))) { diff --git a/source/DSCResources/DSC_CMReportingServicePoint/DSC_CMReportingServicePoint.psm1 b/source/DSCResources/DSC_CMReportingServicePoint/DSC_CMReportingServicePoint.psm1 index 66729a61..c64cf08f 100644 --- a/source/DSCResources/DSC_CMReportingServicePoint/DSC_CMReportingServicePoint.psm1 +++ b/source/DSCResources/DSC_CMReportingServicePoint/DSC_CMReportingServicePoint.psm1 @@ -321,7 +321,7 @@ function Test-TargetResource ValuesToCheck = ('DatabaseName','DatabaseServerName','Username','FolderName','ReportServerInstance') } - $result = Test-DscParameterState @testParams -Verbose + $result = Test-DscParameterState @testParams -Verbose -TurnOffTypeChecking if ($FolderName -or $ReportServerInstance) { diff --git a/source/DSCResources/DSC_CMSiteSystemServer/DSC_CMSiteSystemServer.psm1 b/source/DSCResources/DSC_CMSiteSystemServer/DSC_CMSiteSystemServer.psm1 index d7e8200a..31a21cc6 100644 --- a/source/DSCResources/DSC_CMSiteSystemServer/DSC_CMSiteSystemServer.psm1 +++ b/source/DSCResources/DSC_CMSiteSystemServer/DSC_CMSiteSystemServer.psm1 @@ -454,7 +454,7 @@ function Test-TargetResource ValuesToCheck = @('PublicFqdn','FdmOperation','UseSiteServerAccount','AccountName') } - $result = Test-DscParameterState @testParams -Verbose + $result = Test-DscParameterState @testParams -Verbose -TurnOffTypeChecking $proxyCheck = @('EnableProxy','ProxyServerName','ProxyServerPort','ProxyAccessAccount') From 24043d3a26d63761d1962494e614722cfcb0472f Mon Sep 17 00:00:00 2001 From: Nick Ellis Date: Wed, 14 Sep 2022 14:25:53 -0400 Subject: [PATCH 2/2] Updating pipeline --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a8ef7388..4404e30f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,7 +22,7 @@ stages: - job: Package_Module displayName: 'Package Module' pool: - vmImage: 'ubuntu 18.04' + vmImage: 'ubuntu 20.04' steps: - pwsh: | dotnet tool install --global GitVersion.Tool @@ -157,7 +157,7 @@ stages: displayName: 'Publish Code Coverage' dependsOn: Test_Unit pool: - vmImage: 'ubuntu 18.04' + vmImage: 'ubuntu 20.04' timeoutInMinutes: 0 steps: - pwsh: | @@ -207,7 +207,7 @@ stages: - job: Deploy_Module displayName: 'Deploy Module' pool: - vmImage: 'ubuntu 18.04' + vmImage: 'ubuntu 20.04' steps: - task: DownloadBuildArtifacts@0 displayName: 'Download Build Artifact'