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

Update .NET SDK to 5.0.100-preview.4.20229.10 (#12538)

Browse source
This commit is contained in:
Aditya Patwardhan 2020-05-04 18:17:52 -07:00 committed by GitHub
parent 6d1d62f2f8
commit 633e52f345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 46 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
assets/files.wxs
View file

@ -1628,6 +1628,15 @@
<Component Id="cmp70A5A090C6B94E8F8FC9B4AE5EC2969B" Guid="{5cf8209b-8488-4893-a0f3-980efa86fdf3}">
<File Id="filEA22911E047A40639E7956721F71EF20" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Net.Http.Json.dll" />
</Component>
<Component Id="cmpD5CAB799D1E7463A92559D3D8E71172C" Guid="{59360882-1e56-4d42-8827-94e717dc8e59}">
<File Id="filC2A0FD15EBA746A1947C30890680DFBC" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
</Component>
<Component Id="cmp10A3BA8FB6304CDE98FA8E6D57223EEF" Guid="{20cb4c09-186a-47e8-9de4-f8e6a4645f5e}">
<File Id="fil18191ACBB726400787A4ACA7622EA6D0" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
</Component>
<Component Id="cmpA57645B04E5F4D66AC598512C95AA1B9" Guid="{34a47e3e-1994-4d3c-832f-3a4565f86d09}">
<File Id="fil2315EFD6FCA7485FA63DCD66B0505E20" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
</Component>
</Directory>
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B" Guid="{CE8DDB7C-A16E-4A1E-80D5-9937D07A1723}">
@ -3089,8 +3098,8 @@
<Component Id="cmpDBF82E0B595545C691EFDEA6D0A55EC2" Guid="{04a2d230-ce2e-4957-bc6d-e7794b88fae3}">
<File Id="filCE6DF8BB560F4785A4111E43CD9C14D7" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
</Component>
<Component Id="cmp13515D4829AC4B15B5F88CDF4E8A945F" Guid="{106c3e0d-1e08-4495-8d36-97a61d49042c}">
<File Id="fil86E7BBB3A3B449A794C6CC1F989F6E35" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.21406.dll" />
<Component Id="cmp5D77F9D45B004ABE86B4740264F52117" Guid="{a64ec3c7-7097-48dc-88d8-1ba099716d74}">
<File Id="fil349DD627B88248BCADD4736536C35A5F" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.22709.dll" />
</Component>
</DirectoryRef>
</Fragment>
@ -4086,8 +4095,11 @@
<ComponentRef Id="cmpBB705B2570064C99A71B6FA65CDF9DC8" />
<ComponentRef Id="cmp34136CBBA4D04B638DA510C5BB521625" />
<ComponentRef Id="cmpDBF82E0B595545C691EFDEA6D0A55EC2" />
<ComponentRef Id="cmp13515D4829AC4B15B5F88CDF4E8A945F" />
<ComponentRef Id="cmp70A5A090C6B94E8F8FC9B4AE5EC2969B" />
<ComponentRef Id="cmpD5CAB799D1E7463A92559D3D8E71172C" />
<ComponentRef Id="cmp10A3BA8FB6304CDE98FA8E6D57223EEF" />
<ComponentRef Id="cmp5D77F9D45B004ABE86B4740264F52117" />
<ComponentRef Id="cmpA57645B04E5F4D66AC598512C95AA1B9" />
</ComponentGroup>
</Fragment>
</Wix>

2
global.json
View file

@ -1,5 +1,5 @@
{
"sdk": {
"version": "5.0.100-preview.3.20216.6"
"version": "5.0.100-preview.4.20229.10"
}
}

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-preview.4.20223.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.4.20227.9" />
</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.5.0" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="NJsonSchema" Version="10.1.12" />
</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-preview.4.20223.9" />
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.4.20227.9" />
</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-preview.4.20223.9" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.4.20227.9" />
<!-- 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-preview.4.20223.9" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.4.20227.9" />
</ItemGroup>
</Project>

2
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file

@ -9,7 +9,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-preview.4.20223.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.4.20227.9" />
</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.14.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Management" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Management" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20227.9" />
<!-- 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.0.0" />

1
test/powershell/Host/Startup.Tests.ps1
View file

@ -71,7 +71,6 @@ Describe "Validate start of console host" -Tag CI {
'System.Management.dll'
'System.Security.Claims.dll'
'System.Security.Cryptography.Primitives.dll'
'System.Security.Principal.dll'
'System.Threading.Overlapped.dll'
)
}

8
test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Member.Tests.ps1
View file

@ -43,9 +43,11 @@ Describe "Get-Member" -Tags "CI" {
It "Should be able to be called on IntPtr" {
$results = [System.IntPtr] | Get-Member -Type Property -Static | Sort-Object -Property Name
$results.Count | Should -BeExactly 2
$results[0].Name | Should -BeExactly 'Size'
$results[1].Name | Should -BeExactly 'Zero'
$results.Count | Should -BeExactly 4
$results[0].Name | Should -BeExactly 'MaxValue'
$results[1].Name | Should -BeExactly 'MinValue'
$results[2].Name | Should -BeExactly 'Size'
$results[3].Name | Should -BeExactly 'Zero'
}
It "Should work with incomplete parameter '-i'" {

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

@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.4.20227.9" />
</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-preview.4.20224.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-preview.4.20228.15" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20227.9" />
</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-preview.4.20223.9" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20227.9" />
</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-preview.4.20223.9" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.4.20223.9" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.4.20227.9" />
</ItemGroup>
</Project>