diff --git a/global.json b/global.json
index de9b44d3e3b..0519736ab95 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "9.0.100-preview.6.24328.19"
+ "version": "9.0.100-rc.1.24452.12"
}
}
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
index a438fa73e0d..9f36b8134d1 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
@@ -8,7 +8,7 @@
-
+
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 cfa5ea247dc..695ed6f21e4 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.Management/cimSupport/cmdletization/cim/cimConverter.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
index 5522049a48f..17a085b7ce5 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
@@ -425,7 +425,9 @@ internal static object ConvertFromCimToDotNet(object cimObject, Type expectedDot
var cimIntrinsicValue = (byte[])LanguagePrimitives.ConvertTo(cimObject, typeof(byte[]), CultureInfo.InvariantCulture);
return exceptionSafeReturn(delegate
{
+ #pragma warning disable SYSLIB0057
return new X509Certificate2(cimIntrinsicValue);
+ #pragma warning restore SYSLIB0057
});
}
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 9dd33935fc2..113d62231f0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -33,8 +33,8 @@
-
-
+
+
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 4271ef37843..1296b1e28ba 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 4bc37fa3d11..34c462edbd4 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -21,9 +21,9 @@
-
-
-
+
+
+
-
+
diff --git a/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs b/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
index 4d65d628ad3..e3a386ee507 100644
--- a/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
@@ -208,8 +208,11 @@ protected override void ProcessRecord()
private static X509Certificate2 GetCertFromPfxFile(string path, SecureString password)
{
+ // No overload found in X509CertificateLoader that takes SecureString
+ #pragma warning disable SYSLIB0057
var cert = new X509Certificate2(path, password, X509KeyStorageFlags.DefaultKeySet);
return cert;
+ #pragma warning restore SYSLIB0057
}
}
}
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 382b7c63913..9a8f4973d1a 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 3319c928fa2..e4b0c5d7e48 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -34,16 +34,16 @@
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
diff --git a/src/System.Management.Automation/engine/serialization.cs b/src/System.Management.Automation/engine/serialization.cs
index 244e83d6af9..9e2fe5db58a 100644
--- a/src/System.Management.Automation/engine/serialization.cs
+++ b/src/System.Management.Automation/engine/serialization.cs
@@ -7292,7 +7292,9 @@ internal static PSSenderInfo RehydratePSSenderInfo(PSObject pso)
private static System.Security.Cryptography.X509Certificates.X509Certificate2 RehydrateX509Certificate2(PSObject pso)
{
byte[] rawData = GetPropertyValue(pso, "RawData");
+ #pragma warning disable SYSLIB0057
return new System.Security.Cryptography.X509Certificates.X509Certificate2(rawData);
+ #pragma warning restore SYSLIB0057
}
private static System.Security.Cryptography.X509Certificates.X500DistinguishedName RehydrateX500DistinguishedName(PSObject pso)
diff --git a/src/System.Management.Automation/security/SecuritySupport.cs b/src/System.Management.Automation/security/SecuritySupport.cs
index 2089c2217ed..0c563eb46b3 100644
--- a/src/System.Management.Automation/security/SecuritySupport.cs
+++ b/src/System.Management.Automation/security/SecuritySupport.cs
@@ -1104,7 +1104,10 @@ private void ResolveFromBase64Encoding(ResolutionPurpose purpose, out ErrorRecor
var certificatesToProcess = new X509Certificate2Collection();
try
{
+ #pragma warning disable SYSLIB0057
X509Certificate2 newCertificate = new X509Certificate2(messageBytes);
+ #pragma warning restore SYSLIB0057
+
certificatesToProcess.Add(newCertificate);
}
catch (Exception)
@@ -1182,7 +1185,9 @@ private void ResolveFromPath(SessionState sessionState, ResolutionPurpose purpos
try
{
+ #pragma warning disable SYSLIB0057
certificate = new X509Certificate2(path);
+ #pragma warning restore SYSLIB0057
}
catch (Exception)
{
@@ -1337,7 +1342,7 @@ internal static class AmsiUtils
static AmsiUtils()
{
#if !UNIX
- try
+ try
{
s_amsiInitFailed = !CheckAmsiInit();
}
@@ -1347,7 +1352,7 @@ static AmsiUtils()
s_amsiInitFailed = true;
return;
}
-
+
PSEtwLog.LogAmsiUtilStateEvent($"init-{s_amsiInitFailed}", $"{s_amsiContext}-{s_amsiSession}");
#endif
}
diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1
index 2845e79cccd..35c22fefe58 100644
--- a/test/powershell/Host/Startup.Tests.ps1
+++ b/test/powershell/Host/Startup.Tests.ps1
@@ -71,6 +71,7 @@ Describe "Validate start of console host" -Tag CI {
}
else {
$allowedAssemblies += @(
+ 'System.Diagnostics.DiagnosticSource.dll'
'System.Net.Sockets.dll'
)
}
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 38deb50c615..f6ca75e1dae 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/test/tools/WebListener/Program.cs b/test/tools/WebListener/Program.cs
index a2d49a45fc5..500e1c7062c 100644
--- a/test/tools/WebListener/Program.cs
+++ b/test/tools/WebListener/Program.cs
@@ -44,7 +44,10 @@ public static IWebHost BuildWebHost(string[] args) =>
int.Parse(args[3]),
listenOptions =>
{
+ #pragma warning disable SYSLIB0057
var certificate = new X509Certificate2(args[0], args[1]);
+ #pragma warning restore SYSLIB0057
+
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
httpsOption.SslProtocols = SslProtocols.Tls12;
httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
@@ -60,7 +63,10 @@ public static IWebHost BuildWebHost(string[] args) =>
int.Parse(args[4]),
listenOptions =>
{
+ #pragma warning disable SYSLIB0057
var certificate = new X509Certificate2(args[0], args[1]);
+ #pragma warning restore SYSLIB0057
+
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
// TLS 1.1 is obsolete. Using this value now defaults to TLS 1.2.
@@ -79,7 +85,10 @@ public static IWebHost BuildWebHost(string[] args) =>
int.Parse(args[5]),
listenOptions =>
{
+ #pragma warning disable SYSLIB0057
var certificate = new X509Certificate2(args[0], args[1]);
+ #pragma warning restore SYSLIB0057
+
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
// TLS is obsolete. Using this value now defaults to TLS 1.2.
@@ -98,7 +107,10 @@ public static IWebHost BuildWebHost(string[] args) =>
int.Parse(args[6]),
listenOptions =>
{
+ #pragma warning disable SYSLIB0057
var certificate = new X509Certificate2(args[0], args[1]);
+ #pragma warning restore SYSLIB0057
+
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
httpsOption.SslProtocols = SslProtocols.Tls13;
httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index c6cd9d4c6eb..791be2fd228 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,7 +7,7 @@
-
-
+
+