Skip to content

Commit 7bce46b

Browse files
amitsaraTravisEz13
amitsara
authored and
TravisEz13
committed
Download latest version (6.2.0) of PSDesiredStateConfiguration nuget package. (PowerShell#9932)
1 parent f24428a commit 7bce46b

File tree

6 files changed

+51
-4
lines changed

6 files changed

+51
-4
lines changed

‎assets/files.wxs

+40
Original file line numberDiff line numberDiff line change
@@ -1667,6 +1667,38 @@
16671667
<Component Id="cmp9723892C7119DFDFD3A6FAE8027B053F" Guid="{C3A2E60E-7F0F-44D0-B54E-2E4B73CE7602}">
16681668
<File Id="fil52D468AAC368F8F9427B5AB0D5DF94F3" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\PSDesiredStateConfiguration\PSDesiredStateConfiguration.psm1" />
16691669
</Component>
1670+
<Directory Name="Configuration" Id="dir709A20AD6F5242A1805E8C5D775F584C">
1671+
<Directory Name="BaseRegistration" Id="dir46B77C0AFD5642C9A8A00107796F3AF0">
1672+
<Directory Name="en-US" Id="dirDC3198AB09D84802BC00C697A113698B">
1673+
<Component Id="cmp2CA89A2376A848BE849FBD5ECFD6738B" Guid="{5aa07e78-aa1e-45ba-9458-53c955a1cad0}">
1674+
<File Id="filB354FF41265E43498774FB1E8F86A3EE" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\PSDesiredStateConfiguration\Configuration\BaseRegistration\en-US\MSFT_MetaConfigurationExtensionClasses.Schema.mfl" />
1675+
</Component>
1676+
<Component Id="cmp0E915393766B4DC6A9A83EBA0C218BF4" Guid="{f34c5baa-ebd7-4387-8278-c6e08c7e0cd3}">
1677+
<File Id="fil426E09F768D94A1DA8B4B91B68926493" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\PSDesiredStateConfiguration\Configuration\BaseRegistration\en-US\MSFT_DSCMetaConfiguration.mfl" />
1678+
</Component>
1679+
<Component Id="cmp5DF3BF3BEEE34C329E690E094A3CAFA2" Guid="{83c41b13-ee86-4b79-bb10-9bd72c7c46b6}">
1680+
<File Id="filCEE0C3D2C1134C59921EE338A9F10BCA" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\PSDesiredStateConfiguration\Configuration\BaseRegistration\en-US\BaseResource.Schema.mfl" />
1681+
</Component>
1682+
</Directory>
1683+
<Component Id="cmp19F1175335B14CA5AC6F7ABA06E4DD34" Guid="{70007188-47ad-4fb0-9058-0695437d4072}">
1684+
<File Id="fil0BF7A56B763E4CAA8195E7E886484FCD" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\PSDesiredStateConfiguration\Configuration\BaseRegistration\MSFT_DSCMetaConfiguration.mof" />
1685+
</Component>
1686+
<Component Id="cmpF8DA47047FBD4A7B8F876059F4EDB73D" Guid="{51cd6ef2-adaa-4bb5-bd6d-56afe7d42fe8}">
1687+
<File Id="fil86FCEEBF9FE145D9BAA7D19769959F70" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\PSDesiredStateConfiguration\Configuration\BaseRegistration\BaseResource.schema.mof" />
1688+
</Component>
1689+
<Component Id="cmp44977EB99C0647F4941AA2711A81651F" Guid="{995f0d01-7810-4721-946d-3c9129f35cbc}">
1690+
<File Id="fil5909011A884C453C92EBDB5550791B6C" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\PSDesiredStateConfiguration\Configuration\BaseRegistration\MSFT_MetaConfigurationExtensionClasses.schema.mof" />
1691+
</Component>
1692+
</Directory>
1693+
</Directory>
1694+
<Component Id="cmp3AF5C6350FE04033B037554EA5060135" Guid="{6dcfea10-23b6-45b2-af13-3ecc336be073}">
1695+
<File Id="fil58E456DF33A141DFA4B165479510EA95" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\PSDesiredStateConfiguration\PSDesiredStateConfiguration.psd1" />
1696+
</Component>
1697+
<Directory Name="helpers" Id="dir4774426A44B041E1A377AE889D3FFB19">
1698+
<Component Id="cmp0125D538DA2E4396BC1D595250B69263" Guid="{fa08a658-e2ff-4789-867f-72a234aa58bb}">
1699+
<File Id="fil98D6A2CAE08A408BB0215CD1DD6C7A0F" KeyPath="yes" Source="$(env.ProductSourcePath)\Modules\PSDesiredStateConfiguration\helpers\DscResourceInfo.psm1" />
1700+
</Component>
1701+
</Directory>
16701702
</Directory>
16711703
<Directory Id="dirECE37E3EC3637A365744D075BD8132E9" Name="Microsoft.PowerShell.Management">
16721704
<Component Id="cmp6DAFD01CAA3A4C67185922F445EDE495" Guid="{D4374EC0-26FC-4607-AF6B-35721698E8A5}">
@@ -2940,6 +2972,14 @@
29402972
<ComponentRef Id="cmp6EEA835AD77246C8A01C0F3B8BB0568E" />
29412973
<ComponentRef Id="cmp8E8AE88416D44A4CA39F23E9C825A899" />
29422974
<ComponentRef Id="cmpCC4657AEF2A7400D984E1CE6418EF589" />
2975+
<ComponentRef Id="cmp2CA89A2376A848BE849FBD5ECFD6738B" />
2976+
<ComponentRef Id="cmp0E915393766B4DC6A9A83EBA0C218BF4" />
2977+
<ComponentRef Id="cmp19F1175335B14CA5AC6F7ABA06E4DD34" />
2978+
<ComponentRef Id="cmpF8DA47047FBD4A7B8F876059F4EDB73D" />
2979+
<ComponentRef Id="cmp3AF5C6350FE04033B037554EA5060135" />
2980+
<ComponentRef Id="cmp0125D538DA2E4396BC1D595250B69263" />
2981+
<ComponentRef Id="cmp44977EB99C0647F4941AA2711A81651F" />
2982+
<ComponentRef Id="cmp5DF3BF3BEEE34C329E690E094A3CAFA2" />
29432983
</ComponentGroup>
29442984
</Fragment>
29452985
</Wix>

‎nuget.config

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<clear />
55
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
66
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
7+
<add key="powershell_nuget" value="https://powershell.pkgs.visualstudio.com/PowerShell/_packaging/powershell/nuget/v3/index.json" />
78
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
89
<add key="PSGallery" value="https://www.powershellgallery.com/api/v2/" />
910
</packageSources>

‎src/powershell-unix/powershell-unix.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="PSDesiredStateConfiguration" Version="6.0.0-beta.8" />
41+
<PackageReference Include="PSDesiredStateConfiguration" Version="2.0" />
4242
<PackageReference Include="PowerShellHelpFiles" Version="1.0.0-*" />
4343
</ItemGroup>
4444

‎src/powershell-win-core/powershell-win-core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</ItemGroup>
5454

5555
<ItemGroup>
56-
<PackageReference Include="PSDesiredStateConfiguration" Version="6.0.0-beta.8" />
56+
<PackageReference Include="PSDesiredStateConfiguration" Version="2.0" />
5757
<PackageReference Include="PowerShellHelpFiles" Version="1.0.0-*" />
5858
</ItemGroup>
5959

‎test/powershell/Modules/PSDesiredStateConfiguration/MOF-Compilation.Tests.ps1

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@ Describe "DSC MOF Compilation" -tags "CI" {
77
}
88

99
BeforeAll {
10-
$env:DSC_HOME = Join-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath assets) -ChildPath dsc
10+
Import-Module PSDesiredStateConfiguration
11+
$dscModule = Get-Module PSDesiredStateConfiguration
12+
$baseSchemaPath = Join-Path $dscModule.ModuleBase 'Configuration'
13+
$testResourceSchemaPath = Join-Path -Path (Join-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath assets) -ChildPath dsc) schema
14+
15+
# Copy test resources to PSDesiredStateConfiguration module
16+
Copy-Item $testResourceSchemaPath $baseSchemaPath -Recurse -Force
17+
1118
$_modulePath = $env:PSModulePath
1219
$powershellexe = (get-process -pid $PID).MainModule.FileName
1320
$env:PSModulePath = join-path ([io.path]::GetDirectoryName($powershellexe)) Modules

‎tools/releaseBuild/signing.xml

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<file src="__INPATHROOT__\Modules\Microsoft.PowerShell.Security\Microsoft.PowerShell.Security.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.PowerShell.Security\Microsoft.PowerShell.Security.psd1" />
3838
<file src="__INPATHROOT__\Modules\Microsoft.PowerShell.Utility\Microsoft.PowerShell.Utility.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.PowerShell.Utility\Microsoft.PowerShell.Utility.psd1" />
3939
<file src="__INPATHROOT__\Modules\Microsoft.WSMan.Management\Microsoft.WSMan.Management.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.WSMan.Management\Microsoft.WSMan.Management.psd1" />
40-
<file src="__INPATHROOT__\Modules\PSDesiredStateConfiguration\PSDesiredStateConfiguration.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PSDesiredStateConfiguration\PSDesiredStateConfiguration.psm1" />
4140
<file src="__INPATHROOT__\Modules\PSDiagnostics\PSDiagnostics.psd1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PSDiagnostics\PSDiagnostics.psd1" />
4241
<file src="__INPATHROOT__\Modules\PSDiagnostics\PSDiagnostics.psm1" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\PSDiagnostics\PSDiagnostics.psm1" />
4342
<file src="__INPATHROOT__\Modules\Microsoft.WSMan.Management\WSMan.format.ps1xml" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Modules\Microsoft.WSMan.Management\WSMan.format.ps1xml" />

0 commit comments

Comments
 (0)