Skip to content

Commit 495dea0

Browse files
authored
Move to .NET 5 preview.1 (PowerShell#12140)
1 parent 5da0697 commit 495dea0

28 files changed

Lines changed: 174 additions & 169 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.1.102
6+
FROM mcr.microsoft.com/dotnet/core/sdk:5.0.0-preview.1.20120.5
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.1, including pwsh (Debian 10)",
3+
"name": ".NET Core 5.0, 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.1</TargetFramework>
98+
<TargetFramework>netcoreapp5.0</TargetFramework>
9999
<LangVersion>8.0</LangVersion>
100100

101101
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

assets/files.wxs

Lines changed: 115 additions & 59 deletions
Large diffs are not rendered by default.

build.psm1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,8 +712,8 @@ function New-PSOptions {
712712
[ValidateSet("Debug", "Release", "CodeCoverage", '')]
713713
[string]$Configuration,
714714

715-
[ValidateSet("netcoreapp3.1")]
716-
[string]$Framework = "netcoreapp3.1",
715+
[ValidateSet("netcoreapp5.0")]
716+
[string]$Framework = "netcoreapp5.0",
717717

718718
# These are duplicated from Start-PSBuild
719719
# We do not use ValidateScript since we want tab completion
@@ -2410,7 +2410,7 @@ function Copy-PSGalleryModules
24102410
Restore-PSPackage -ProjectDirs (Split-Path $CsProjPath) -Force:$Force.IsPresent
24112411

24122412
$cache = dotnet nuget locals global-packages -l
2413-
if ($cache -match "info : global-packages: (.*)") {
2413+
if ($cache -match "global-packages: (.*)") {
24142414
$nugetCache = $Matches[1]
24152415
}
24162416
else {

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.1.102"
3+
"version": "5.0.100-preview.1.20155.7"
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
@@ -47,7 +47,7 @@
4747

4848
<ItemGroup>
4949
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
50-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.1.20120.5" />
5151
</ItemGroup>
5252

5353
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
<ItemGroup>
3434
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
35-
<PackageReference Include="System.Threading.AccessControl" Version="4.7.0" />
36-
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
35+
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.1.20120.5" />
36+
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.1.20120.5" />
3737
<PackageReference Include="NJsonSchema" Version="10.1.8" />
3838
</ItemGroup>
3939

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.7.0" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.1.20120.5" />
1212
</ItemGroup>
1313

1414
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
1919
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="4.7.0" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.0" />
21+
<PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.1.20120.5" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.1.20120.5" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.1.20120.5" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
2525
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
2626
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />

0 commit comments

Comments
 (0)