8000 Update .NET to `6.0.0-preview.3` (#15221) · PowerShell/PowerShell@4a7bea0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4a7bea0

Browse files
adityapatwardhanadityapatwardhan
authored
Update .NET to 6.0.0-preview.3 (#15221)
1 parent 046e0fe commit 4a7bea0

File tree

14 files changed

+32
-30
lines changed

14 files changed

+32
-30
lines changed

‎assets/wix/files.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3066,8 +3066,8 @@< 8000 /div>
30663066
<Component Id="cmp3547A55EA9D04784B4CF2FC717447E16">
30673067
<File Id="fil463DDA419769417A8D5A34C433E194F2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Speech.dll" />
30683068
</Component>
3069-
<Component Id="cmp5FDF8631A090425A90B27344B4C2A62A">
3070-
<File Id="fil97828F3C973A46BDB0EF08D17F630D73" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.15406.dll" />
3069+
<Component Id="cmpB04D9BE0F32F4D029D3CAD90DF288929">
3070+
<File Id="fil0EBD96C46E4F4537A32B8B1210CAF9C6" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.20104.dll" />
30713071
</Component>
30723072
</DirectoryRef>
30733073
</Fragment>
@@ -4057,7 +4057,7 @@
40574057
<ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
40584058
<ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
40594059
<ComponentRef Id="cmp3547A55EA9D04784B4CF2FC717447E16" />
4060-
<ComponentRef Id="cmp5FDF8631A090425A90B27344B4C2A62A" />
4060+
<ComponentRef Id="cmpB04D9BE0F32F4D029D3CAD90DF288929" />
40614061
</ComponentGroup>
40624062
</Fragment>
40634063
</Wix>

‎global.json

Lines changed: 1 additi 8000 on & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-preview.2.21155.3"
3+
"version": "6.0.100-preview.3.21202.5"
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="6.0.0-preview.2.21154.6" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.3.21201.4" />
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.10.0-1.final" />
35-
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.2.21154.6" />
36-
<PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.2.21154.6" />
35+
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.3.21201.4" />
36+
<PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.3.21201.4" />
3737
<PackageReference Include="NJsonSchema" Version="10.4.1" />
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="6.0.0-preview.2.21154.6" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-preview.3.21201.4" />
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.2" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="6.0.0-preview.2.21154.6" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.2.21154.6" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.2.21154.6" />
21+
<PackageReference Include="System.IO.Packaging" Version="6.0.0-preview.3.21201.4" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.3.21201.4" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.3.21201.4" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
2525
<PackageReference Include="System.ServiceModel.Duplex" Version="4.8.1" />
2626
<PackageReference Include="System.ServiceModel.Http" Version="4.8.1" />
@@ -30,7 +30,7 @@
3030
<PackageReference Include="System.Private.ServiceModel" Version="4.8.1" />
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="6.0.0-preview.2.21154.6" />
33+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.3.21201.4" />
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="6.0.0-preview.2.21154.6" />
13+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.3.21201.4" />
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.17.0" />
1818
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
19-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.2.21154.6" />
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.2.21154.6" />
21-
<PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.2.21154.6" />
22-
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.2.21154.6" />
23-
<PackageReference Include="System.Management" Version="6.0.0-preview.2.21154.6" />
24-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.2.21154.6" />
25-
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
26-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-preview.2.21154.6" />
27-
<PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.2.21154.6" />
28-
<PackageRe 10000 ference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.2.21154.6" />
19+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.3.21201.4" />
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.3.21201.4" />
21+
<PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.3.21201.4" />
22+
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.3.21201.4" />
23+
<PackageReference Include="System.Management" Version="6.0.0-preview.3.21201.4" />
24+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.3.21201.4" />
25+
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.3.21201.4" />
26+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-preview.3.21201.4" />
27+
<PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.3.21201.4" />
28+
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.3.21201.4" />
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.2.0-preview.1" />

‎src/System.Management.Automation/engine/CoreAdapter.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3439,9 +3439,11 @@ internal static bool DisallowPrivateReflection(Type type)
34393439
}
34403440
else
34413441
{
3442+
#pragma warning disable SYSLIB0015
34423443
// Check for 'DisablePrivateReflectionAttribute'. It's applied at the assembly level, and allow an assembly to opt-out of private/internal reflection.
34433444
var disablePrivateReflectionAttribute = assembly.GetCustomAttribute<System.Runtime.CompilerServices.DisablePrivateReflectionAttribute>();
34443445
disallowReflection = disablePrivateReflectionAttribute != null;
3446+
#pragma warning restore SYSLIB0015
34453447
}
34463448

34473449
s_disallowReflectionCache.TryAdd(assembly.FullName, disallowReflection);

‎test/powershell/Host/Startup.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Describe "Validate start of console host" -Tag CI {
5252
'System.Runtime.Serialization.Primitives.dll'
5353
'System.Security.AccessControl.dll'
5454
'System.Security.Cryptography.Encoding.dll'
55+
'System.Security.Cryptography.Primitives.dll'
5556
'System.Security.Cryptography.X509Certificates.dll'
5657
'System.Security.Principal.Windows.dll'
5758
'System.Text.Encoding.Extensions.dll'
@@ -70,7 +71,6 @@ Describe "Validate start of console host" -Tag CI {
7071
'System.DirectoryServices.dll'
7172
'System.Management.dll'
7273
'System.Security.Claims.dll'
73-
'System.Security.Cryptography.Primitives.dll'
7474
'System.Threading.Overlapped.dll'
7575
)
7676
}

0 commit comments

Comments
 (0)
0