Skip to content

Commit 38909f7

Browse files
Update .NET SDK version from 7.0.100-preview.2.22153.17 to 7.0.100-preview.4.22252.9 (PowerShell#17061)
1 parent 57965f2 commit 38909f7

File tree

14 files changed

+43
-129
lines changed

14 files changed

+43
-129
lines changed

assets/wix/files.wxs

Lines changed: 12 additions & 76 deletions
Large diffs are not rendered by default.

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": "7.0.100-preview.2.22153.17"
3+
"version": "7.0.100-preview.4.22252.9"
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="7.0.0-preview.2.22152.2" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.4.22229.4" />
5151
</ItemGroup>
5252

5353
</Project>

src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0-4.final" />
35-
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.2.22152.2" />
36-
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.2.22152.2" />
34+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-1.final" />
35+
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.4.22229.4" />
36+
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.4.22229.4" />
3737
<PackageReference Include="NJsonSchema" Version="10.6.10" />
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="7.0.0-preview.2.22152.2" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.4.22229.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.3" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.2.22152.2" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.2.22152.2" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.2.22152.2" />
21+
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.4.22229.4" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.4.22229.4" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.4.22229.4" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
2525
<PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0" />
2626
<PackageReference Include="System.ServiceModel.Http" Version="4.9.0" />
@@ -30,7 +30,7 @@
3030
<PackageReference Include="System.Private.ServiceModel" Version="4.9.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="7.0.0-preview.2.22152.2" />
33+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.4.22229.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="7.0.0-preview.2.22152.2" />
13+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.4.22229.4" />
1414
</ItemGroup>
1515

1616
<PropertyGroup>

src/System.Management.Automation/System.Management.Automation.csproj

Lines changed: 7 additions & 7 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.20.0" />
1818
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
19-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.2.22152.2" />
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.2.22152.2" />
21-
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.2.22152.2" />
19+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.4.22229.4" />
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.4.22229.4" />
21+
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.4.22229.4" />
2222
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
23-
<PackageReference Include="System.Management" Version="7.0.0-preview.2.22152.2" />
23+
<PackageReference Include="System.Management" Version="7.0.0-preview.4.22229.4" />
2424
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
2525
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
26-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.2.22152.2" />
27-
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.2.22152.2" />
28-
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.2.22152.2" />
26+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.4.22229.4" />
27+
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.4.22229.4" />
28+
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.4.22229.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.3.0-preview.1" />

src/System.Management.Automation/engine/MshMemberInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2691,7 +2691,7 @@ private static Type GetMethodGroupType(MethodInfo methodInfo)
26912691

26922692
return DelegateHelpers.MakeDelegate(methodTypes);
26932693
}
2694-
catch (TypeLoadException)
2694+
catch (Exception)
26952695
{
26962696
return typeof(Func<PSNonBindableType>);
26972697
}

test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,24 +1757,11 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
17571757

17581758
$testCases2 = @(
17591759
@{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls13'}; Pending = $true }
1760-
# Removed this as Tls now default to Tls12
1761-
# @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
1762-
@{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls11'}; Pending = $false }
17631760
@{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
1764-
# Removed this as Tls now default to Tls12
1765-
# @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
1766-
@{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
1767-
@{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls'}; Pending = $false }
1768-
@{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
17691761
@{ Test = @{IntendedProtocol = 'Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
1770-
# Removed this as Tls now default to Tls12
1771-
# @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
17721762
@{ Test = @{IntendedProtocol = 'Tls11, Tls12, Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
17731763
@{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls13'}; Pending = $true }
17741764
@{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
1775-
@{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
1776-
# Removed this as Tls now default to Tls12
1777-
# @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
17781765
)
17791766
}
17801767

@@ -3358,24 +3345,9 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
33583345

33593346
$testCases2 = @(
33603347
@{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls13'}; Pending = $true }
3361-
# Removed this as Tls now default to Tls12
3362-
# @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
3363-
@{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls11'}; Pending = $false }
33643348
@{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
3365-
# Removed this as Tls now default to Tls12
3366-
# @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
3367-
@{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
3368-
@{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls'}; Pending = $false }
3369-
@{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
33703349
@{ Test = @{IntendedProtocol = 'Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
3371-
# Removed this as Tls now default to Tls12
3372-
# @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
3373-
@{ Test = @{IntendedProtocol = 'Tls11, Tls12, Tls13'; ActualProtocol = 'Tls'}; Pending = $false }
33743350
@{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls13'}; Pending = $true }
3375-
@{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
3376-
@{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
3377-
# Removed this as Tls now default to Tls12
3378-
# @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
33793351
)
33803352
}
33813353

0 commit comments

Comments
 (0)