Skip to content

Commit 5dc7a6c

Browse files
SteveL-MSFTdaxian-dbw
SteveL-MSFT
authored and
daxian-dbw
committed
Add Windows Compatibility Pack 2.0.0 to PS Core and adopt the official .NET Core 2.1 (#6958)
To support PowerShell modules built with .NET Windows Compatibility Pack, we decided that it was best to ship the WCP assemblies with PS Core. This also adds many new .NET APIs be default while only adding ~3.5 MB additional disk footprint (to a ~137 MB install currently). Also update the build to adopt the official .NET Core 2.1.
1 parent 57b3d33 commit 5dc7a6c

14 files changed

Lines changed: 150 additions & 59 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ after_success:
5959
# CACHE_VERSION is not used for anything other than invalidating the cache.
6060
env:
6161
global:
62-
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.300-rc1-2
62+
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.300
6363
- POWERSHELL_TELEMETRY_OPTOUT=1
6464

6565
# timeout uploading cache after 6 minutes (360 seconds)

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
image: Visual Studio 2017
44

5-
# cache version - netcoreapp.2.1-sdk.2.1.300-rc1
5+
# cache version - netcoreapp.2.1-sdk.2.1.300
66
cache:
77
- '%LocalAppData%\Microsoft\dotnet -> appveyor.yml'
88
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'

‎assets/files.wxs‎

Lines changed: 70 additions & 2 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>
@@ -140,7 +191,7 @@
140191
<File Id="fil8E8E3BF1C97D92DFEB4FC97D778F238F" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Runtime.CompilerServices.VisualC.dll" />
141192
</Component>
142193
<Component Id="cmp8777CA81FBD5C5FAC86993893043793D" Guid="{B2D9982B-D46A-4D69-AA16-CC7EC49D357F}">
143-
<File Id="fil9A6CE1B34698E9E81BC367B9E9CEBF25" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26426.02.dll" />
194+
<File Id="fil9A6CE1B34698E9E81BC367B9E9CEBF25" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26515.07.dll" />
144195
</Component>
145196
<Component Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" Guid="{8E01E3C2-0596-46D8-95DD-BCA308A88941}">
146197
<File Id="filEE7925E7A712381B024DAE39831F7AEB" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Threading.dll" />
@@ -437,7 +488,7 @@
437488
<File Id="fil69EA4231E04E7B76EE0676A3C7EB4F91" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Security.Cryptography.Pkcs.dll" />
438489
</Component>
439490
<Component Id="cmp87DE113A572097FF094F31D019BB29BE" Guid="{2773E961-6227-40EE-B293-2929168E960A}">
440-
<File Id="fil9320215B904D0997AADD8E1C11CA0998" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26426.02.dll" />
491+
<File Id="fil9320215B904D0997AADD8E1C11CA0998" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26515.07.dll" />
441492
</Component>
442493
<Component Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D" Guid="{2FC1414C-925B-4653-B376-0DC7114DAA4C}">
443494
<File Id="fil2FBB26045517B5A73BF6024C55539694" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-processthreads-l1-1-0.dll" />
@@ -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" />

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.1.300-rc1-008673"
3+
"version": "2.1.300"
44
}
55
}

‎src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
<ItemGroup>
5959
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
60-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0-rc1-26423-06" />
60+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
6161
</ItemGroup>
6262

6363
</Project>

‎src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<ItemGroup>
6868
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.7.0" />
6969
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.7.0" />
70-
<PackageReference Include="NJsonSchema" Version="9.9.10" />
70+
<PackageReference Include="NJsonSchema" Version="9.10.50" />
7171
</ItemGroup>
7272

7373
</Project>

‎src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
11-
<PackageReference Include="System.Security.Principal.Windows" Version="4.5.0-rc1-26423-06" />
11+
<PackageReference Include="System.Security.Principal.Windows" Version="4.5.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,22 @@
1616

1717
<ItemGroup>
1818
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
19-
<PackageReference Include="System.Data.SqlClient" Version="4.5.0-rc1-26423-06" />
19+
<PackageReference Include="System.Data.SqlClient" Version="4.5.0" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="4.5.0-rc1-26423-06" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.5.0-rc1-26423-06" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.0-rc1-26423-06" />
24-
<PackageReference Include="System.Threading.AccessControl" Version="4.5.0-rc1-26423-06" />
21+
<PackageReference Include="System.IO.Packaging" Version="4.5.0" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.5.0" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.0" />
24+
<PackageReference Include="System.Threading.AccessControl" Version="4.5.0" />
2525
<!-- the following package(s) are from https://github.com/dotnet/wfc -->
26-
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.0-rc1-26423-01" />
27-
<PackageReference Include="System.ServiceModel.Http" Version="4.5.0-rc1-26423-01" />
28-
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.5.0-rc1-26423-01" />
29-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.5.0-rc1-26423-01" />
30-
<PackageReference Include="System.ServiceModel.Security" Version="4.5.0-rc1-26423-01" />
31-
<PackageReference Include="System.Private.ServiceModel" Version="4.5.0-rc1-26423-01" />
26+
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.0" />
27+
<PackageReference Include="System.ServiceModel.Http" Version="4.5.0" />
28+
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.5.0" />
29+
<PackageReference Include="System.ServiceModel.Primitives" Version="4.5.0" />
30+
<PackageReference Include="System.ServiceModel.Security" Version="4.5.0" />
31+
<PackageReference Include="System.Private.ServiceModel" Version="4.5.0" />
3232
<!-- the source could not be found for the following package(s) -->
3333
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
34+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.0" />
3435
</ItemGroup>
3536

3637
</Project>

‎src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
1010
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
1111
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
12-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0-rc1-26423-06" />
12+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
1313
</ItemGroup>
1414

1515
<PropertyGroup>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
<ItemGroup>
1010
<ProjectReference Include="..\Microsoft.PowerShell.CoreCLR.Eventing\Microsoft.PowerShell.CoreCLR.Eventing.csproj" />
1111
<!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
12-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
12+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1313
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
14-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.5.0-rc1-26423-06" />
15-
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0-rc1-26423-06" />
16-
<PackageReference Include="System.Security.AccessControl" Version="4.5.0-rc1-26423-06" />
17-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.5.0-rc1-26423-06" />
18-
<PackageReference Include="System.Security.Permissions" Version="4.5.0-rc1-26423-06" />
19-
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0-rc1-26423-06" />
14+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.5.0" />
15+
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" />
16+
<PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
17+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.5.0" />
18+
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
19+
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.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*" />

0 commit comments

Comments
 (0)