admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 11699: Bump to .NET 3.1.5 and update dependencies

Browse Source 
Bump to .NET 3.1.5 and update dependencies
This commit is contained in:
Aditya Patwardhan
2020-06-09 21:53:16 +00:00
parent d343d89f90
commit dec48d5478
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.devcontainer/Dockerfile
+1 -1
View File
@@ -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
assets/files.wxs
+3 -3
View File
@@ -3062,8 +3062,8 @@
<Component Id="cmp2E32A6E773F543F0A150B972F8D3E23A" Guid="{a43d0117-1193-4316-a0f6-fef892870f38}">
<File Id="fil66411B8941CA492E93BF262EA72C6BE6" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.GraphicalHost.xml" />
</Component>
<Component Id="cmpB354FFC600B342EE8DF733ED9C6F6494" Guid="{6f61d5bb-e947-4409-a877-f9d1f1d4438f}">
<File Id="fil7886B01FBE4D4BE5A2670CEDB38A75C8" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.20.20201.dll" />
<Component Id="cmp2DD86631184942F1A98A1DCCD3D1F732" Guid="{61eacfa1-8b3c-4f69-8820-33acae8e2b03}">
<File Id="fil2B735FF5C5C243B7AD352405F1005457" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.20.26901.dll" />
</Component>
</DirectoryRef>
</Fragment>
@@ -4051,7 +4051,7 @@
<ComponentRef Id="cmp73A4CC8E2C9E4594A3D8258C9E00D7E6" />
<ComponentRef Id="cmpAC984FA3A67247BC996F60290C87D0A1" />
<ComponentRef Id="cmp2E32A6E773F543F0A150B972F8D3E23A" />
<ComponentRef Id="cmpB354FFC600B342EE8DF733ED9C6F6494" />
<ComponentRef Id="cmp2DD86631184942F1A98A1DCCD3D1F732" />
</ComponentGroup>
</Fragment>
</Wix>
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.1.104"
"version": "3.1.105"
}
}
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+1 -1
View File
@@ -34,7 +34,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.7.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="NJsonSchema" Version="10.1.15" />
<PackageReference Include="NJsonSchema" Version="10.1.18" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+1 -1
View File
@@ -19,7 +19,7 @@
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.7.0" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.1" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.2" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.1" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
+4 -3
View File
@@ -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