Skip to content

Commit 6c0fa8b

Browse files
author
Steve Lee (POWERSHELL)
committed
[feature]
revert ref to System.Text.Encoding.CodePages to 4.3.0 as newer versions don't have Unix runtime updated files.wxs
1 parent fdf87e4 commit 6c0fa8b

4 files changed

Lines changed: 72 additions & 3 deletions

File tree

‎assets/files.wxs‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,57 @@
44
<?define FileArchitecture = "$(env.FileArchitecture)" ?>
55
<Fragment>
66
<DirectoryRef Id="$(var.ProductDirectoryName)">
7+
<Component Id="cmpCBE3857586454EB3B634B118E8EBD1D1" Guid="{CBE38575-8645-4EB3-B634-B118E8EBD1D1}">
8+
<File Id="filCBE3857586454EB3B634B118E8EBD1D1" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.Win32.SystemEvents.dll" />
9+
</Component>
10+
<Component Id="cmp22EA8B65E9784BB197A5CC42FBFF1788" Guid="{22EA8B65-E978-4BB1-97A5-CC42FBFF1788}">
11+
<File Id="fil22EA8B65E9784BB197A5CC42FBFF1788" KeyPath="yes" Source="$(env.ProductSourcePath)\System.CodeDom.dll" />
12+
</Component>
13+
<Component Id="cmp9F22B503FD4D4F0286514A511718FD7A" Guid="{9F22B503-FD4D-4F02-8651-4A511718FD7A}">
14+
<File Id="fil9F22B503FD4D4F0286514A511718FD7A" KeyPath="yes" Source="$(env.ProductSourcePath)\System.ComponentModel.Composition.dll" />
15+
</Component>
16+
<Component Id="cmp109FF222E78D452BA35ECFBCC4D82F90" Guid="{109FF222-E78D-452B-A35E-CFBCC4D82F90}">
17+
<File Id="fil109FF222E78D452BA35ECFBCC4D82F90" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Configuration.ConfigurationManager.dll" />
18+
</Component>
19+
<Component Id="cmp8814D879AFBA49C8B04509733BCBA556" Guid="{8814D879-AFBA-49C8-B045-09733BCBA556}">
20+
<File Id="fil8814D879AFBA49C8B04509733BCBA556" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Data.DataSetExtensions.dll" />
21+
</Component>
22+
<Component Id="cmpC519DEF229CC44BCBBAF204F0C0EBBC6" Guid="{C519DEF2-29CC-44BC-BBAF-204F0C0EBBC6}">
23+
<File Id="filC519DEF229CC44BCBBAF204F0C0EBBC6" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Data.Odbc.dll" />
24+
</Component>
25+
<Component Id="cmp9370476A1A344B97860E4F31A5EA7865" Guid="{9370476A-1A34-4B97-860E-4F31A5EA7865}">
26+
<File Id="fil9370476A1A344B97860E4F31A5EA7865" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Diagnostics.PerformanceCounter.dll" />
27+
</Component>
28+
<Component Id="cmpD0A5CF777C2D47DA966672B6B07D31A5" Guid="{D0A5CF77-7C2D-47DA-9666-72B6B07D31A5}">
29+
<File Id="filD0A5CF777C2D47DA966672B6B07D31A5" KeyPath="yes" Source="$(env.ProductSourcePath)\System.DirectoryServices.AccountManagement.dll" />
30+
</Component>
31+
<Component Id="cmpE67BDD4BD52046578E30F0B2181877BA" Guid="{E67BDD4B-D520-4657-8E30-F0B2181877BA}">
32+
<File Id="filE67BDD4BD52046578E30F0B2181877BA" KeyPath="yes" Source="$(env.ProductSourcePath)\System.DirectoryServices.dll" />
33+
</Component>
34+
<Component Id="cmpD552ACBBE2F4464EB20C6203358DA51A" Guid="{D552ACBB-E2F4-464E-B20C-6203358DA51A}">
35+
<File Id="filD552ACBBE2F4464EB20C6203358DA51A" KeyPath="yes" Source="$(env.ProductSourcePath)\System.DirectoryServices.Protocols.dll" />
36+
</Component>
37+
<Component Id="cmp71DF4DC4E289477C94DD068527756E12" Guid="{71DF4DC4-E289-477C-94DD-068527756E12}">
38+
<File Id="fil71DF4DC4E289477C94DD068527756E12" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Drawing.Common.dll" />
39+
</Component>
40+
<Component Id="cmp381447C118FA43D99F842934D6F0E6FB" Guid="{381447C1-18FA-43D9-9F84-2934D6F0E6FB}">
41+
<File Id="fil381447C118FA43D99F842934D6F0E6FB" KeyPath="yes" Source="$(env.ProductSourcePath)\System.IO.Ports.dll" />
42+
</Component>
43+
<Component Id="cmpC9B33CF1478E4A73A8C48853FEDBF014" Guid="{C9B33CF1-478E-4A73-A8C4-8853FEDBF014}">
44+
<File Id="filC9B33CF1478E4A73A8C48853FEDBF014" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Management.dll" />
45+
</Component>
46+
<Component Id="cmp9B8B3C498C954C47B35F15527E72C6D2" Guid="{9B8B3C49-8C95-4C47-B35F-15527E72C6D2}">
47+
<File Id="fil9B8B3C498C954C47B35F15527E72C6D2" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Runtime.Caching.dll" />
48+
</Component>
49+
<Component Id="cmp4477FC97930D452DA018C8F6A3D7D168" Guid="{4477FC97-930D-452D-A018-C8F6A3D7D168}">
50+
<File Id="fil4477FC97930D452DA018C8F6A3D7D168" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Security.Cryptography.ProtectedData.dll" />
51+
</Component>
52+
<Component Id="cmp30C10EC477714A76B2A8D0A957D1D6F3" Guid="{30C10EC4-7771-4A76-B2A8-D0A957D1D6F3}">
53+
<File Id="fil30C10EC477714A76B2A8D0A957D1D6F3" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Security.Cryptography.Xml.dll" />
54+
</Component>
55+
<Component Id="cmp31176C5A3BDB4A9F95171A4780D7D4D2" Guid="{31176C5A-3BDB-4A9F-9517-1A4780D7D4D2}">
56+
<File Id="fil31176C5A3BDB4A9F95171A4780D7D4D2" KeyPath="yes" Source="$(env.ProductSourcePath)\System.ServiceModel.Syndication.dll" />
57+
</Component>
758
<Component Id="cmp3CC027D3F160412C9F0044EBED3115DD" Guid="{8D7CAA67-8F28-422C-85FB-BDE04902E64F}">
859
<File Id="filFD2EF6BC74AF459D1BB52CA1E8C6E33B" KeyPath="yes" Source="$(env.ProductSourcePath)\NJsonSchema.dll" />
960
</Component>
@@ -1836,6 +1887,23 @@
18361887
</Fragment>
18371888
<Fragment>
18381889
<ComponentGroup Id="$(var.ProductDirectoryName)">
1890+
<ComponentRef Id="cmpCBE3857586454EB3B634B118E8EBD1D1" />
1891+
<ComponentRef Id="cmp22EA8B65E9784BB197A5CC42FBFF1788" />
1892+
<ComponentRef Id="cmp9F22B503FD4D4F0286514A511718FD7A" />
1893+
<ComponentRef Id="cmp109FF222E78D452BA35ECFBCC4D82F90" />
1894+
<ComponentRef Id="cmp8814D879AFBA49C8B04509733BCBA556" />
1895+
<ComponentRef Id="cmpC519DEF229CC44BCBBAF204F0C0EBBC6" />
1896+
<ComponentRef Id="cmp9370476A1A344B97860E4F31A5EA7865" />
1897+
<ComponentRef Id="cmpD0A5CF777C2D47DA966672B6B07D31A5" />
1898+
<ComponentRef Id="cmpE67BDD4BD52046578E30F0B2181877BA" />
1899+
<ComponentRef Id="cmpD552ACBBE2F4464EB20C6203358DA51A" />
1900+
<ComponentRef Id="cmp71DF4DC4E289477C94DD068527756E12" />
1901+
<ComponentRef Id="cmp381447C118FA43D99F842934D6F0E6FB" />
1902+
<ComponentRef Id="cmpC9B33CF1478E4A73A8C48853FEDBF014" />
1903+
<ComponentRef Id="cmp9B8B3C498C954C47B35F15527E72C6D2" />
1904+
<ComponentRef Id="cmp4477FC97930D452DA018C8F6A3D7D168" />
1905+
<ComponentRef Id="cmp30C10EC477714A76B2A8D0A957D1D6F3" />
1906+
<ComponentRef Id="cmp31176C5A3BDB4A9F95171A4780D7D4D2" />
18391907
<ComponentRef Id="cmp3CC027D3F160412C9F0044EBED3115DD" />
18401908
<ComponentRef Id="cmp98A11B3F71BACCA2DD0A4856577CD343" />
18411909
<ComponentRef Id="cmp3B130879A26D2E954251BB81E8948069" />

‎build.psm1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,8 @@ function Start-PSxUnit {
14381438

14391439
$requiredDependencies = @(
14401440
$nativeLib,
1441-
"$Content/Microsoft.Management.Infrastructure.dll"
1441+
"$Content/Microsoft.Management.Infrastructure.dll",
1442+
"$Content/System.Text.Encoding.CodePages.dll"
14421443
)
14431444

14441445
if((Test-Path $requiredDependencies) -notcontains $false)

‎src/System.Management.Automation/System.Management.Automation.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
1717
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.5.0" />
1818
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
19-
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
19+
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.3.0" />
2020
<!-- the following package(s) are from the powershell org -->
2121
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0-alpha*" />
2222
<PackageReference Include="PowerShell.Core.Instrumentation" Version="6.0.0-beta*" />

‎tools/packaging/packaging.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ function New-UnifiedNugetPackage
14701470
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.AccessControl'), [tuple]::Create('version', '4.5.0'))) > $null
14711471
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.Cryptography.Pkcs'), [tuple]::Create('version', '4.5.0'))) > $null
14721472
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.Permissions'), [tuple]::Create('version', '4.5.0'))) > $null
1473-
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Text.Encoding.CodePages'), [tuple]::Create('version', '4.5.0'))) > $null
1473+
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Text.Encoding.CodePages'), [tuple]::Create('version', '4.3.0'))) > $null
14741474
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.Management.Infrastructure'), [tuple]::Create('version', '1.0.0-alpha08'))) > $null
14751475
$deps.Add([tuple]::Create([tuple]::Create('id', 'PowerShell.Core.Instrumentation'), [tuple]::Create('version', '6.0.0-RC2'))) > $null
14761476
$deps.Add([tuple]::Create([tuple]::Create('id', 'libpsl'), [tuple]::Create('version', '6.0.0-rc'))) > $null

0 commit comments

Comments
 (0)