Skip to content

Commit 622eb4c

Browse files
bergmeisterbergmeister
authored
Upgrade to .NET 5 Preview 2 (#12250)
1 parent 5f28df1 commit 622eb4c

13 files changed

Lines changed: 39 additions & 35 deletions

File tree

‎.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/core/sdk:5.0.0-preview.1.20120.5
6+
FROM mcr.microsoft.com/dotnet/core/sdk:5.0.100-preview.2
77

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

‎assets/files.wxs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -403,9 +403,6 @@
403403
<Component Id="cmp04AC57A0E3245015D9DFB332698F3E26" Guid="{7C114DE5-9F1E-444C-B006-7960FAEB41D1}">
404404
<File Id="filD484411B6AE3B42F2DABD1739690E702" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Net.HttpListener.dll" />
405405
</Component>
406-
<Component Id="cmp0F357D94252A1FB7D62206CE323D9140" Guid="{496BA278-8E4C-4F95-AC8B-F06ACBF3B285}">
407-
<File Id="fil19787014F20A95670C67789A7C94ED40" KeyPath="yes" Source="$(env.ProductSourcePath)\mscorrc.debug.dll" />
408-
</Component>
409406
<Component Id="cmp1E29A0D7860190642C2D8504982890F9" Guid="{30484938-6644-4F53-BB06-2BB1999AD637}">
410407
<File Id="filDAAF9305BBAD857AA9CAB6751F36659B" KeyPath="yes" Source="$(env.ProductSourcePath)\clrjit.dll" />
411408
</Component>
@@ -3089,15 +3086,18 @@
30893086
<Component Id="cmp2E32A6E773F543F0A150B972F8D3E23A" Guid="{a43d0117-1193-4316-a0f6-fef892870f38}">
30903087
<File Id="fil66411B8941CA492E93BF262EA72C6BE6" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.GraphicalHost.xml" />
30913088
</Component>
3092-
<Component Id="cmp0535678883A44B4D81A04C8BA7B2068C" Guid="{9253aa88-ab71-4f6c-98c1-b305af57c18f}">
3093-
<File Id="fil3D9B499EC41D4B4D9C7139B86D8CC398" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.12005.dll" />
3094-
</Component>
30953089
<Component Id="cmp874F51885AE34AD9AA37DC46A44B3194" Guid="{77932153-0935-4689-8b48-6d2e21ae4824}">
30963090
<File Id="fil16005153CF144E458123E5989CCB3A0E" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Windows.Forms.Primitives.dll" />
30973091
</Component>
30983092
<Component Id="cmp798A4EE6784541FE9B13582E52C5A818" Guid="{ec646ea5-c60e-41d5-9fd0-36fb14b1fc28}">
30993093
<File Id="fil8A6290BE106E416CB35FB2BEA982C3B8" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.VisualBasic.Forms.dll" />
31003094
</Component>
3095+
<Component Id="cmp26F240CCDE054124A0DD455D7C97AA8B" Guid="{189dbe82-d5a7-4cf9-9f9c-2cfe62976a08}">
3096+
<File Id="fil63934499FF974EEEA1D37A9F5D16C470" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.16006.dll" />
3097+
</Component>
3098+
<Component Id="cmpBB705B2570064C99A71B6FA65CDF9DC8" Guid="{51c00292-f61c-4524-92a8-6b6171403839}">
3099+
<File Id="fil0F66F2502CDC47FF8C8626941746DF84" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Windows.Forms.Design.Editors.dll" />
3100+
</Component>
31013101
</DirectoryRef>
31023102
</Fragment>
31033103
<Fragment>
@@ -3235,7 +3235,6 @@
32353235
<ComponentRef Id="cmp67AFE3748590F117178E5617E219F1F8" />
32363236
<ComponentRef Id="cmp734102C1EBBE0D4417B67AA90D416EC4" />
32373237
<ComponentRef Id="cmp04AC57A0E3245015D9DFB332698F3E26" />
3238-
<ComponentRef Id="cmp0F357D94252A1FB7D62206CE323D9140" />
32393238
<ComponentRef Id="cmp1E29A0D7860190642C2D8504982890F9" />
32403239
<ComponentRef Id="cmp2FB548B56B09B010468883CA4073600D" />
32413240
<ComponentRef Id="cmp4D3236B49B126CF9FFC5234678B3B302" />
@@ -4077,7 +4076,6 @@
40774076
<ComponentRef Id="cmp0DA1B3EF85234C7BBA6DE35BBD1B45D2" />
40784077
<ComponentRef Id="cmpA34D56794B9144A2BE67E7CDABCF5B4E" />
40794078
<ComponentRef Id="cmpF4093A1E8AB94B43AB0F852EB647CE7F" />
4080-
<ComponentRef Id="cmp0535678883A44B4D81A04C8BA7B2068C" />
40814079
<ComponentRef Id="cmp4CCDE73A2A9E4D7B90065639D9433178" />
40824080
<ComponentRef Id="cmp874F51885AE34AD9AA37DC46A44B3194" />
40834081
<ComponentRef Id="cmp5359C8369744482FBB5D56CDF3FA0DB0" />
@@ -4096,6 +4094,8 @@
40964094
<ComponentRef Id="cmp38D8A48C68FB4CB399A0A7677FA428E4" />
40974095
<ComponentRef Id="cmp26335B5D1FE94E87A6B6EBD56A22C2B9" />
40984096
<ComponentRef Id="cmp57D197B18F1F4A6AAB704B28CF61B535" />
4097+
<ComponentRef Id="cmp26F240CCDE054124A0DD455D7C97AA8B" />
4098+
<ComponentRef Id="cmpBB705B2570064C99A71B6FA65CDF9DC8" />
40994099
</ComponentGroup>
41004100
</Fragment>
41014101
</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.1.20155.7"
3+
"version": "5.0.100-preview.2.20176.6"
44
}
55
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.1.20120.5" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.2.20160.6" />
5151
</ItemGroup>
5252

5353
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
<ItemGroup>
3434
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
35-
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.1.20120.5" />
36-
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.1.20120.5" />
35+
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.2.20160.6" />
36+
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.2.20160.6" />
3737
<PackageReference Include="NJsonSchema" Version="10.1.12" />
3838
</ItemGroup>
3939

‎src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,13 @@ protected override void EndProcessing()
374374
ErrorRecord er = new ErrorRecord(ex, "AuthenticationException", ErrorCategory.InvalidOperation, _mSmtpClient);
375375
WriteError(er);
376376
}
377-
378-
// If we don't dispose the attachments, the sender can't modify or use the files sent.
379-
_mMailMessage.Attachments.Dispose();
377+
finally
378+
{
379+
_mSmtpClient.Dispose();
380+
381+
// If we don't dispose the attachments, the sender can't modify or use the files sent.
382+
_mMailMessage.Attachments.Dispose();
383+
}
380384
}
381385

382386
#endregion

‎src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
11-
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.1.20120.5" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.2.20160.6" />
1212
</ItemGroup>
1313

1414
</Project>

‎src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
1919
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.1.20120.5" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.1.20120.5" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.1.20120.5" />
21+
<PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.2.20160.6" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.2.20160.6" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.2.20160.6" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
2525
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
2626
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />

‎src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
1010
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
1111
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
12-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.1.20120.5" />
12+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.2.20160.6" />
1313
</ItemGroup>
1414

1515
<PropertyGroup>

‎src/System.Management.Automation/System.Management.Automation.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
<!-- the Application Insights package -->
1717
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.13.1" />
1818
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
19-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.1.20120.5" />
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.1.20120.5" />
21-
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.1.20120.5" />
22-
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.1.20120.5" />
23-
<PackageReference Include="System.Management" Version="5.0.0-preview.1.20120.5" />
24-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.1.20120.5" />
25-
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.1.20120.5" />
26-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.1.20120.5" />
27-
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.1.20120.5" />
28-
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.1.20120.5" />
19+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.2.20160.6" />
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.2.20160.6" />
21+
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.2.20160.6" />
22+
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.2.20160.6" />
23+
<PackageReference Include="System.Management" Version="5.0.0-preview.2.20160.6" />
24+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.2.20160.6" />
25+
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.2.20160.6" />
26+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.2.20160.6" />
27+
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.2.20160.6" />
28+
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.2.20160.6" />
2929
<!-- the following package(s) are from the powershell org -->
3030
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
3131
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0" />

0 commit comments

Comments
 (0)