Skip to content

Commit b836de8

Browse files
adityapatwardhanadityapatwardhan
authored
Bump .NET framework to 6.0.0-preview.1 (PowerShell#14719)
1 parent 6c633e7 commit b836de8

31 files changed

Lines changed: 128 additions & 91 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/nightly/sdk:5.0.100
6+
FROM mcr.microsoft.com/dotnet/nightly/sdk:6.0.100
77

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

‎.vsts-ci/templates/ci-build.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,18 @@ jobs:
2222

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

25+
- pwsh: |
26+
if (Test-Path -Path $HOME/.dotnet) {
27+
Remove-Item $HOME/.dotnet -Recurse -Force
28+
}
29+
displayName: Remove Old .NET SDKs
30+
condition: succeededOrFailed()
31+
2532
- pwsh: |
2633
Import-Module .\tools\ci.psm1
2734
Invoke-CIInstall -SkipUser
2835
displayName: Bootstrap
29-
condition: succeededOrFailed()
36+
condition: succeeded()
3037
3138
- powershell: |
3239
Import-Module .\tools\ci.psm1

‎.vsts-ci/templates/nix-test.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,17 @@ jobs:
3333
displayName: 'Capture Artifacts Directory'
3434
continueOnError: true
3535
36+
- pwsh: |
37+
if (Test-Path -Path $HOME/.dotnet) {
38+
Remove-Item $HOME/.dotnet -Recurse -Force
39+
}
40+
displayName: Remove Old .NET SDKs
41+
condition: succeededOrFailed()
42+
3643
- pwsh: |
3744
Import-Module .\tools\ci.psm1
3845
Invoke-CIInstall -SkipUser
3946
displayName: Bootstrap
40-
condition: succeededOrFailed()
4147
4248
- task: ExtractFiles@1
4349
displayName: 'Extract Build ZIP'

‎.vsts-ci/templates/windows-test.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,21 @@ jobs:
3434
3535
# must be run frow Windows PowerShell
3636
- powershell: |
37+
# Remove "Program Files\dotnet" from the env variable PATH, so old SDKs won't affect us.
38+
Write-Host "Old Path:"
39+
Write-Host $env:Path
40+
41+
$dotnetPath = Join-Path $env:SystemDrive 'Program Files\dotnet'
42+
$paths = $env:Path -split ";" | Where-Object { -not $_.StartsWith($dotnetPath) }
43+
$env:Path = $paths -join ";"
44+
45+
Write-Host "New Path:"
46+
Write-Host $env:Path
47+
48+
# Bootstrap
3749
Import-Module .\tools\ci.psm1
3850
Invoke-CIInstall
3951
displayName: Bootstrap
40-
condition: succeededOrFailed()
4152
4253
- pwsh: |
4354
Import-Module .\tools\ci.psm1

‎.vsts-ci/windows/templates/windows-packaging.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@ jobs:
2222
2323
- template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
2424

25-
- powershell: |
26-
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
25+
- pwsh: |
2726
Import-Module .\tools\ci.psm1
28-
Invoke-CIInstall
27+
Invoke-CIInstall -SkipUser
2928
displayName: Bootstrap
30-
condition: succeededOrFailed()
29+
condition: succeeded()
3130
3231
- pwsh: |
3332
Import-Module .\tools\ci.psm1

‎PowerShell.Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<Company>Microsoft Corporation</Company>
9898
<Copyright>(c) Microsoft Corporation.</Copyright>
9999

100-
<TargetFramework>net5.0</TargetFramework>
100+
<TargetFramework>net6.0</TargetFramework>
101101
<LangVersion>9.0</LangVersion>
102102
<PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
103103

‎assets/files.wxs‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@
104104
<Component Id="cmp492FB39320E285A540ADEADE18A5F96E">
105105
<File Id="fil4E40359806A4B4741A94233918CCB490" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-threadpool-legacy-l1-1-0.dll" />
106106
</Component>
107-
<Component Id="cmp07ED031B944723D46CE6E7A4657FAFB2">
108-
<File Id="filF74586FD6002172F05D9C6A86DA9437E" KeyPath="yes" Source="$(var.ProductSourcePath)\clrcompression.dll" />
109-
</Component>
110107
<Component Id="cmp0C53A9DAF0450D9AD0734770DD18662A">
111108
<File Id="fil6653C29C95DDA011D027F382392D8800" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.dll" />
112109
</Component>
@@ -1599,18 +1596,9 @@
15991596
<Component Id="cmpEA40E9164309426C88C4388FDCA9559D">
16001597
<File Id="fil205C9BE7027A408B985D96F5EEF11594" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Threading.Channels.dll" />
16011598
</Component>
1602-
<Component Id="cmp34649490F5B04041A08E73D7A86D5A5A">
1603-
<File Id="fil2DDAEABD470A475E950B94AC186DAB2E" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
1604-
</Component>
1605-
<Component Id="cmpB3116053008E492C9B36C89BF682B8F7">
1606-
<File Id="fil0D09CC7B4B8A43369D0207AC861D8D21" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
1607-
</Component>
16081599
<Component Id="cmp859A3876902946E7B5B4965F90664C5D">
16091600
<File Id="fil2E0E3963F95C47F3BEA7D5A5848D6F28" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Diagnostics.DiagnosticSource.dll" />
16101601
</Component>
1611-
<Component Id="cmpF1B0E6DCC3BD4797B206C879EF270062">
1612-
<File Id="fil2694AE6F8EB8473CBDF0F73A4E55164B" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
1613-
</Component>
16141602
<Component Id="cmp25A144CC34E545378735B06794A02F90">
16151603
<File Id="filFCE4A935DE1D4DD08E9A1D32A07E0266" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Drawing.dll" />
16161604
</Component>
@@ -1620,6 +1608,18 @@
16201608
<Component Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" Guid="{ee32f38f-14ee-4a85-914f-d02522cc3635}">
16211609
<File Id="fil04B0F83A7AED430A86A7E6E3E99AB45D" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
16221610
</Component>
1611+
<Component Id="cmp49588B1BA09F4BBCA352B162F387AAF1">
1612+
<File Id="fil77BEE4F2A1A44842B4135984E1D71538" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Quic.dll" />
1613+
</Component>
1614+
<Component Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77">
1615+
<File Id="filBC93A3F22F78439F8D4173E4C64ACFDC" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
1616+
</Component>
1617+
<Component Id="cmp834F3E0C83664E92B0D115A39A8FAACB">
1618+
<File Id="fil6A09131961874B31AC3EBEC863CC12C4" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
1619+
</Component>
1620+
<Component Id="cmp68158D010ECB439582D041355BFACCBB">
1621+
<File Id="filB8694A0190CA422E9462870B514B813C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
1622+
</Component>
16231623
</Directory>
16241624
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
16251625
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -3054,8 +3054,17 @@
30543054
<Component Id="cmp1EBDE676D79B4B0DB859B3F601D78513">
30553055
<File Id="fil589A10D0D26C4D7F8479F40D11824D63" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
30563056
</Component>
3057-
<Component Id="cmp3B3C2686AC3F42D382E2DCE99C86CB31">
3058-
<File Id="filC3F2D200DD4C4845ADE4265D02C62595" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.51904.dll" />
3057+
<Component Id="cmpB92B70CEFC2F438386F97264FB436CDD">
3058+
<File Id="fil824D1A506096432888ABC2FDFAFABEE5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.EventLog.Messages.dll" />
3059+
</Component>
3060+
<Component Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2">
3061+
<File Id="filAD781A5A752E456D9E59E0C5CDF68CAF" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.Quic.dll" />
3062+
</Component>
3063+
<Component Id="cmp2BB002B115C247FFB3353C80CAAC10B3">
3064+
<File Id="filF1771BA6F8A140FFB77E7558D035A0F2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.Compression.Native.dll" />
3065+
</Component>
3066+
<Component Id="cmpD9AA61B3F5F44A7B99E535A712E8310D">
3067+
<File Id="fil16547FB6A5EC4C6791FFFF5D561F2D31" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.10212.dll" />
30593068
</Component>
30603069
</DirectoryRef>
30613070
</Fragment>
@@ -3095,7 +3104,6 @@
30953104
<ComponentRef Id="cmp5C3D90690414B641947FDA684E9BE9A9" />
30963105
<ComponentRef Id="cmp2F126B84C7D50DC3F8F8E273DD6CE7DC" />
30973106
<ComponentRef Id="cmp492FB39320E285A540ADEADE18A5F96E" />
3098-
<ComponentRef Id="cmp07ED031B944723D46CE6E7A4657FAFB2" />
30993107
<ComponentRef Id="cmp0C53A9DAF0450D9AD0734770DD18662A" />
31003108
<ComponentRef Id="cmpE4D79A97914A11003CA89DB008133BA0" />
31013109
<ComponentRef Id="cmpAA3881D6DE91B932AEE8F4C42EF99218" />
@@ -3593,10 +3601,7 @@
35933601
<ComponentRef Id="cmp1719A38F3C30484BBA189D718AF00D3C" />
35943602
<ComponentRef Id="cmp770700CA06564FB187D1CD2A79AA3DA8" />
35953603
<ComponentRef Id="cmpEA40E9164309426C88C4388FDCA9559D" />
3596-
<ComponentRef Id="cmp34649490F5B04041A08E73D7A86D5A5A" />
3597-
<ComponentRef Id="cmpB3116053008E492C9B36C89BF682B8F7" />
35983604
<ComponentRef Id="cmp859A3876902946E7B5B4965F90664C5D" />
3599-
<ComponentRef Id="cmpF1B0E6DCC3BD4797B206C879EF270062" />
36003605
<ComponentRef Id="cmp25A144CC34E545378735B06794A02F90" />
36013606
<ComponentRef Id="cmp19ADFEFDD03047828CF493B5B5CE7B6E" />
36023607
<ComponentRef Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B" />
@@ -4041,7 +4046,14 @@
40414046
<ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
40424047
<ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
40434048
<ComponentRef Id="cmp1EBDE676D79B4B0DB859B3F601D78513" />
4044-
<ComponentRef Id="cmp3B3C2686AC3F42D382E2DCE99C86CB31" />
4049+
<ComponentRef Id="cmpB92B70CEFC2F438386F97264FB436CDD" />
4050+
<ComponentRef Id="cmp49588B1BA09F4BBCA352B162F387AAF1" />
4051+
<ComponentRef Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77" />
4052+
<ComponentRef Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2" />
4053+
<ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
4054+
<ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
4055+
<ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
4056+
<ComponentRef Id="cmpD9AA61B3F5F44A7B99E535A712E8310D" />
40454057
</ComponentGroup>
40464058
</Fragment>
40474059
</Wix>

‎build.psm1‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,8 @@ Fix steps:
397397
}
398398

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

753-
[ValidateSet("net5.0")]
754-
[string]$Framework = "net5.0",
754+
[ValidateSet("net6.0")]
755+
[string]$Framework = "net6.0",
755756

756757
# These are duplicated from Start-PSBuild
757758
# We do not use ValidateScript since we want tab completion

‎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"
3+
"version": "6.0.100-preview.1.21104.4"
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" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.1.21102.12" />
5151
</ItemGroup>
5252

5353
</Project>

0 commit comments

Comments
 (0)