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

Bump .NET to version 5.0.100-rtm.20526.5 (#13920)

Browse source
This commit is contained in:
Aditya Patwardhan 2020-11-02 16:51:35 -08:00 committed by GitHub
parent f03952fc3c
commit e99f055c69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 35 additions and 30 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-rc.2
FROM mcr.microsoft.com/dotnet/nightly/sdk:5.0.100
# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive

6
assets/files.wxs
View file

@ -3057,8 +3057,8 @@
<Component Id="cmp1EBDE676D79B4B0DB859B3F601D78513">
<File Id="fil589A10D0D26C4D7F8479F40D11824D63" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
</Component>
<Component Id="cmp87CB3D2B4C824957B53B919BA27C49CA">
<File Id="fil242AB951E1634EF1AF2004ADD818E67B" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.47505.dll" />
<Component Id="cmp3B3C2686AC3F42D382E2DCE99C86CB31">
<File Id="filC3F2D200DD4C4845ADE4265D02C62595" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.51904.dll" />
</Component>
</DirectoryRef>
</Fragment>
@ -4045,7 +4045,7 @@
<ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
<ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
<ComponentRef Id="cmp1EBDE676D79B4B0DB859B3F601D78513" />
<ComponentRef Id="cmp87CB3D2B4C824957B53B919BA27C49CA" />
<ComponentRef Id="cmp3B3C2686AC3F42D382E2DCE99C86CB31" />
</ComponentGroup>
</Fragment>
</Wix>

5
build.psm1
View file

@ -1772,6 +1772,11 @@ function Start-PSBootstrap {
Write-Log -message "Installing PowerShell build dependencies"
# Temporary workaround to consume .NET 5 pre-release RTM build. Remove after .NET 5 RTM. Details: https://github.com/PowerShell/PowerShell/issues/13974
if ($Version -eq '5.0.100') {
$Version = '5.0.100-rtm.20526.5'
}
Push-Location $PSScriptRoot/tools
try {

2
global.json
View file

@ -1,5 +1,5 @@
{
"sdk": {
"version": "5.0.100-rc.2.20479.15"
"version": "5.0.100"
}
}

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-rc.2.20475.5" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
</ItemGroup>
</Project>

4
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -32,8 +32,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="NJsonSchema" Version="10.2.2" />
</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-rc.2.20475.5" />
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0" />
</ItemGroup>
</Project>

8
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file

@ -18,9 +18,9 @@
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-rc.2.20475.5" />
<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" />
<!-- 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" />
@ -30,7 +30,7 @@
<PackageReference Include="System.Private.ServiceModel" Version="4.7.0" />
<!-- 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-rc.2.20475.5" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
</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-rc.2.20475.5" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
</ItemGroup>
<PropertyGroup>

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.15.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Management" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-rc.2.20475.5" />
<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" />
<!-- 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-rc.2" />

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

@ -13,7 +13,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
</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-rc.2.20475.17" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
</ItemGroup>
<ItemGroup>

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

@ -14,6 +14,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0" />
</ItemGroup>
</Project>

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

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-rc.2.20475.5" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
</ItemGroup>
</Project>