diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/BasicHttpTransportWithMessageCredentialSecurityTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/BasicHttpTransportWithMessageCredentialSecurityTests.cs index fb6a9a53d38..e31279c9777 100644 --- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/BasicHttpTransportWithMessageCredentialSecurityTests.cs +++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/BasicHttpTransportWithMessageCredentialSecurityTests.cs @@ -58,8 +58,7 @@ public static void BasicHttps_SecModeTransWithMessCred_CertClientCredential_Succ [WcfTheory] [Issue(2870, OS = OSID.OSX)] [Condition(nameof(Root_Certificate_Installed), - nameof(SSL_Available), - nameof(Skip_CoreWCFService_FailedTest))] + nameof(SSL_Available))] [OuterLoop] [InlineData(TransferMode.Buffered)] [InlineData(TransferMode.Streamed)] @@ -110,8 +109,7 @@ public static void BasicHttps_SecModeTransWithMessCred_UserNameClientCredential_ [WcfFact] [Issue(2870, OS = OSID.OSX)] [Condition(nameof(Root_Certificate_Installed), - nameof(SSL_Available), - nameof(Skip_CoreWCFService_FailedTest))] + nameof(SSL_Available))] [OuterLoop] public static void Https_SecModeTransWithMessCred_UserNameClientCredential_Succeeds() { diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WS2007HttpTransportWithMessageCredentialsSecurityTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WS2007HttpTransportWithMessageCredentialsSecurityTests.cs index bbb9040c85c..bd8d7787d3e 100644 --- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WS2007HttpTransportWithMessageCredentialsSecurityTests.cs +++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WS2007HttpTransportWithMessageCredentialsSecurityTests.cs @@ -15,8 +15,7 @@ public class WS2007HttpTransportWithMessageCredentialsSecurityTests : Conditiona [Issue(2870, OS = OSID.OSX)] [Condition(nameof(Root_Certificate_Installed), nameof(Client_Certificate_Installed), - nameof(SSL_Available), - nameof(Skip_CoreWCFService_FailedTest))] + nameof(SSL_Available))] [OuterLoop] public static void Https_SecModeTransWithMessCred_CertClientCredential_Succeeds() { @@ -62,8 +61,7 @@ public static void Https_SecModeTransWithMessCred_CertClientCredential_Succeeds( [WcfFact] [Condition(nameof(Root_Certificate_Installed), - nameof(SSL_Available), - nameof(Skip_CoreWCFService_FailedTest))] + nameof(SSL_Available))] [OuterLoop] public static void Https_SecModeTransWithMessCred_UserNameClientCredential_Succeeds() { diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSHttpTransportWithMessageCredentialSecurityTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSHttpTransportWithMessageCredentialSecurityTests.cs index 83cd529abcb..400aa085a05 100644 --- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSHttpTransportWithMessageCredentialSecurityTests.cs +++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSHttpTransportWithMessageCredentialSecurityTests.cs @@ -16,8 +16,7 @@ public class WSHttpTransportWithMessageCredentialSecurityTests : ConditionalWcfT [Issue(2870, OS = OSID.OSX)] [Condition(nameof(Root_Certificate_Installed), nameof(Client_Certificate_Installed), - nameof(SSL_Available), - nameof(Skip_CoreWCFService_FailedTest))] + nameof(SSL_Available))] [OuterLoop] public static void Https_SecModeTransWithMessCred_CertClientCredential_Succeeds() { @@ -63,8 +62,7 @@ public static void Https_SecModeTransWithMessCred_CertClientCredential_Succeeds( [WcfFact] [Condition(nameof(Root_Certificate_Installed), - nameof(SSL_Available), - nameof(Skip_CoreWCFService_FailedTest))] + nameof(SSL_Available))] [OuterLoop] public static void Https_SecModeTransWithMessCred_UserNameClientCredential_Succeeds() { diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSNetTcpTransportWithMessageCredentialSecurityTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSNetTcpTransportWithMessageCredentialSecurityTests.cs index c450c68714f..58bbb4563a9 100644 --- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSNetTcpTransportWithMessageCredentialSecurityTests.cs +++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSNetTcpTransportWithMessageCredentialSecurityTests.cs @@ -18,8 +18,7 @@ public class WSNetTcpTransportWithMessageCredentialSecurityTests : ConditionalWc [Issue(2870, OS = OSID.OSX)] [Condition(nameof(Root_Certificate_Installed), nameof(Client_Certificate_Installed), - nameof(SSL_Available), - nameof(Skip_CoreWCFService_FailedTest))] + nameof(SSL_Available))] [OuterLoop] public static void NetTcp_SecModeTransWithMessCred_CertClientCredential_Succeeds() { @@ -66,8 +65,7 @@ public static void NetTcp_SecModeTransWithMessCred_CertClientCredential_Succeeds [WcfFact] [Issue(2870, OS = OSID.OSX)] [Condition(nameof(Root_Certificate_Installed), - nameof(SSL_Available), - nameof(Skip_CoreWCFService_FailedTest))] + nameof(SSL_Available))] [OuterLoop] public static void NetTcp_SecModeTransWithMessCred_UserNameClientCredential_Succeeds() { @@ -116,8 +114,7 @@ public static void NetTcp_SecModeTransWithMessCred_UserNameClientCredential_Succ [WcfFact] [Issue(2870, OS = OSID.OSX)] [Condition(nameof(Root_Certificate_Installed), - nameof(SSL_Available), - nameof(Skip_CoreWCFService_FailedTest))] + nameof(SSL_Available))] [OuterLoop] public static void NetTcp_SecModeTransWithMessCred_UserNameClientCredential_Succeeds_WithSingleThreadedSyncContext() { diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.1.0.cs index a85534bf10c..27de2bfa506 100644 --- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.1.0.cs +++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.1.0.cs @@ -18,8 +18,7 @@ public partial class RequestReplyChannelShapeTests : ConditionalWcfTest [WcfFact] [Issue(3572, OS = OSID.OSX)] [Condition(nameof(Root_Certificate_Installed), - nameof(SSL_Available), - nameof(Skip_CoreWCFService_FailedTest))] + nameof(SSL_Available))] [OuterLoop] public static void IRequestChannel_Https_NetHttpsBinding() { diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs index 1356f110b8c..7bd5594148f 100644 --- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs +++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; using Xunit; -public partial class ExpectedExceptionTests : ConditionalWcfTest +public partial class ExpectedExceptionTests { [WcfFact] [OuterLoop] diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs index 84057089052..3878d0acac4 100644 --- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs +++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Xunit; -public partial class ExpectedExceptionTests : ConditionalWcfTest +public partial class ExpectedExceptionTests { [WcfFact] [OuterLoop] @@ -185,7 +185,6 @@ public static void UnknownUrl_Throws_EndpointNotFoundException() } [WcfFact] - [Condition(nameof(Skip_CoreWCFService_FailedTest))] [OuterLoop] public static void UnknownUrl_Throws_ProtocolException() { diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/WebSocketTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/WebSocketTests.4.1.0.cs index 64203e0cbcc..d3a4fb5e6d2 100644 --- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/WebSocketTests.4.1.0.cs +++ b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/WebSocketTests.4.1.0.cs @@ -837,7 +837,6 @@ public static void WebSocket_WSScheme_WSTransportUsageAlways_DuplexCallback_Guid // When not using a callback you can still force WCF to use WebSockets. // This test verifies that it actually uses WebSockets when not using a callback. [WcfFact] - [Condition(nameof(Skip_CoreWCFService_FailedTest))] [Issue(1438, OS = OSID.Windows_7)] // not supported on Win7 [OuterLoop] public static void WebSocket_Http_VerifyWebSocketsUsed() diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHost.cs index 61571a31203..60ad2a8813e 100644 --- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHost.cs +++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHost.cs @@ -12,6 +12,7 @@ using System.ServiceModel.Web; #endif using System.Net; +using System.Runtime.InteropServices; using System.Security.Cryptography.X509Certificates; using System.Text; using WcfTestCommon; @@ -96,7 +97,15 @@ public Stream Crl() { // The test.crl is generated by the cert util tool and will not expire until the root cert expires. // We should investigate if we can generate it in the run time. This is not a blocking issue. - string downloadFilePath = @"c:\\WCFTest\\test.crl"; + string downloadFilePath; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + downloadFilePath = @"c:\\WCFTest\\test.crl"; + } + else + { + downloadFilePath = Path.Combine(Environment.CurrentDirectory, "test.crl"); + } WebOperationContext.Current.OutgoingResponse.ContentType = "application/x-pkcs7-crl"; WebOperationContext.Current.OutgoingResponse.Headers["Content-Disposition"] = "attachment; filename=\"wcf-crl.crl\""; diff --git a/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/Program.cs b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/Program.cs index 3d75c0b3350..db885d4c80d 100644 --- a/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/Program.cs +++ b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/Program.cs @@ -29,8 +29,16 @@ public static async Task Main(string[] args) Console.WriteLine("Installing certificates..."); string testserverbase = string.Empty; TimeSpan validatePeriod = TimeSpan.FromDays(1); - string crlFileLocation = "c:\\WCFTest\\test.crl"; int DefaultHttpPort = 8081; + string crlFileLocation; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + crlFileLocation = "c:\\WCFTest\\test.crl"; + } + else + { + crlFileLocation = Path.Combine(Environment.CurrentDirectory, "test.crl"); + } CertificateGeneratorLibrary.SetupCerts(testserverbase, validatePeriod, crlFileLocation, DefaultHttpPort); diff --git a/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj index 47bf9444e3a..a1e4bdd1b88 100644 --- a/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj +++ b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj @@ -1,4 +1,4 @@ - + net8.0 true @@ -11,10 +11,10 @@ - - - - + + + + @@ -33,8 +33,6 @@ - - @@ -44,8 +42,6 @@ - -