maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merged PR 14775: Bump .NET SDK to 5.0.4

Browse source 
Bump .NET SDK to 5.0.4
This commit is contained in:
Aditya Patwardhan 2021-03-10 01:03:13 +00:00
parent 07f722d916
commit 33ce13a0df
8 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.devcontainer/Dockerfile
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/nightly/sdk:5.0.103
FROM mcr.microsoft.com/dotnet/nightly/sdk:5.0.104
# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive

4
DotnetRuntimeMetadata.json
View file

@ -1,8 +1,8 @@
{
"sdk": {
"channel": "latest",
"packageVersionPattern": "5.0.3",
"sdkImageVersion": "5.0.103",
"packageVersionPattern": "5.0.4",
"sdkImageVersion": "5.0.104",
"nextChannel": "net5/rc2"
}
}

12
assets/files.wxs
View file

@ -1602,9 +1602,6 @@
<Component Id="cmpEA40E9164309426C88C4388FDCA9559D">
<File Id="fil205C9BE7027A408B985D96F5EEF11594" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Threading.Channels.dll" />
</Component>
<Component Id="cmp34649490F5B04041A08E73D7A86D5A5A">
<File Id="fil2DDAEABD470A475E950B94AC186DAB2E" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
</Component>
<Component Id="cmpB3116053008E492C9B36C89BF682B8F7">
<File Id="fil0D09CC7B4B8A43369D0207AC861D8D21" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
</Component>
@ -3057,12 +3054,12 @@
<Component Id="cmp1EBDE676D79B4B0DB859B3F601D78513">
<File Id="fil589A10D0D26C4D7F8479F40D11824D63" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
</Component>
<Component Id="cmp350AE5AC0C2448B59A2C8405A392F0B4">
<File Id="fil664CD92644714AE381E158D952344378" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.321.7212.dll" />
</Component>
<Component Id="cmp1BE6E4D5997742FF974440017C5502EE">
<File Id="fil77AD293FB24E4B1893A18FBC186AC67F" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.EventLog.Messages.dll" />
</Component>
<Component Id="cmp340A7AAB36EA4610A1BBCB688CA4B329">
<File Id="filDED6D1E744684BFB92FC337FB2DB0224" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.421.11614.dll" />
</Component>
</DirectoryRef>
</Fragment>
<Fragment>
@ -3600,7 +3597,6 @@
<ComponentRef Id="cmp1719A38F3C30484BBA189D718AF00D3C" />
<ComponentRef Id="cmp770700CA06564FB187D1CD2A79AA3DA8" />
<ComponentRef Id="cmpEA40E9164309426C88C4388FDCA9559D" />
<ComponentRef Id="cmp34649490F5B04041A08E73D7A86D5A5A" />
<ComponentRef Id="cmpB3116053008E492C9B36C89BF682B8F7" />
<ComponentRef Id="cmp859A3876902946E7B5B4965F90664C5D" />
<ComponentRef Id="cmpF1B0E6DCC3BD4797B206C879EF270062" />
@ -4048,8 +4044,8 @@
<ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
<ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
<ComponentRef Id="cmp1EBDE676D79B4B0DB859B3F601D78513" />
<ComponentRef Id="cmp350AE5AC0C2448B59A2C8405A392F0B4" />
<ComponentRef Id="cmp1BE6E4D5997742FF974440017C5502EE" />
<ComponentRef Id="cmp340A7AAB36EA4610A1BBCB688CA4B329" />
</ComponentGroup>
</Fragment>
</Wix>

2
global.json
View file

@ -1,5 +1,5 @@
{
"sdk": {
"version": "5.0.103"
"version": "5.0.104"
}
}

2
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -33,7 +33,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
<PackageReference Include="NJsonSchema" Version="10.2.2" />
</ItemGroup>

2
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file

@ -8,7 +8,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0" />
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.1" />
</ItemGroup>
</Project>

2
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file

@ -20,7 +20,7 @@
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="5.0.0" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />

2
test/tools/WebListener/WebListener.csproj
View file

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
</ItemGroup>