maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Aditya Patwardhan 2021-02-08 17:13:33 -08:00 committed by GitHub
parent 6c633e7fc2
commit b836de8223
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 128 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.devcontainer/Dockerfile
View file

@ -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

9
.vsts-ci/templates/ci-build.yml
View file

@ -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

8
.vsts-ci/templates/nix-test.yml
View file

@ -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'

13
.vsts-ci/templates/windows-test.yml
View file

@ -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

7
.vsts-ci/windows/templates/windows-packaging.yml
View file

@ -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

2
PowerShell.Common.props
View file

@ -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>

50
assets/files.wxs
View file

@ -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>
@ -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>
@ -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">
@ -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>
@ -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" />
@ -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" />
@ -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
build.psm1
View file

@ -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)
}
@ -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

2
global.json
View file

@ -1,5 +1,5 @@
{
"sdk": {
"version": "5.0.100"
"version": "6.0.100-preview.1.21104.4"
}
}

2
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file

@ -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
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -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>

2
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file

@ -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
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file

@ -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
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file

@ -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>

2
src/Modules/PSGalleryModules.csproj
View file

@ -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>

2
src/ResGen/ResGen.csproj
View file

@ -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>

20
src/System.Management.Automation/System.Management.Automation.csproj
View file

@ -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" />

2
src/System.Management.Automation/help/HelpCommentsParser.cs
View file

@ -448,7 +448,7 @@ namespace System.Management.Automation
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);

4
src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
View file

@ -102,7 +102,7 @@ namespace Microsoft.PowerShell.Commands
}
}
internal bool _useDefaultCredentials = false;
private bool _useDefaultCredentials = false;
/// <summary>
/// Forces the operation to complete.
@ -397,7 +397,7 @@ namespace Microsoft.PowerShell.Commands
/// <param name="fullyQualifiedNames">FullyQualifiedNames.</param>
internal void Process(IEnumerable<string> moduleNames, IEnumerable<ModuleSpecification> fullyQualifiedNames)
{
_helpSystem.WebClient.UseDefaultCredentials = _useDefaultCredentials;
_helpSystem.UseDefaultCredentials = _useDefaultCredentials;
if (moduleNames != null)
{

16
src/System.Management.Automation/help/UpdatableHelpSystem.cs
View file

@ -240,7 +240,9 @@ namespace System.Management.Automation.Help
private readonly UpdatableHelpCommandBase _cmdlet;
private readonly CancellationTokenSource _cancelTokenSource;
internal WebClient WebClient { get; }
internal HttpClient HttpClient { get; }
internal bool UseDefaultCredentials;
internal string CurrentModule { get; set; }
@ -249,7 +251,7 @@ namespace System.Management.Automation.Help
/// </summary>
internal UpdatableHelpSystem(UpdatableHelpCommandBase cmdlet, bool useDefaultCredentials)
{
WebClient = new WebClient();
HttpClient = new HttpClient();
_defaultTimeout = new TimeSpan(0, 0, 30);
_progressEvents = new Collection<UpdatableHelpProgressEventArgs>();
Errors = new Collection<Exception>();
@ -258,7 +260,7 @@ namespace System.Management.Automation.Help
_cmdlet = cmdlet;
_cancelTokenSource = new CancellationTokenSource();
WebClient.UseDefaultCredentials = useDefaultCredentials;
UseDefaultCredentials = useDefaultCredentials;
#if !CORECLR
WebClient.DownloadProgressChanged += new DownloadProgressChangedEventHandler(HandleDownloadProgressChanged);
@ -275,7 +277,7 @@ namespace System.Management.Automation.Help
_completionEvent.Dispose();
#endif
_cancelTokenSource.Dispose();
WebClient.Dispose();
HttpClient.Dispose();
GC.SuppressFinalize(this);
}
@ -339,7 +341,7 @@ namespace System.Management.Automation.Help
string xml;
using (HttpClientHandler handler = new HttpClientHandler())
{
handler.UseDefaultCredentials = WebClient.UseDefaultCredentials;
handler.UseDefaultCredentials = UseDefaultCredentials;
using (HttpClient client = new HttpClient(handler))
{
client.Timeout = _defaultTimeout;
@ -420,7 +422,7 @@ namespace System.Management.Automation.Help
using (HttpClientHandler handler = new HttpClientHandler())
{
handler.AllowAutoRedirect = false;
handler.UseDefaultCredentials = WebClient.UseDefaultCredentials;
handler.UseDefaultCredentials = UseDefaultCredentials;
using (HttpClient client = new HttpClient(handler))
{
client.Timeout = new TimeSpan(0, 0, 30); // Set 30 second timeout
@ -785,7 +787,7 @@ namespace System.Management.Automation.Help
using (HttpClientHandler handler = new HttpClientHandler())
{
handler.AllowAutoRedirect = false;
handler.UseDefaultCredentials = WebClient.UseDefaultCredentials;
handler.UseDefaultCredentials = UseDefaultCredentials;
using (HttpClient client = new HttpClient(handler))
{
client.Timeout = _defaultTimeout;

2
src/TypeCatalogGen/TypeCatalogGen.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Generates CorePsTypeCatalog.cs given powershell.inc</Description>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>TypeCatalogGen</AssemblyName>
<OutputType>Exe</OutputType>
<TieredCompilation>true</TieredCompilation>

2
test/Test.Common.props
View file

@ -6,7 +6,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation.</Copyright>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

4
test/tools/OpenCover/OpenCover.psm1
View file

@ -615,7 +615,7 @@ function Install-OpenCover
.Description
Invoke-OpenCover runs tests under OpenCover by executing tests on PowerShell located at $PowerShellExeDirectory.
.EXAMPLE
Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/net5.0/win7-x64
Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/net6.0/win7-x64
#>
function Invoke-OpenCover
{
@ -624,7 +624,7 @@ function Invoke-OpenCover
[parameter()]$OutputLog = "$HOME/Documents/OpenCover.xml",
[parameter()]$TestPath = "${script:psRepoPath}/test/powershell",
[parameter()]$OpenCoverPath = "$HOME/OpenCover",
[parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net5.0/win7-x64/publish",
[parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net6.0/win7-x64/publish",
[parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
[parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
[parameter()]$PesterLogFormat = "NUnitXml",

2
test/tools/TestService/TestService.csproj
View file

@ -13,7 +13,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
</ItemGroup>
</Project>

4
test/tools/WebListener/WebListener.csproj
View file

@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.1.21102.12" />
</ItemGroup>
<ItemGroup>

9
tools/packaging/packaging.psm1
View file

@ -8,7 +8,7 @@ $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.p
Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
$DebianDistributions = @("ubuntu.16.04", "ubuntu.18.04", "ubuntu.20.04", "debian.9", "debian.10", "debian.11")
$RedhatDistributions = @("rhel.7","centos.8")
$script:netCoreRuntime = 'net5.0'
$script:netCoreRuntime = 'net6.0'
$script:iconFileName = "Powershell_black_64.png"
$script:iconPath = Join-Path -path $PSScriptRoot -ChildPath "../../assets/$iconFileName" -Resolve
@ -2012,7 +2012,7 @@ function New-ILNugetPackage
}
<#
Copy the generated reference assemblies to the 'ref/net5.0' folder properly.
Copy the generated reference assemblies to the 'ref/net6.0' folder properly.
This is a helper function used by 'New-ILNugetPackage'
#>
function CopyReferenceAssemblies
@ -2605,7 +2605,6 @@ function New-NugetContentPackage
$arguments = @('pack')
$arguments += @('--output',$nugetFolder)
$arguments += @('--configuration',$PackageConfiguration)
$arguments += @('--runtime',$PackageRuntime)
$arguments += "/p:StagingPath=$stagingRoot"
$arguments += "/p:RID=$PackageRuntime"
$arguments += "/p:SemVer=$nugetSemanticVersion"
@ -2950,7 +2949,7 @@ function New-MSIPatch
# This example shows how to produce a Debug-x64 installer for development purposes.
cd $RootPathOfPowerShellRepo
Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net5.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net6.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
#>
function New-MSIPackage
{
@ -3184,7 +3183,7 @@ function Start-MsiBuild {
# This example shows how to produce a Debug-x64 installer for development purposes.
cd $RootPathOfPowerShellRepo
Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net5.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net6.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
#>
function New-MSIXPackage
{

2
tools/packaging/packaging.strings.psd1
View file

@ -142,7 +142,7 @@ open {0}
<files include="**/*" buildAction="None" copyToOutput="true" flatten="false" />
</contentFiles>
<dependencies>
<group targetFramework="net5.0"></group>
<group targetFramework="net6.0"></group>
</dependencies>
</metadata>
</package>

2
tools/packaging/projects/nuget/package.csproj
View file

@ -11,6 +11,6 @@
<NuspecProperties>runtime=$(RID);version=$(SemVer);PackageName=$(PackageName)</NuspecProperties>
<NuspecBasePath>$(StagingPath)</NuspecBasePath>
<IsTool>True</IsTool>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
</Project>

4
tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.1.21102.12" />
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
</ItemGroup>
</Project>

2
tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>

6
tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.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" />
</ItemGroup>
</Project>