diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c4cae722c..d902a5d32 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.1.105
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.112
# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
diff --git a/.vsts-ci/templates/ci-build.yml b/.vsts-ci/templates/ci-build.yml
index 026448908..1838d99b0 100644
--- a/.vsts-ci/templates/ci-build.yml
+++ b/.vsts-ci/templates/ci-build.yml
@@ -22,8 +22,7 @@ jobs:
- template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
- - powershell: |
- [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+ - pwsh: |
Import-Module .\tools\ci.psm1
Invoke-CIInstall -SkipUser
displayName: Bootstrap
diff --git a/.vsts-ci/templates/windows-packaging.yml b/.vsts-ci/templates/windows-packaging.yml
index 455efbb9f..0bfa92446 100644
--- a/.vsts-ci/templates/windows-packaging.yml
+++ b/.vsts-ci/templates/windows-packaging.yml
@@ -20,10 +20,9 @@ jobs:
- template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
- - powershell: |
- [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+ - pwsh: |
Import-Module .\tools\ci.psm1
- Invoke-CIInstall
+ Invoke-CIInstall -SkipUser
displayName: Bootstrap
condition: succeededOrFailed()
diff --git a/.vsts-ci/templates/windows-test.yml b/.vsts-ci/templates/windows-test.yml
index a153b563e..7b93a87f4 100644
--- a/.vsts-ci/templates/windows-test.yml
+++ b/.vsts-ci/templates/windows-test.yml
@@ -34,6 +34,16 @@ jobs:
# must be run frow Windows PowerShell
- powershell: |
+ # Remove "Program Files\dotnet" from the env variable PATH, so old SDKs won't affect us.
+ Write-Host "Old Path:"
+ Write-Host $env:Path
+ $dotnetPath = Join-Path $env:SystemDrive 'Program Files\dotnet'
+ $paths = $env:Path -split ";" | Where-Object { -not $_.StartsWith($dotnetPath) }
+ $env:Path = $paths -join ";"
+ Write-Host "New Path:"
+ Write-Host $env:Path
+
+ # Bootstrap
Import-Module .\tools\ci.psm1
Invoke-CIInstall
displayName: Bootstrap
diff --git a/assets/files.wxs b/assets/files.wxs
index 37b5f8b75..4d5383964 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -2001,9 +2001,6 @@
-
-
-
@@ -2063,9 +2060,6 @@
-
-
-
@@ -2092,9 +2086,6 @@
-
-
-
@@ -2148,9 +2139,6 @@
-
-
-
@@ -2243,9 +2231,6 @@
-
-
-
@@ -2284,9 +2269,6 @@
-
-
-
@@ -2364,9 +2346,6 @@
-
-
-
@@ -2387,9 +2366,6 @@
-
-
-
@@ -2476,9 +2452,6 @@
-
-
-
@@ -2541,9 +2514,6 @@
-
-
-
@@ -2603,9 +2573,6 @@
-
-
-
@@ -2632,9 +2599,6 @@
-
-
-
@@ -2721,9 +2685,6 @@
-
-
-
@@ -3056,8 +3017,8 @@
-
-
+
+
@@ -3701,7 +3662,6 @@
-
@@ -3721,7 +3681,6 @@
-
@@ -3730,7 +3689,6 @@
-
@@ -3748,7 +3706,6 @@
-
@@ -3779,7 +3736,6 @@
-
@@ -3792,7 +3748,6 @@
-
@@ -3818,14 +3773,12 @@
-
-
@@ -3854,7 +3807,6 @@
-
@@ -3875,7 +3827,6 @@
-
@@ -3895,7 +3846,6 @@
-
@@ -3904,7 +3854,6 @@
-
@@ -3933,7 +3882,6 @@
-
@@ -4043,7 +3991,7 @@
-
+
diff --git a/global.json b/global.json
index d82f13f4d..f5fbfb4df 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "3.1.405"
+ "version": "3.1.406"
}
}
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 258681b71..da9e579de 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -33,7 +33,7 @@
-
+
diff --git a/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 b/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1
index de50ffe05..afc7aa753 100644
--- a/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1
+++ b/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1
@@ -12,13 +12,13 @@ Describe "PSReadLine" -tags "CI" {
Import-Module PSReadLine
$module = Get-Module PSReadLine
$module.Name | Should -BeExactly 'PSReadLine'
- $module.Version | Should -BeExactly '2.0.2'
+ $module.Version | Should -BeExactly '2.0.4'
}
It "Should be installed to `$PSHOME" {
$module = Get-Module (Join-Path -Path $PSHOME -ChildPath "Modules" -AdditionalChildPath "PSReadLine") -ListAvailable
$module.Name | Should -BeExactly 'PSReadLine'
- $module.Version | Should -BeExactly '2.0.2'
+ $module.Version | Should -BeExactly '2.0.4'
$module.Path | Should -Be (Join-Path -Path $PSHOME -ChildPath "Modules/PSReadLine/PSReadLine.psd1")
}
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 107c48a0a..c8429d2fe 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index 78ffc9b2f..b95b569c2 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -25,8 +25,8 @@
-
-
+
+