Skip to content

Commit 74eaf19

Browse files
adityapatwardhanadityapatwardhan
authored
Move to .NET Core 3.1 preview 1 (PowerShell#10798)
1 parent 169a0ce commit 74eaf19

22 files changed

Lines changed: 69 additions & 68 deletions

File tree

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
44
#-------------------------------------------------------------------------------------------------------------
55

6-
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100
6+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100-preview1
77

88
# Avoid warnings by switching to noninteractive
99
ENV DEBIAN_FRONTEND=noninteractive

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
22
{
3-
"name": ".NET Core 3.0, including pwsh (Debian 10)",
3+
"name": ".NET Core 3.1, including pwsh (Debian 10)",
44
"dockerFile": "Dockerfile",
55

66
// Uncomment the next line to run commands after the container is created.

‎PowerShell.Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<Company>Microsoft Corporation</Company>
9696
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
9797

98-
<TargetFramework>netcoreapp3.0</TargetFramework>
98+
<TargetFramework>netcoreapp3.1</TargetFramework>
9999
<LangVersion>8.0</LangVersion>
100100

101101
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎assets/files.wxs‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,9 +1190,6 @@
11901190
<File Id="fil1c8a95614a8348f9ac6982b3340a303c" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.MarkdownRender.xml" />
11911191
</Component>
11921192
<Directory Id="dir23E9C47466D341314C603F5C7118348B" Name="ref">
1193-
<Component Id="cmpB099C5A4EB94441FB3C157D6404DA2E7" Guid="{7faa6210-548b-48cf-ae70-1d7f1923c7d9}">
1194-
<File Id="fil9632C22AC57E4377B9C3D6812F263E86" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
1195-
</Component>
11961193
<Component Id="cmp50D8B0DCCF114B58987590FF8212ACB9" Guid="{4becf3e6-7053-4492-936d-387c84720b19}">
11971194
<File Id="filAAF1E2DE95144FAD97B91D1E8EA8ADC6" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Data.DataSetExtensions.dll" />
11981195
</Component>
@@ -1271,9 +1268,6 @@
12711268
<Component Id="cmp233ECE5484784D0C833558389DA72398" Guid="{67806c3f-fc40-4e44-aede-176848cdd97f}">
12721269
<File Id="filDB7C91DF3CB74AD6B9E8417C6A468C35" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Web.dll" />
12731270
</Component>
1274-
<Component Id="cmp13F0A9B5C32849FA842B36577C88BFEF" Guid="{3216a244-2fe5-4b6d-9f80-41f74e367df4}">
1275-
<File Id="fil7989C1B840624B7FB4BCF16566729152" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Diagnostics.DiagnosticSource.dll" />
1276-
</Component>
12771271
<Component Id="cmp4891B5387F1A4769AD551054026FF74E" Guid="{a4062104-969d-4683-9c5f-36bb6cab5798}">
12781272
<File Id="filA20634489AB749EBA2D0BB9CBF9E5F64" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.IO.MemoryMappedFiles.dll" />
12791273
</Component>
@@ -1634,15 +1628,21 @@
16341628
<Component Id="cmp770700CA06564FB187D1CD2A79AA3DA8" Guid="{c244e7e1-3cb0-4880-aba5-e2be4fd78fbf}">
16351629
<File Id="fil88BCFE5237EE44A6AF259F91B9DF39C0" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.IO.FileSystem.Watcher.dll" />
16361630
</Component>
1637-
<Component Id="cmpDF06C5F29CD741FDBFDD3B3FF2134738" Guid="{ce9893cc-1824-4c95-b084-d25e3504e88b}">
1638-
<File Id="filC170825F0A4C46CFBE741925672B0541" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
1639-
</Component>
1640-
<Component Id="cmp504FA9ED665C4D148AEE907B3380AFAA" Guid="{958b0471-6bc9-4bd4-8b57-36ff356ee399}">
1641-
<File Id="filDCCA3EFB76F64C599B47D289A0C6B23A" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
1642-
</Component>
16431631
<Component Id="cmpEA40E9164309426C88C4388FDCA9559D" Guid="{2c84f9de-c203-4551-bde8-71e9e7e21f45}">
16441632
<File Id="fil205C9BE7027A408B985D96F5EEF11594" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Threading.Channels.dll" />
16451633
</Component>
1634+
<Component Id="cmp34649490F5B04041A08E73D7A86D5A5A" Guid="{d8f897d8-16cd-41a0-b5d7-863f379b30a2}">
1635+
<File Id="fil2DDAEABD470A475E950B94AC186DAB2E" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
1636+
</Component>
1637+
<Component Id="cmpB3116053008E492C9B36C89BF682B8F7" Guid="{6572fcd7-3c98-4180-b3da-bdaeb21294cd}">
1638+
<File Id="fil0D09CC7B4B8A43369D0207AC861D8D21" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
1639+
</Component>
1640+
<Component Id="cmp859A3876902946E7B5B4965F90664C5D" Guid="{25192d48-42fc-4551-baec-cce4ecb420ea}">
1641+
<File Id="fil2E0E3963F95C47F3BEA7D5A5848D6F28" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Diagnostics.DiagnosticSource.dll" />
1642+
</Component>
1643+
<Component Id="cmpF1B0E6DCC3BD4797B206C879EF270062" Guid="{af38a3e7-6bc2-47c8-a83e-ee8bfd0cc8be}">
1644+
<File Id="fil2694AE6F8EB8473CBDF0F73A4E55164B" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
1645+
</Component>
16461646
</Directory>
16471647
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
16481648
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B" Guid="{CE8DDB7C-A16E-4A1E-80D5-9937D07A1723}">
@@ -3062,8 +3062,8 @@
30623062
<Component Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" Guid="{e0776aa4-b3aa-4a15-a497-697b510fba8c}">
30633063
<File Id="fil9120D0A4381F4B34B80AB37D2EFBCF7D" KeyPath="yes" Source="$(env.ProductSourcePath)\InstallPSCorePolicyDefinitions.ps1" />
30643064
</Component>
3065-
<Component Id="cmp916D506512B2490299EDA831FF6729CD" Guid="{614c1c6e-163a-4d82-accd-1f894ccac384}">
3066-
<File Id="fil5AF5BABB352B44428947D79DEBDD547A" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.46205.dll" />
3065+
<Component Id="cmpEC42F4F98D70437BB0E290A0E0FE1775" Guid="{5483092a-12c2-4e6c-b730-be491b8909c0}">
3066+
<File Id="filBE60A48C75214B7B810D695039AC47B5" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.50403.dll" />
30673067
</Component>
30683068
</DirectoryRef>
30693069
</Fragment>
@@ -3606,7 +3606,6 @@
36063606
<ComponentRef Id="cmpE4A3A9C6EBE34E9AAF4EB02937545542" />
36073607
<ComponentRef Id="cmp5297F3A0CC784D5FB179A2C5128882BA" />
36083608
<ComponentRef Id="cmpA5AD020C2A054BD299EA1D2439947B22" />
3609-
<ComponentRef Id="cmpB099C5A4EB94441FB3C157D6404DA2E7" />
36103609
<ComponentRef Id="cmp41E9A7E0470540228A69F13F8585089E" />
36113610
<ComponentRef Id="cmp50D8B0DCCF114B58987590FF8212ACB9" />
36123611
<ComponentRef Id="cmp0744A0E2DA694EFB97172A770E654F92" />
@@ -3632,8 +3631,6 @@
36323631
<ComponentRef Id="cmp44977EB99C0647F4941AA2711A81651F" />
36333632
<ComponentRef Id="cmp5DF3BF3BEEE34C329E690E094A3CAFA2" />
36343633
<ComponentRef Id="cmpE5F62B056F174A3E8843DFE8B70E3AA9" />
3635-
<ComponentRef Id="cmpDF06C5F29CD741FDBFDD3B3FF2134738" />
3636-
<ComponentRef Id="cmp504FA9ED665C4D148AEE907B3380AFAA" />
36373634
<ComponentRef Id="cmp0D4F53C257044BE1912BDD4E99A5F0DE" />
36383635
<ComponentRef Id="cmpEA40E9164309426C88C4388FDCA9559D" />
36393636
<ComponentRef Id="cmp30126C60BD784974B74EA45AE9B04032" />
@@ -3905,7 +3902,11 @@
39053902
<ComponentRef Id="cmpECBD8DFB18AD451AB3D81803DECC13BF" />
39063903
<ComponentRef Id="cmp01B3850D6E55468AA84B758FDE8CA59E" />
39073904
<ComponentRef Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" />
3908-
<ComponentRef Id="cmp916D506512B2490299EDA831FF6729CD" />
3905+
<ComponentRef Id="cmp34649490F5B04041A08E73D7A86D5A5A" />
3906+
<ComponentRef Id="cmpB3116053008E492C9B36C89BF682B8F7" />
3907+
<ComponentRef Id="cmp859A3876902946E7B5B4965F90664C5D" />
3908+
<ComponentRef Id="cmpEC42F4F98D70437BB0E290A0E0FE1775" />
3909+
<ComponentRef Id="cmpF1B0E6DCC3BD4797B206C879EF270062" />
39093910
</ComponentGroup>
39103911
</Fragment>
39113912
</Wix>

‎build.psm1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,8 +660,8 @@ function New-PSOptions {
660660
[ValidateSet("Debug", "Release", "CodeCoverage", '')]
661661
[string]$Configuration,
662662

663-
[ValidateSet("netcoreapp3.0")]
664-
[string]$Framework = "netcoreapp3.0",
663+
[ValidateSet("netcoreapp3.1")]
664+
[string]$Framework = "netcoreapp3.1",
665665

666666
# These are duplicated from Start-PSBuild
667667
# We do not use ValidateScript since we want tab completion

‎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": "3.0.100"
3+
"version": "3.1.100-preview1-014459"
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
@@ -54,7 +54,7 @@
5454

5555
<ItemGroup>
5656
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
57-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
57+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0-preview1.19504.10" />
5858
</ItemGroup>
5959

6060
</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
@@ -56,7 +56,7 @@
5656

5757
<ItemGroup>
5858
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" />
59-
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0" />
59+
<PackageReference Include="System.Threading.AccessControl" Version="4.7.0-preview1.19504.10" />
6060
<PackageReference Include="NJsonSchema" Version="10.0.27" />
6161
</ItemGroup>
6262

‎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.Diagnostics.EventLog" Version="4.6.0" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0-preview1.19504.10" />
1212
</ItemGroup>
1313

1414
</Project>

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

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

1717
<ItemGroup>
1818
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
19-
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
19+
<PackageReference Include="System.Data.SqlClient" Version="4.8.0-preview1.19504.10" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="4.6.0" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="4.6.0" />
21+
<PackageReference Include="System.IO.Packaging" Version="4.7.0-preview1.19504.10" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0-preview1.19504.10" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.0-preview1.19504.10" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
25-
<PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0" />
26-
<PackageReference Include="System.ServiceModel.Http" Version="4.6.0" />
27-
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0" />
28-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0" />
29-
<PackageReference Include="System.ServiceModel.Security" Version="4.6.0" />
30-
<PackageReference Include="System.Private.ServiceModel" Version="4.6.0" />
25+
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0-preview1.final" />
26+
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0-preview1.final" />
27+
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.7.0-preview1.final" />
28+
<PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0-preview1.final" />
29+
<PackageReference Include="System.ServiceModel.Security" Version="4.7.0-preview1.final" />
30+
<PackageReference Include="System.Private.ServiceModel" Version="4.7.0-preview1.final" />
3131
<!-- the source could not be found for the following package(s) -->
3232
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
33-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0" />
33+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="3.1.0-preview1.19504.10" />
3434
</ItemGroup>
3535

3636
</Project>

0 commit comments

Comments
 (0)