Skip to content

Bump .NET framework to 6.0.0-preview.1 #14719

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 14 commits into from
Feb 9, 2021
Merged

Bump .NET framework to 6.0.0-preview.1 #14719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d672ac4
Bump .NET framework to 6.0.0-preview.1
adityapatwardhan Feb 5, 2021
f348fbc
Update to target framework net6.0
adityapatwardhan Feb 5, 2021
1c6e425
Replace deprecated APIs
adityapatwardhan Feb 5, 2021
4b3b8b7
Fix the wix file
adityapatwardhan Feb 5, 2021
f81be45
Remove the usage of deprecated API and replace with appropriate API
adityapatwardhan Feb 8, 2021
25490f7
Remove old .NET SDKs
daxian-dbw Feb 8, 2021
d16cc76
Remove old SDKs in tests
daxian-dbw Feb 8, 2021
bb90e88
Remove old SDK from windows packaging job
adityapatwardhan Feb 8, 2021
f8d8f73
Use pwsh for windows-packaging job
adityapatwardhan Feb 8, 2021
2cf631e
Remove --runtime from dotnet pack invocation
adityapatwardhan Feb 8, 2021
fa67eac
Revert unneeded changes and fix CodeFactor issue
daxian-dbw Feb 8, 2021
7475dd0
Make the old SDKs invisible to PowerShell
daxian-dbw Feb 8, 2021
bbce662
Add workaround for .NET SDK issue
adityapatwardhan Feb 9, 2021
168de59
Merge branch 'UpdatetoNet6' of https://github.com/adityapatwardhan/Po…
adityapatwardhan Feb 9, 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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.100
FROM mcr.microsoft.com/dotnet/nightly/sdk:6.0.100

# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
9 changes: 8 additions & 1 deletion .vsts-ci/templates/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,18 @@ jobs:

- template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml

- pwsh: |
if (Test-Path -Path $HOME/.dotnet) {
Remove-Item $HOME/.dotnet -Recurse -Force
}
displayName: Remove Old .NET SDKs
condition: succeededOrFailed()

- pwsh: |
Import-Module .\tools\ci.psm1
Invoke-CIInstall -SkipUser
displayName: Bootstrap
condition: succeededOrFailed()
condition: succeeded()

- powershell: |
Import-Module .\tools\ci.psm1
Expand Down
8 changes: 7 additions & 1 deletion .vsts-ci/templates/nix-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,17 @@ jobs:
displayName: 'Capture Artifacts Directory'
continueOnError: true

- pwsh: |
if (Test-Path -Path $HOME/.dotnet) {
Remove-Item $HOME/.dotnet -Recurse -Force
}
displayName: Remove Old .NET SDKs
condition: succeededOrFailed()

- pwsh: |
Import-Module .\tools\ci.psm1
Invoke-CIInstall -SkipUser
displayName: Bootstrap
condition: succeededOrFailed()

- task: ExtractFiles@1
displayName: 'Extract Build ZIP'
Expand Down
13 changes: 12 additions & 1 deletion .vsts-ci/templates/windows-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,21 @@ jobs:

# must be run frow Windows PowerShell
- powershell: |
# Remove "Program Files\dotnet" from the env variable PATH, so old SDKs won't affect us.
Write-Host "Old Path:"
Write-Host $env:Path

$dotnetPath = Join-Path $env:SystemDrive 'Program Files\dotnet'
$paths = $env:Path -split ";" | Where-Object { -not $_.StartsWith($dotnetPath) }
$env:Path = $paths -join ";"

Write-Host "New Path:"
Write-Host $env:Path

# Bootstrap
Import-Module .\tools\ci.psm1
Invoke-CIInstall
displayName: Bootstrap
condition: succeededOrFailed()

- pwsh: |
Import-Module .\tools\ci.psm1
Expand Down
7 changes: 3 additions & 4 deletions .vsts-ci/windows/templates/windows-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ jobs:

- template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml

- powershell: |
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
- pwsh: |
Import-Module .\tools\ci.psm1
Invoke-CIInstall
Invoke-CIInstall -SkipUser
displayName: Bootstrap
condition: succeededOrFailed()
condition: succeeded()

- pwsh: |
Import-Module .\tools\ci.psm1
Expand Down
2 changes: 1 addition & 1 deletion PowerShell.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation.</Copyright>

<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>

Expand Down
50 changes: 31 additions & 19 deletions assets/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@
<Component Id="cmp492FB39320E285A540ADEADE18A5F96E">
<File Id="fil4E40359806A4B4741A94233918CCB490" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-threadpool-legacy-l1-1-0.dll" />
</Component>
<Component Id="cmp07ED031B944723D46CE6E7A4657FAFB2">
<File Id="filF74586FD6002172F05D9C6A86DA9437E" KeyPath="yes" Source="$(var.ProductSourcePath)\clrcompression.dll" />
</Component>
<Component Id="cmp0C53A9DAF0450D9AD0734770DD18662A">
<File Id="fil6653C29C95DDA011D027F382392D8800" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.dll" />
</Component>
Expand Down Expand Up @@ -1599,18 +1596,9 @@
<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>
<Component Id="cmp859A3876902946E7B5B4965F90664C5D">
<File Id="fil2E0E3963F95C47F3BEA7D5A5848D6F28" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Diagnostics.DiagnosticSource.dll" />
</Component>
<Component Id="cmpF1B0E6DCC3BD4797B206C879EF270062">
<File Id="fil2694AE6F8EB8473CBDF0F73A4E55164B" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
</Component>
<Component Id="cmp25A144CC34E545378735B06794A02F90">
<File Id="filFCE4A935DE1D4DD08E9A1D32A07E0266" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Drawing.dll" />
</Component>
Expand All @@ -1620,6 +1608,18 @@
<Component Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" Guid="{ee32f38f-14ee-4a85-914f-d02522cc3635}">
<File Id="fil04B0F83A7AED430A86A7E6E3E99AB45D" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
</Component>
<Component Id="cmp49588B1BA09F4BBCA352B162F387AAF1">
<File Id="fil77BEE4F2A1A44842B4135984E1D71538" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Quic.dll" />
</Component>
<Component Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77">
<File Id="filBC93A3F22F78439F8D4173E4C64ACFDC" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
</Component>
<Component Id="cmp834F3E0C83664E92B0D115A39A8FAACB">
<File Id="fil6A09131961874B31AC3EBEC863CC12C4" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
</Component>
<Component Id="cmp68158D010ECB439582D041355BFACCBB">
<File Id="filB8694A0190CA422E9462870B514B813C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
</Component>
</Directory>
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
Expand Down Expand Up @@ -3054,8 +3054,17 @@
<Component Id="cmp1EBDE676D79B4B0DB859B3F601D78513">
<File Id="fil589A10D0D26C4D7F8479F40D11824D63" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
</Component>
<Component Id="cmp3B3C2686AC3F42D382E2DCE99C86CB31">
<File Id="filC3F2D200DD4C4845ADE4265D02C62595" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.51904.dll" />
<Component Id="cmpB92B70CEFC2F438386F97264FB436CDD">
<File Id="fil824D1A506096432888ABC2FDFAFABEE5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.EventLog.Messages.dll" />
</Component>
<Component Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2">
<File Id="filAD781A5A752E456D9E59E0C5CDF68CAF" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.Quic.dll" />
</Component>
<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>
</DirectoryRef>
</Fragment>
Expand Down Expand Up @@ -3095,7 +3104,6 @@
<ComponentRef Id="cmp5C3D90690414B641947FDA684E9BE9A9" />
<ComponentRef Id="cmp2F126B84C7D50DC3F8F8E273DD6CE7DC" />
<ComponentRef Id="cmp492FB39320E285A540ADEADE18A5F96E" />
<ComponentRef Id="cmp07ED031B944723D46CE6E7A4657FAFB2" />
<ComponentRef Id="cmp0C53A9DAF0450D9AD0734770DD18662A" />
<ComponentRef Id="cmpE4D79A97914A11003CA89DB008133BA0" />
<ComponentRef Id="cmpAA3881D6DE91B932AEE8F4C42EF99218" />
Expand Down Expand Up @@ -3593,10 +3601,7 @@
<ComponentRef Id="cmp1719A38F3C30484BBA189D718AF00D3C" />
<ComponentRef Id="cmp770700CA06564FB187D1CD2A79AA3DA8" />
<ComponentRef Id="cmpEA40E9164309426C88C4388FDCA9559D" />
<ComponentRef Id="cmp34649490F5B04041A08E73D7A86D5A5A" />
<ComponentRef Id="cmpB3116053008E492C9B36C89BF682B8F7" />
<ComponentRef Id="cmp859A3876902946E7B5B4965F90664C5D" />
<ComponentRef Id="cmpF1B0E6DCC3BD4797B206C879EF270062" />
<ComponentRef Id="cmp25A144CC34E545378735B06794A02F90" />
<ComponentRef Id="cmp19ADFEFDD03047828CF493B5B5CE7B6E" />
<ComponentRef Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B" />
Expand Down Expand Up @@ -4041,7 +4046,14 @@
<ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
<ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
<ComponentRef Id="cmp1EBDE676D79B4B0DB859B3F601D78513" />
<ComponentRef Id="cmp3B3C2686AC3F42D382E2DCE99C86CB31" />
<ComponentRef Id="cmpB92B70CEFC2F438386F97264FB436CDD" />
<ComponentRef Id="cmp49588B1BA09F4BBCA352B162F387AAF1" />
<ComponentRef Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77" />
<ComponentRef Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2" />
<ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
<ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
<ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
<ComponentRef Id="cmpD9AA61B3F5F44A7B99E535A712E8310D" />
</ComponentGroup>
</Fragment>
</Wix>
7 changes: 4 additions & 3 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,8 @@ Fix steps:
}

# setup arguments
$Arguments = @("publish","--no-restore","/property:GenerateFullPaths=true")
# adding ErrorOnDuplicatePublishOutputFiles=false due to .NET SDk issue: https://github.com/dotnet/sdk/issues/15748
$Arguments = @("publish","--no-restore","/property:GenerateFullPaths=true", "/property:ErrorOnDuplicatePublishOutputFiles=false")
if ($Output -or $SMAOnly) {
$Arguments += "--output", (Split-Path $Options.Output)
}
Expand Down Expand Up @@ -750,8 +751,8 @@ function New-PSOptions {
[ValidateSet("Debug", "Release", "CodeCoverage", '')]
[string]$Configuration,

[ValidateSet("net5.0")]
[string]$Framework = "net5.0",
[ValidateSet("net6.0")]
[string]$Framework = "net6.0",

# These are duplicated from Start-PSBuild
# We do not use ValidateScript since we want tab completion
Expand Down
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": "5.0.100"
"version": "6.0.100-preview.1.21104.4"
}
}
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="5.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.1.21102.12" />
</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.8.0" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0-3.final" />
<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="NJsonSchema" Version="10.3.4" />
</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="5.0.0" />
<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-preview.1.21102.12" />
</ItemGroup>

</Project>
22 changes: 11 additions & 11 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 @@ -16,21 +16,21 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
<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="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.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" />
<!-- 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" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.7.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />
<PackageReference Include="System.ServiceModel.Security" Version="4.7.0" />
<PackageReference Include="System.Private.ServiceModel" Version="4.7.0" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.Http" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.Security" Version="4.8.1" />
<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.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
</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="5.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.1.21102.12" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/PSGalleryModules.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation.</Copyright>

<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ResGen/ResGen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Generates C# typed bindings for .resx files</Description>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>resgen</AssemblyName>
<OutputType>Exe</OutputType>
<TieredCompilation>true</TieredCompilation>
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.16.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Management" Version="5.0.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
<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" />
<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" />
<!-- 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/help/HelpCommentsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ internal XmlDocument BuildXmlFromComments()
foreach (string link in _links)
{
XmlElement navigationLink = _doc.CreateElement("maml:navigationLink", mamlURI);
bool isOnlineHelp = Uri.IsWellFormedUriString(Uri.EscapeUriString(link), UriKind.Absolute);
bool isOnlineHelp = Uri.IsWellFormedUriString(link, UriKind.Absolute);
string nodeName = isOnlineHelp ? "maml:uri" : "maml:linkText";
XmlElement linkText = _doc.CreateElement(nodeName, mamlURI);
XmlText linkText_text = _doc.CreateTextNode(link);
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public SwitchParameter UseDefaultCredentials
}
}

internal bool _useDefaultCredentials = false;
private bool _useDefaultCredentials = false;

/// <summary>
/// Forces the operation to complete.
Expand Down Expand Up @@ -397,7 +397,7 @@ protected override void EndProcessing()
/// <param name="fullyQualifiedNames">FullyQualifiedNames.</param>
internal void Process(IEnumerable<string> moduleNames, IEnumerable<ModuleSpecification> fullyQualifiedNames)
{
_helpSystem.WebClient.UseDefaultCredentials = _useDefaultCredentials;
_helpSystem.UseDefaultCredentials = _useDefaultCredentials;

if (moduleNames != null)
{
Expand Down
Loading