diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index f936207545e..0337b0f7d60 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100-preview1
# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3dafe5a50c0..3daba6f1dd2 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
{
- "name": ".NET Core 3.0, including pwsh (Debian 10)",
+ "name": ".NET Core 3.1, including pwsh (Debian 10)",
"dockerFile": "Dockerfile",
// Uncomment the next line to run commands after the container is created.
diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index f8c90bf678b..05ad339f565 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -95,7 +95,7 @@
Microsoft Corporation
(c) Microsoft Corporation. All rights reserved.
- netcoreapp3.0
+ netcoreapp3.1
8.0
true
diff --git a/assets/files.wxs b/assets/files.wxs
index eec4e1ec04e..c887be8dd61 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -1190,9 +1190,6 @@
-
-
-
@@ -1271,9 +1268,6 @@
-
-
-
@@ -1634,15 +1628,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3062,8 +3062,8 @@
-
-
+
+
@@ -3606,7 +3606,6 @@
-
@@ -3632,8 +3631,6 @@
-
-
@@ -3905,7 +3902,11 @@
-
+
+
+
+
+
diff --git a/build.psm1 b/build.psm1
index 79bcccc6ce1..7a0595c5bb0 100644
--- a/build.psm1
+++ b/build.psm1
@@ -650,8 +650,8 @@ function New-PSOptions {
[ValidateSet("Debug", "Release", "CodeCoverage", '')]
[string]$Configuration,
- [ValidateSet("netcoreapp3.0")]
- [string]$Framework = "netcoreapp3.0",
+ [ValidateSet("netcoreapp3.1")]
+ [string]$Framework = "netcoreapp3.1",
# These are duplicated from Start-PSBuild
# We do not use ValidateScript since we want tab completion
diff --git a/global.json b/global.json
index 79422f0cc1c..3d6091091f8 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "3.0.100"
+ "version": "3.1.100-preview1-014459"
}
}
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index ee25f9cb5d8..57c1f90e283 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@@ -54,7 +54,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index efe0c6a70e5..013e0fe8ea9 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -56,7 +56,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 163842a9c4e..b943b6257f8 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 5a31f2cbb18..298449038a6 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -16,21 +16,21 @@
-
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index d2158a4a9ae..a4b216fa2e7 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/src/ResGen/ResGen.csproj b/src/ResGen/ResGen.csproj
index fc0dcd7c6a0..71794f0790b 100644
--- a/src/ResGen/ResGen.csproj
+++ b/src/ResGen/ResGen.csproj
@@ -2,7 +2,7 @@
Generates C# typed bindings for .resx files
- netcoreapp3.0
+ netcoreapp3.1
resgen
Exe
true
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index c94c51b1fa4..ed10120fbd0 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/TypeCatalogGen/TypeCatalogGen.csproj b/src/TypeCatalogGen/TypeCatalogGen.csproj
index 7b963b907c4..fa8390c9970 100644
--- a/src/TypeCatalogGen/TypeCatalogGen.csproj
+++ b/src/TypeCatalogGen/TypeCatalogGen.csproj
@@ -2,7 +2,7 @@
Generates CorePsTypeCatalog.cs given powershell.inc
- netcoreapp3.0
+ netcoreapp3.1
TypeCatalogGen
Exe
true
diff --git a/test/Test.Common.props b/test/Test.Common.props
index ea20813e328..57afccc7772 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -4,7 +4,7 @@
Microsoft Corporation
(c) Microsoft Corporation. All rights reserved.
- netcoreapp3.0
+ netcoreapp3.1
8.0
true
diff --git a/test/tools/OpenCover/OpenCover.psm1 b/test/tools/OpenCover/OpenCover.psm1
index 488a20ac7b9..d00996a88eb 100644
--- a/test/tools/OpenCover/OpenCover.psm1
+++ b/test/tools/OpenCover/OpenCover.psm1
@@ -624,7 +624,7 @@ function Invoke-OpenCover
[parameter()]$OutputLog = "$home/Documents/OpenCover.xml",
[parameter()]$TestPath = "${script:psRepoPath}/test/powershell",
[parameter()]$OpenCoverPath = "$home/OpenCover",
- [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/netcoreapp3.0/win7-x64/publish",
+ [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/netcoreapp3.1/win7-x64/publish",
[parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
[parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
[parameter()]$PesterLogFormat = "NUnitXml",
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 360811f35b3..28cba8ee1c9 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index b077f405d21..884918076a2 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -128,14 +128,14 @@ function Start-PSPackage {
-not $Script:Options -or ## Start-PSBuild hasn't been executed yet
-not $PSModuleRestoreCorrect -or ## Last build didn't specify '-PSModuleRestore' correctly
$Script:Options.Configuration -ne $Configuration -or ## Last build was with configuration other than 'Release'
- $Script:Options.Framework -ne "netcoreapp3.0" ## Last build wasn't for CoreCLR
+ $Script:Options.Framework -ne "netcoreapp3.1" ## Last build wasn't for CoreCLR
} else {
-not $Script:Options -or ## Start-PSBuild hasn't been executed yet
-not $crossGenCorrect -or ## Last build didn't specify '-CrossGen' correctly
-not $PSModuleRestoreCorrect -or ## Last build didn't specify '-PSModuleRestore' correctly
$Script:Options.Runtime -ne $Runtime -or ## Last build wasn't for the required RID
$Script:Options.Configuration -ne $Configuration -or ## Last build was with configuration other than 'Release'
- $Script:Options.Framework -ne "netcoreapp3.0" ## Last build wasn't for CoreCLR
+ $Script:Options.Framework -ne "netcoreapp3.1" ## Last build wasn't for CoreCLR
}
# Make sure the most recent build satisfies the package requirement
@@ -1449,7 +1449,7 @@ function CreateNugetPlatformFolder
[string] $PlatformBinPath
)
- $destPath = New-Item -ItemType Directory -Path (Join-Path $PackageRuntimesFolder "$Platform/lib/netcoreapp3.0")
+ $destPath = New-Item -ItemType Directory -Path (Join-Path $PackageRuntimesFolder "$Platform/lib/netcoreapp3.1")
$fullPath = Join-Path $PlatformBinPath $file
if (-not(Test-Path $fullPath)) {
@@ -1548,7 +1548,7 @@ function New-ILNugetPackage
$packageRuntimesFolder = New-Item (Join-Path $filePackageFolder.FullName 'runtimes') -ItemType Directory
#region ref
- $refFolder = New-Item (Join-Path $filePackageFolder.FullName 'ref/netcoreapp3.0') -ItemType Directory -Force
+ $refFolder = New-Item (Join-Path $filePackageFolder.FullName 'ref/netcoreapp3.1') -ItemType Directory -Force
CopyReferenceAssemblies -assemblyName $fileBaseName -refBinPath $refBinPath -refNugetPath $refFolder -assemblyFileList $fileList
#endregion ref
@@ -1915,7 +1915,7 @@ function New-ReferenceAssembly
Write-Log "Running: dotnet $arguments"
Start-NativeExecution -sb {dotnet $arguments}
- $refBinPath = Join-Path $projectFolder "bin/Release/netcoreapp3.0/$assemblyName.dll"
+ $refBinPath = Join-Path $projectFolder "bin/Release/netcoreapp3.1/$assemblyName.dll"
if ($null -eq $refBinPath) {
throw "Reference assembly was not built."
}
@@ -3302,7 +3302,7 @@ function New-GlobalToolNupkg
}
$packageInfo | ForEach-Object {
- $ridFolder = New-Item -Path (Join-Path $_.RootFolder "tools/netcoreapp3.0/any") -ItemType Directory
+ $ridFolder = New-Item -Path (Join-Path $_.RootFolder "tools/netcoreapp3.1/any") -ItemType Directory
$packageType = $_.Type
diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1
index 95c06ce6f8c..cf68b0f28c5 100644
--- a/tools/packaging/packaging.strings.psd1
+++ b/tools/packaging/packaging.strings.psd1
@@ -142,7 +142,7 @@ open {0}
-
+
diff --git a/tools/packaging/projects/nuget/package.csproj b/tools/packaging/projects/nuget/package.csproj
index 4703f78e341..57538b4da87 100644
--- a/tools/packaging/projects/nuget/package.csproj
+++ b/tools/packaging/projects/nuget/package.csproj
@@ -11,6 +11,6 @@
runtime=$(RID);version=$(SemVer);PackageName=$(PackageName)
$(StagingPath)
True
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 9f7c54f0b09..659cd4f17e5 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -1,6 +1,6 @@
- netcoreapp3.0
+ netcoreapp3.1
$(RefAsmVersion)
true
$(SnkFile)
@@ -14,6 +14,6 @@
-
+
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index 2aa6a796141..a6e696d5219 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -1,6 +1,6 @@
- netcoreapp3.0
+ netcoreapp3.1
$(RefAsmVersion)
true
$(SnkFile)
@@ -9,7 +9,7 @@
-
-
+
+