Skip to content

Update .NET to version 6.0.100-preview.2.21155.3 #15007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 2 commits into from
Mar 15, 2021
Merged

Update .NET to version 6.0.100-preview.2.21155.3 #15007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f261050
Update .NET to version 6.0.100-preview.2.21155.3
adityapatwardhan Mar 12, 2021
35ad3a6
Apply the suggestion to use null coalesce as per IDE0031
adityapatwardhan Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions assets/wix/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3063,8 +3063,11 @@
<Component Id="cmp2BB002B115C247FFB3353C80CAAC10B3">
<File Id="filF1771BA6F8A140FFB77E7558D035A0F2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.Compression.Native.dll" />
</Component>
<Component Id="cmpD9AA61B3F5F44A7B99E535A712E8310D">
<File Id="fil16547FB6A5EC4C6791FFFF5D561F2D31" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.10212.dll" />
<Component Id="cmp3547A55EA9D04784B4CF2FC717447E16">
<File Id="fil463DDA419769417A8D5A34C433E194F2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Speech.dll" />
Copy link

@anmenaga anmenaga Mar 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, why this System.Speech.dll is mentioned here (looks like it was added by this PR)?

Copy link
Member Author

@adityapatwardhan adityapatwardhan Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comes with the framework i guess

Copy link
Collaborator

@iSazonov iSazonov Mar 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be reported to .Net Runtime repo.

</Component>
<Component Id="cmp5FDF8631A090425A90B27344B4C2A62A">
<File Id="fil97828F3C973A46BDB0EF08D17F630D73" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.15406.dll" />
</Component>
</DirectoryRef>
</Fragment>
Expand Down Expand Up @@ -4053,7 +4056,8 @@
<ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
<ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
<ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
<ComponentRef Id="cmpD9AA61B3F5F44A7B99E535A712E8310D" />
<ComponentRef Id="cmp3547A55EA9D04784B4CF2FC717447E16" />
<ComponentRef Id="cmp5FDF8631A090425A90B27344B4C2A62A" />
</ComponentGroup>
</Fragment>
</Wix>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.100-preview.1.21103.13"
"version": "6.0.100-preview.2.21155.3"
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.2.21154.6" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0-1.final" />
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="NJsonSchema" Version="10.3.10" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-preview.2.21154.6" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.IO.Packaging" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.2.21154.6" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.Http" Version="4.8.1" />
Expand All @@ -30,7 +30,7 @@
<PackageReference Include="System.Private.ServiceModel" Version="4.8.1" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.2.21154.6" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.2.21154.6" />
</ItemGroup>

<PropertyGroup>
Expand Down
20 changes: 10 additions & 10 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Management" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.1" />
Copy link

@anmenaga anmenaga Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curios why System.Security.Cryptography.Pkcs was on version="5.0.1" while all neighbor items were on 6.0.0-preview.1 - is this expected or something we missed previously?

Copy link
Collaborator

@iSazonov iSazonov Mar 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess not all packages was updated in .Net Runtime for Preview.1. There are another packages like this.

Copy link
Member Author

@adityapatwardhan adityapatwardhan Mar 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems we missed updating a couple of packages for preview 1. Should not be a problem this release though.

<PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Management" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.2.21154.6" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/hostifaces/PowerShell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5316,7 +5316,7 @@ private void RemoveFromRemoteRunspaceRunningList()
private RemoteRunspacePoolInternal GetRemoteRunspacePoolInternal()
{
RunspacePool runspacePool = _rsConnection as RunspacePool;
return (runspacePool != null) ? (runspacePool.RemoteRunspacePoolInternal) : null;
return runspacePool?.RemoteRunspacePoolInternal;
Copy link

@anmenaga anmenaga Mar 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not look like it is related to bumping .NET version. Probably better to move this to a separate PR.

Copy link
Member Author

@adityapatwardhan adityapatwardhan Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is due to this issue i reported: dotnet/roslyn#51849

}

#endregion
Expand Down
2 changes: 1 addition & 1 deletion test/tools/TestService/TestService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.2.21154.6" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.2.21154.6" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...erence/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions ...aging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.2.21154.6" />
</ItemGroup>
</Project>