From 38909f7ee5c14931b8de6a462c5870734d2e78a4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 11 May 2022 18:27:51 -0700
Subject: [PATCH] Update .NET SDK version from `7.0.100-preview.2.22153.17` to
`7.0.100-preview.4.22252.9` (#17061)
---
assets/wix/files.wxs | 88 +++----------------
global.json | 2 +-
...soft.PowerShell.Commands.Management.csproj | 2 +-
...crosoft.PowerShell.Commands.Utility.csproj | 6 +-
...crosoft.PowerShell.CoreCLR.Eventing.csproj | 2 +-
.../Microsoft.PowerShell.SDK.csproj | 8 +-
.../Microsoft.WSMan.Management.csproj | 2 +-
.../System.Management.Automation.csproj | 14 +--
.../engine/MshMemberInfo.cs | 2 +-
.../WebCmdlets.Tests.ps1 | 28 ------
...soft.PowerShell.NamedPipeConnection.csproj | 2 +-
test/tools/TestService/TestService.csproj | 2 +-
test/tools/WebListener/Program.cs | 10 ++-
test/tools/WebListener/WebListener.csproj | 4 +-
14 files changed, 43 insertions(+), 129 deletions(-)
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 49baf7615b1f..020d9c09fd32 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -71,9 +71,6 @@
-
-
-
@@ -86,9 +83,6 @@
-
-
-
@@ -149,9 +143,6 @@
-
-
-
@@ -269,9 +260,6 @@
-
-
-
@@ -368,9 +356,6 @@
-
-
-
@@ -422,9 +407,6 @@
-
-
-
@@ -491,18 +473,12 @@
-
-
-
-
-
-
@@ -542,9 +518,6 @@
-
-
-
@@ -611,9 +584,6 @@
-
-
-
@@ -974,21 +944,12 @@
-
-
-
-
-
-
-
-
-
@@ -1013,9 +974,6 @@
-
-
-
@@ -1025,9 +983,6 @@
-
-
-
@@ -1049,9 +1004,6 @@
-
-
-
@@ -1121,9 +1073,6 @@
-
-
-
@@ -1641,6 +1590,9 @@
+
+
+
@@ -3137,9 +3089,6 @@
-
-
-
@@ -3180,15 +3129,18 @@
-
-
-
+
+
+
+
+
+
@@ -3216,12 +3168,10 @@
-
-
@@ -3242,7 +3192,6 @@
-
@@ -3282,7 +3231,6 @@
-
@@ -3315,7 +3263,6 @@
-
@@ -3333,7 +3280,6 @@
-
@@ -3356,10 +3302,8 @@
-
-
@@ -3373,7 +3317,6 @@
-
@@ -3396,7 +3339,6 @@
-
@@ -3517,11 +3459,8 @@
-
-
-
@@ -3530,11 +3469,9 @@
-
-
@@ -3542,7 +3479,6 @@
-
@@ -3566,7 +3502,6 @@
-
@@ -4160,7 +4095,6 @@
-
@@ -4210,10 +4144,12 @@
-
+
+
+
diff --git a/global.json b/global.json
index 463c146c54bf..e097be7392b6 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "7.0.100-preview.2.22153.17"
+ "version": "7.0.100-preview.4.22252.9"
}
}
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 50cb39f3206b..b0e6f222c494 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@@ -47,7 +47,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 620cb7e718a9..b04e27161cd8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
-
-
-
+
+
+
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 3afc56915684..76028af5a3d1 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index a7f86581f9ae..b4f715464c18 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
-
-
-
+
+
+
@@ -30,7 +30,7 @@
-
+
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index a0d5f1f3c340..073b47d15872 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 56a1e8adeb34..76a93854defa 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
-
-
-
+
+
+
-
+
-
-
-
+
+
+
diff --git a/src/System.Management.Automation/engine/MshMemberInfo.cs b/src/System.Management.Automation/engine/MshMemberInfo.cs
index 4856b08fb75a..ce495f13423c 100644
--- a/src/System.Management.Automation/engine/MshMemberInfo.cs
+++ b/src/System.Management.Automation/engine/MshMemberInfo.cs
@@ -2691,7 +2691,7 @@ private static Type GetMethodGroupType(MethodInfo methodInfo)
return DelegateHelpers.MakeDelegate(methodTypes);
}
- catch (TypeLoadException)
+ catch (Exception)
{
return typeof(Func);
}
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
index 181cbbcf8791..7a5ad26d5456 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
@@ -1757,24 +1757,11 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
$testCases2 = @(
@{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls13'}; Pending = $true }
- # Removed this as Tls now default to Tls12
- # @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
- @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls11'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
- # Removed this as Tls now default to Tls12
- # @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
- @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
- @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls'}; Pending = $false }
- @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
- # Removed this as Tls now default to Tls12
- # @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls11, Tls12, Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
@{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls13'}; Pending = $true }
@{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
- @{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
- # Removed this as Tls now default to Tls12
- # @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
)
}
@@ -3358,24 +3345,9 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
$testCases2 = @(
@{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls13'}; Pending = $true }
- # Removed this as Tls now default to Tls12
- # @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
- @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls11'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
- # Removed this as Tls now default to Tls12
- # @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
- @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
- @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls'}; Pending = $false }
- @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
- # Removed this as Tls now default to Tls12
- # @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
- @{ Test = @{IntendedProtocol = 'Tls11, Tls12, Tls13'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls13'}; Pending = $true }
- @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
- @{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
- # Removed this as Tls now default to Tls12
- # @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
)
}
diff --git a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
index 07d33c9a11d0..b1e7f09fa6b3 100644
--- a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
+++ b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
@@ -14,7 +14,7 @@
-
+
.\Ref\System.Management.Automation.dll
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 50338b19df36..ce9637897b23 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/test/tools/WebListener/Program.cs b/test/tools/WebListener/Program.cs
index 37a62a582688..a2d49a45fc53 100644
--- a/test/tools/WebListener/Program.cs
+++ b/test/tools/WebListener/Program.cs
@@ -62,7 +62,10 @@ public static void Main(string[] args)
{
var certificate = new X509Certificate2(args[0], args[1]);
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
- httpsOption.SslProtocols = SslProtocols.Tls11;
+
+ // TLS 1.1 is obsolete. Using this value now defaults to TLS 1.2.
+ httpsOption.SslProtocols = SslProtocols.Tls12;
+
httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
@@ -78,7 +81,10 @@ public static void Main(string[] args)
{
var certificate = new X509Certificate2(args[0], args[1]);
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
- httpsOption.SslProtocols = SslProtocols.Tls;
+
+ // TLS is obsolete. Using this value now defaults to TLS 1.2.
+ httpsOption.SslProtocols = SslProtocols.Tls12;
+
httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 878d2547786f..242e5f762420 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
-
-
+
+