Skip to content

Commit 08e120c

Browse files
adityapatwardhanadityapatwardhan
authored
Bump .NET core framework to 3.1-preview.2 (PowerShell#10993)
1 parent d58a82a commit 08e120c

File tree

13 files changed

+38
-29
lines changed

13 files changed

+38
-29
lines changed

‎.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:3.1.100-preview1
6+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100-preview2
77

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

‎assets/files.wxs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3062,9 +3062,6 @@
30623062
<Component Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" Guid="{e0776aa4-b3aa-4a15-a497-697b510fba8c}">
30633063
<File Id="fil9120D0A4381F4B34B80AB37D2EFBCF7D" KeyPath="yes" Source="$(env.ProductSourcePath)\InstallPSCorePolicyDefinitions.ps1" />
30643064
</Component>
3065-
<Component Id="cmpEC42F4F98D70437BB0E290A0E0FE1775" Guid="{5483092a-12c2-4e6c-b730-be491b8909c0}">
3066-
<File Id="filBE60A48C75214B7B810D695039AC47B5" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.50403.dll" />
3067-
</Component>
30683065
<Component Id="cmp73A4CC8E2C9E4594A3D8258C9E00D7E6" Guid="{0aba3675-b1b5-4464-b8ed-937d3b9ea9ed}">
30693066
<File Id="fil8DBDCAE679714880A535D26FFE95A8F9" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.GraphicalHost.dll.config" />
30703067
</Component>
@@ -3074,6 +3071,9 @@
30743071
<Component Id="cmp2E32A6E773F543F0A150B972F8D3E23A" Guid="{a43d0117-1193-4316-a0f6-fef892870f38}">
30753072
<File Id="fil66411B8941CA492E93BF262EA72C6BE6" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.GraphicalHost.xml" />
30763073
</Component>
3074+
<Component Id="cmpCD1095120697449FA27BE5759D83F618" Guid="{dac64ea2-13b9-409a-b215-974201244c9f}">
3075+
<File Id="filA48D09FB0F0C40E982B626C101698232" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.52202.dll" />
3076+
</Component>
30773077
</DirectoryRef>
30783078
</Fragment>
30793079
<Fragment>
@@ -3914,12 +3914,12 @@
39143914
<ComponentRef Id="cmp34649490F5B04041A08E73D7A86D5A5A" />
39153915
<ComponentRef Id="cmpB3116053008E492C9B36C89BF682B8F7" />
39163916
<ComponentRef Id="cmp859A3876902946E7B5B4965F90664C5D" />
3917-
<ComponentRef Id="cmpEC42F4F98D70437BB0E290A0E0FE1775" />
39183917
<ComponentRef Id="cmpF1B0E6DCC3BD4797B206C879EF270062" />
39193918
<ComponentRef Id="cmp73A4CC8E2C9E4594A3D8258C9E00D7E6" />
39203919
<ComponentRef Id="cmpAC984FA3A67247BC996F60290C87D0A1" />
39213920
<ComponentRef Id="cmp2E32A6E773F543F0A150B972F8D3E23A" />
39223921
<ComponentRef Id="cmp25A144CC34E545378735B06794A02F90" />
3922+
<ComponentRef Id="cmpCD1095120697449FA27BE5759D83F618" />
39233923
</ComponentGroup>
39243924
</Fragment>
39253925
</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": "3.1.100-preview1-014459"
3+
"version": "3.1.100-preview2-014569"
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="4.7.0-preview1.19504.10" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0-preview2.19523.17" />
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.3.1" />
35-
<PackageReference Include="System.Threading.AccessControl" Version="4.7.0-preview1.19504.10" />
36-
<PackageReference Include="System.Drawing.Common" Version="4.7.0-preview1.19504.10" />
35+
<PackageReference Include="System.Threading.AccessControl" Version="4.7.0-preview2.19523.17" />
36+
<PackageReference Include="System.Drawing.Common" Version="4.7.0-preview2.19523.17" />
3737
<PackageReference Include="NJsonSchema" Version="10.0.27" />
3838
</ItemGroup>
3939

‎src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,15 @@ private static string StreamToString(Stream stream, Encoding encoding)
381381

382382
// Increment byteIndex to the next block of bytes in the input buffer, if any, to convert.
383383
byteIndex += bytesUsed;
384+
385+
// The behavior of decoder.Convert changed start .NET 3.1-preview2.
386+
// The change was made in https://github.com/dotnet/coreclr/pull/27229
387+
// The recommendation from .NET team is to not check for 'completed' if 'flush' is false.
388+
// Break out of the loop if all bytes have been read.
389+
if (!flush && bytesRead == byteIndex)
390+
{
391+
break;
392+
}
384393
}
385394
} while (bytesRead != 0);
386395

‎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="4.7.0-preview1.19504.10" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0-preview2.19523.17" />
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.0-preview1.19504.10" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="4.7.0-preview1.19504.10" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0-preview1.19504.10" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.0-preview1.19504.10" />
21+
<PackageReference Include="System.IO.Packaging" Version="4.7.0-preview2.19523.17" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0-preview2.19523.17" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.0-preview2.19523.17" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
2525
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0-preview1.final" />
2626
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0-preview1.final" />

‎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="4.7.0-preview1.19504.10" />
12+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0-preview2.19523.17" />
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.11.0" />
1818
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
19-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.7.0-preview1.19504.10" />
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0-preview1.19504.10" />
21-
<PackageReference Include="System.DirectoryServices" Version="4.7.0-preview1.19504.10" />
22-
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0-preview1.19504.10" />
23-
<PackageReference Include="System.Management" Version="4.7.0-preview1.19504.10" />
24-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0-preview1.19504.10" />
25-
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview1.19504.10" />
26-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.7.0-preview1.19504.10" />
27-
<PackageReference Include="System.Security.Permissions" Version="4.7.0-preview1.19504.10" />
28-
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview1.19504.10" />
19+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.7.0-preview2.19523.17" />
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0-preview2.19523.17" />
21+
<PackageReference Include="System.DirectoryServices" Version="4.7.0-preview2.19523.17" />
22+
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0-preview2.19523.17" />
23+
<PackageReference Include="System.Management" Version="4.7.0-preview2.19523.17" />
24+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0-preview2.19523.17" />
25+
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview2.19523.17" />
26+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.7.0-preview2.19523.17" />
27+
<PackageReference Include="System.Security.Permissions" Version="4.7.0-preview2.19523.17" />
28+
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview2.19523.17" />
2929
<!-- the following package(s) are from the powershell org -->
3030
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0-preview.2" />
3131
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0-preview.3" />

0 commit comments

Comments
 (0)