diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ac9f2e01cd..c4cae722cb 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.104 +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.105 # Avoid warnings by switching to noninteractive ENV DEBIAN_FRONTEND=noninteractive diff --git a/assets/files.wxs b/assets/files.wxs index de22fd5e75..ac03bd6262 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -3062,8 +3062,8 @@ - - + + @@ -4051,7 +4051,7 @@ - + diff --git a/global.json b/global.json index 532fcd321c..5b15572b44 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.104" + "version": "3.1.105" } } 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 bd6a18f282..c9ef576a5b 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -34,7 +34,7 @@ - + diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index 4e1585d396..e7879cd90c 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -19,7 +19,7 @@ - + diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 index f20e870837..a8c6030aff 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 @@ -76,8 +76,8 @@ Describe "Test-Connection" -tags "CI" { $error[0].Exception.InnerException.ErrorCode | Should -Be $code } - # In VSTS, address is 0.0.0.0 - It "Force IPv4 with implicit PingOptions" { + # In VSTS, address is 0.0.0.0. Making pending due to instability in Az DevOps. + It "Force IPv4 with implicit PingOptions" -Pending:($IsMacOS) { $result = Test-Connection $hostName -Count 1 -IPv4 $result[0].Address | Should -BeExactly $realAddress @@ -248,7 +248,8 @@ Describe "Test-Connection" -tags "CI" { } Context "TraceRoute" { - It "TraceRoute works" { + # Mark it as pending due to instability in Az DevOps + It "TraceRoute works" -Pending:($IsMacOS) { # real address is an ipv4 address, so force IPv4 $result = Test-Connection $hostName -TraceRoute -IPv4