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

Update .NET to 6.0.0-preview.3 (#15221)

Browse source
This commit is contained in:
Aditya Patwardhan 2021-04-13 15:45:15 -07:00 committed by GitHub
parent 046e0fea03
commit 4a7bea0082
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assets/wix/files.wxs
View file

@ -3066,8 +3066,8 @@
<Component Id="cmp3547A55EA9D04784B4CF2FC717447E16">
<File Id="fil463DDA419769417A8D5A34C433E194F2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Speech.dll" />
</Component>
<Component Id="cmp5FDF8631A090425A90B27344B4C2A62A">
<File Id="fil97828F3C973A46BDB0EF08D17F630D73" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.15406.dll" />
<Component Id="cmpB04D9BE0F32F4D029D3CAD90DF288929">
<File Id="fil0EBD96C46E4F4537A32B8B1210CAF9C6" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.20104.dll" />
</Component>
</DirectoryRef>
</Fragment>
@ -4057,7 +4057,7 @@
<ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
<ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
<ComponentRef Id="cmp3547A55EA9D04784B4CF2FC717447E16" />
<ComponentRef Id="cmp5FDF8631A090425A90B27344B4C2A62A" />
<ComponentRef Id="cmpB04D9BE0F32F4D029D3CAD90DF288929" />
</ComponentGroup>
</Fragment>
</Wix>

2
global.json
View file

@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.100-preview.2.21155.3"
"version": "6.0.100-preview.3.21202.5"
}
}

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="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.3.21201.4" />
</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.10.0-1.final" />
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="NJsonSchema" Version="10.4.1" />
</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="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-preview.3.21201.4" />
</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.2" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.IO.Packaging" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.3.21201.4" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.Http" Version="4.8.1" />
@ -30,7 +30,7 @@
<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="6.0.0-preview.2.21154.6" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.3.21201.4" />
</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="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.3.21201.4" />
</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.17.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Management" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Management" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.3.21201.4" />
<!-- 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.2.0-preview.1" />

2
src/System.Management.Automation/engine/CoreAdapter.cs
View file

@ -3439,9 +3439,11 @@ namespace System.Management.Automation
}
else
{
#pragma warning disable SYSLIB0015
// Check for 'DisablePrivateReflectionAttribute'. It's applied at the assembly level, and allow an assembly to opt-out of private/internal reflection.
var disablePrivateReflectionAttribute = assembly.GetCustomAttribute<System.Runtime.CompilerServices.DisablePrivateReflectionAttribute>();
disallowReflection = disablePrivateReflectionAttribute != null;
#pragma warning restore SYSLIB0015
}
s_disallowReflectionCache.TryAdd(assembly.FullName, disallowReflection);

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

@ -52,6 +52,7 @@ Describe "Validate start of console host" -Tag CI {
'System.Runtime.Serialization.Primitives.dll'
'System.Security.AccessControl.dll'
'System.Security.Cryptography.Encoding.dll'
'System.Security.Cryptography.Primitives.dll'
'System.Security.Cryptography.X509Certificates.dll'
'System.Security.Principal.Windows.dll'
'System.Text.Encoding.Extensions.dll'
@ -70,7 +71,6 @@ Describe "Validate start of console host" -Tag CI {
'System.DirectoryServices.dll'
'System.Management.dll'
'System.Security.Claims.dll'
'System.Security.Cryptography.Primitives.dll'
'System.Threading.Overlapped.dll'
)
}

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

@ -13,7 +13,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.3.21201.4" />
</ItemGroup>
</Project>

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

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

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

@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
</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="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.2.21154.6" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.3.21201.4" />
<PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.3.21201.4" />
</ItemGroup>
</Project>