Skip to content

Commit 10237bd

Browse files
daxian-dbwdaxian-dbw
authored
Update PowerShell to build against dotnet 5.0-RC.1 (PowerShell#13643)
1 parent 3effa20 commit 10237bd

61 files changed

Lines changed: 105 additions & 147 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
44
#-------------------------------------------------------------------------------------------------------------
55

6-
FROM mcr.microsoft.com/dotnet/nightly/sdk:5.0.100-preview.7
6+
FROM mcr.microsoft.com/dotnet/nightly/sdk:5.0.100-rc.1
77

88
# Avoid warnings by switching to noninteractive
99
ENV DEBIAN_FRONTEND=noninteractive

‎DotnetRuntimeMetadata.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"sdk": {
3-
"channel": "release/5.0.1xx-preview8",
4-
"packageVersionPattern": "5.0.0-preview.8",
5-
"sdkImageVersion": "5.0.100-preview.8",
6-
"nextChannel": "net5/preview8"
3+
"channel": "release/5.0.1xx-rc1",
4+
"packageVersionPattern": "5.0.0-rc.1",
5+
"sdkImageVersion": "5.0.100-rc.1",
6+
"nextChannel": "net5/rc1"
77
}
88
}

‎PowerShell.Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<Copyright>(c) Microsoft Corporation.</Copyright>
9898

9999
<TargetFramework>net5.0</TargetFramework>
100-
<LangVersion>preview</LangVersion>
100+
<LangVersion>9.0</LangVersion>
101101
<PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
102102

103103
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎assets/files.wxs‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,6 +1623,12 @@
16231623
<Component Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" Guid="{ee32f38f-14ee-4a85-914f-d02522cc3635}">
16241624
<File Id="fil04B0F83A7AED430A86A7E6E3E99AB45D" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
16251625
</Component>
1626+
<Component Id="cmp9407AB75A97A459C8EC1EE3BDB63740C">
1627+
<File Id="fil068384878908467D8CE96F14D7956169" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Connections.dll" />
1628+
</Component>
1629+
<Component Id="cmp54F79ECE6EC8435E976CD10403092841">
1630+
<File Id="filB954C7041A90438BBF70EEE79A4C111C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.IO.Pipelines.dll" />
1631+
</Component>
16261632
</Directory>
16271633
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
16281634
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -3096,17 +3102,20 @@
30963102
<Component Id="cmp0989343D60B74AF082291F612F0E6FA6">
30973103
<File Id="filECDFEB9313BF4BF68CEE13A6EA1DB388" KeyPath="yes" Source="$(var.ProductSourcePath)\createdump.exe" />
30983104
</Component>
3099-
<Component Id="cmp7BDE558CCB344A399134DE2C9E2C8D3D">
3100-
<File Id="filF907AD3E73324DEA94AE90E9625AFA73" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
3101-
</Component>
31023105
<Component Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E">
31033106
<File Id="fil6EF5C2AED8674A32B0F3CCEE9CBEED71" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Asn1.dll" />
31043107
</Component>
31053108
<Component Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D">
31063109
<File Id="fil8FEEEB3B27DF40148EB85CE6AE1A420B" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.DiaSymReader.Native.$(var.FileArchitecture).dll" />
31073110
</Component>
3108-
<Component Id="cmp9AFE828DDCCC4A0E83C4D7476B353023">
3109-
<File Id="filBE5924015B7147E5BE1D6CDEB8AFB6C3" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.40711.dll" />
3111+
<Component Id="cmpF76ECC3925E043EB98C4578A3346B684">
3112+
<File Id="fil251640C5EE634742AE9450F846FEC9AF" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.Pipelines.dll" />
3113+
</Component>
3114+
<Component Id="cmpA3CF1D943BA741049C9F72CF4446E741">
3115+
<File Id="filC95A84B32FDC4F63B82B9AF643B92648" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.Connections.dll" />
3116+
</Component>
3117+
<Component Id="cmp57C0FF2ADCED4FF79BA2F72269483746">
3118+
<File Id="fil5113EA907A714CB69F9A621DC4BAAAD4" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.45114.dll" />
31103119
</Component>
31113120
</DirectoryRef>
31123121
</Fragment>
@@ -4105,11 +4114,14 @@
41054114
<ComponentRef Id="cmpBB705B2570064C99A71B6FA65CDF9DC8" />
41064115
<ComponentRef Id="cmpE9599A00802144DF98F5792E029C8875" />
41074116
<ComponentRef Id="cmp0989343D60B74AF082291F612F0E6FA6" />
4108-
<ComponentRef Id="cmp7BDE558CCB344A399134DE2C9E2C8D3D" />
41094117
<ComponentRef Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" />
41104118
<ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
41114119
<ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
4112-
<ComponentRef Id="cmp9AFE828DDCCC4A0E83C4D7476B353023" />
4120+
<ComponentRef Id="cmp9407AB75A97A459C8EC1EE3BDB63740C" />
4121+
<ComponentRef Id="cmp54F79ECE6EC8435E976CD10403092841" />
4122+
<ComponentRef Id="cmpF76ECC3925E043EB98C4578A3346B684" />
4123+
<ComponentRef Id="cmpA3CF1D943BA741049C9F72CF4446E741" />
4124+
<ComponentRef Id="cmp57C0FF2ADCED4FF79BA2F72269483746" />
41134125
</ComponentGroup>
41144126
</Fragment>
41154127
</Wix>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "5.0.100-preview.8.20417.9"
3+
"version": "5.0.100-rc.1.20452.10"
44
}
55
}

‎src/Microsoft.Management.UI.Internal/ManagementList/FilterCore/FilterRules/FilterRuleExtensions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public static FilterRule DeepCopy(this FilterRule rule)
4040
FilterRule copy = null;
4141
try
4242
{
43-
#pragma warning disable MSLIB0003
43+
#pragma warning disable SYSLIB0011
4444
formatter.Serialize(ms, rule);
45-
#pragma warning restore MSLIB0003
45+
#pragma warning restore SYSLIB0011
4646

4747
ms.Position = 0;
48-
#pragma warning disable MSLIB0003
48+
#pragma warning disable SYSLIB0011
4949
copy = (FilterRule)formatter.Deserialize(ms);
50-
#pragma warning restore MSLIB0003
50+
#pragma warning restore SYSLIB0011
5151
}
5252
finally
5353
{

‎src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\PowerShell.Common.props" />
33
<PropertyGroup>
44
<Description>PowerShell's Microsoft.PowerShell.Commands.Diagnostics project</Description>
5-
<NoWarn>$(NoWarn);CS1591</NoWarn>
5+
<NoWarn>$(NoWarn);CS1591;CA1416</NoWarn>
66
<AssemblyName>Microsoft.PowerShell.Commands.Diagnostics</AssemblyName>
77
</PropertyGroup>
88

‎src/Microsoft.PowerShell.Commands.Diagnostics/PdhSafeHandle.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public override bool IsInvalid
2020
}
2121
}
2222

23-
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
2423
protected override bool ReleaseHandle()
2524
{
2625
return (PdhHelper.PdhCloseLog(handle, 0) == 0);
@@ -39,7 +38,6 @@ public override bool IsInvalid
3938
}
4039
}
4140

42-
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
4341
protected override bool ReleaseHandle()
4442
{
4543
return (PdhHelper.PdhCloseQuery(handle) == 0);
@@ -58,7 +56,6 @@ public override bool IsInvalid
5856
}
5957
}
6058

61-
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
6259
protected override bool ReleaseHandle()
6360
{
6461
return (PdhHelper.PdhCloseLog(handle, 0) == 0);

‎src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\PowerShell.Common.props" />
33
<PropertyGroup>
44
<Description>PowerShell's Microsoft.PowerShell.Commands.Management project</Description>
5-
<NoWarn>$(NoWarn);CS1570</NoWarn>
5+
<NoWarn>$(NoWarn);CS1570;CA1416</NoWarn>
66
<AssemblyName>Microsoft.PowerShell.Commands.Management</AssemblyName>
77
</PropertyGroup>
88

@@ -47,7 +47,7 @@
4747

4848
<ItemGroup>
4949
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
50-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.8.20407.11" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-rc.1.20451.14" />
5151
</ItemGroup>
5252

5353
</Project>

‎src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ private RestartComputerTimeoutException(SerializationInfo info, StreamingContext
123123
/// <param name="context">
124124
/// streaming context
125125
/// </param>
126-
[SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
127126
public override void GetObjectData(SerializationInfo info, StreamingContext context)
128127
{
129128
if (info == null)

0 commit comments

Comments
 (0)