Skip to content

Commit e99f055

Browse files
adityapatwardhanadityapatwardhan
authored
Bump .NET to version 5.0.100-rtm.20526.5 (PowerShell#13920)
1 parent f03952f commit e99f055

14 files changed

Lines changed: 35 additions & 30 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-rc.2
6+
FROM mcr.microsoft.com/dotnet/nightly/sdk:5.0.100
77

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

‎assets/files.wxs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3057,8 +3057,8 @@
30573057
<Component Id="cmp1EBDE676D79B4B0DB859B3F601D78513">
30583058
<File Id="fil589A10D0D26C4D7F8479F40D11824D63" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
30593059
</Component>
3060-
<Component Id="cmp87CB3D2B4C824957B53B919BA27C49CA">
3061-
<File Id="fil242AB951E1634EF1AF2004ADD818E67B" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.47505.dll" />
3060+
<Component Id="cmp3B3C2686AC3F42D382E2DCE99C86CB31">
3061+
<File Id="filC3F2D200DD4C4845ADE4265D02C62595" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.51904.dll" />
30623062
</Component>
30633063
</DirectoryRef>
30643064
</Fragment>
@@ -4045,7 +4045,7 @@
40454045
<ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
40464046
<ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
40474047
<ComponentRef Id="cmp1EBDE676D79B4B0DB859B3F601D78513" />
4048-
<ComponentRef Id="cmp87CB3D2B4C824957B53B919BA27C49CA" />
4048+
<ComponentRef Id="cmp3B3C2686AC3F42D382E2DCE99C86CB31" />
40494049
</ComponentGroup>
40504050
</Fragment>
40514051
</Wix>

‎build.psm1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1772,6 +1772,11 @@ function Start-PSBootstrap {
17721772

17731773
Write-Log -message "Installing PowerShell build dependencies"
17741774

1775+
# Temporary workaround to consume .NET 5 pre-release RTM build. Remove after .NET 5 RTM. Details: https://github.com/PowerShell/PowerShell/issues/13974
1776+
if ($Version -eq '5.0.100') {
1777+
$Version = '5.0.100-rtm.20526.5'
1778+
}
1779+
17751780
Push-Location $PSScriptRoot/tools
17761781

17771782
try {

‎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-rc.2.20479.15"
3+
"version": "5.0.100"
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-rc.2.20475.5" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
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.7.0" />
35-
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-rc.2.20475.5" />
36-
<PackageReference Include="System.Drawing.Common" Version="5.0.0-rc.2.20475.5" />
35+
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0" />
36+
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
3737
<PackageReference Include="NJsonSchema" Version="10.2.2" />
3838
</ItemGroup>
3939

‎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="5.0.0-rc.2.20475.5" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj‎

Lines changed: 4 additions & 4 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.1" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="5.0.0-rc.2.20475.5" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-rc.2.20475.5" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-rc.2.20475.5" />
21+
<PackageReference Include="System.IO.Packaging" Version="5.0.0" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
2525
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
2626
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />
@@ -30,7 +30,7 @@
3030
<PackageReference Include="System.Private.ServiceModel" Version="4.7.0" />
3131
<!-- the source could not be found for the following package(s) -->
3232
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
33-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-rc.2.20475.5" />
33+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
3434
</ItemGroup>
3535

3636
</Project>

‎src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
1111
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
1212
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
13-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-rc.2.20475.5" />
13+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
1414
</ItemGroup>
1515

1616
<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.15.0" />
1818
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
19-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-rc.2.20475.5" />
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-rc.2.20475.5" />
21-
<PackageReference Include="System.DirectoryServices" Version="5.0.0-rc.2.20475.5" />
22-
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-rc.2.20475.5" />
23-
<PackageReference Include="System.Management" Version="5.0.0-rc.2.20475.5" />
24-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-rc.2.20475.5" />
25-
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-rc.2.20475.5" />
26-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-rc.2.20475.5" />
27-
<PackageReference Include="System.Security.Permissions" Version="5.0.0-rc.2.20475.5" />
28-
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-rc.2.20475.5" />
19+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0" />
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
21+
<PackageReference Include="System.DirectoryServices" Version="5.0.0" />
22+
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
23+
<PackageReference Include="System.Management" Version="5.0.0" />
24+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
25+
<PackageReference Include="System.Security.AccessControl" Version="5.0.0" />
26+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
27+
<PackageReference Include="System.Security.Permissions" Version="5.0.0" />
28+
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
2929
<!-- the following package(s) are from the powershell org -->
3030
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
3131
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.1.0-rc.2" />

0 commit comments

Comments
 (0)