update service hosts

dotnet · Sep 11, 2024 · ebc64f8 · ebc64f8
1 parent 6d4fa39
commit ebc64f8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/...ceModel/tools/IISHostedWcfService/App_code/testhosts/TcpDefaultResourceTestServiceHost.cs b/...ceModel/tools/IISHostedWcfService/App_code/testhosts/TcpDefaultResourceTestServiceHost.cs
@@ -22,11 +22,13 @@ protected override IList<Binding> GetBindings()
         {
             var bindings = new List<Binding>();
             bindings.Add(GetNetTcpBinding());
+
+#if !NET
             if (!HostingEnvironment.IsHosted)
             {
                 bindings.Add(GetNetNamedPipeBinding());
             }
-
+#endif
             return bindings;
         }
 
@@ -35,10 +37,12 @@ private Binding GetNetTcpBinding()
             return new NetTcpBinding() { Name = "tcp-default" };
         }
 
+#if !NET
         private Binding GetNetNamedPipeBinding()
         {
             return new NetNamedPipeBinding() { Name = "namedpipe-default" };
         }
+#endif
 
         public TcpDefaultResourceTestServiceHost(params Uri[] baseAddresses)
             : base(typeof(WcfService), baseAddresses)

diff --git a/...ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTestServiceHost.cs b/...ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTestServiceHost.cs
@@ -22,11 +22,13 @@ protected override IList<Binding> GetBindings()
         {
             var bindings = new List<Binding>();
             bindings.Add(GetNetTcpBinding());
+
+#if !NET
             if (!HostingEnvironment.IsHosted)
             {
                 bindings.Add(GetNetNamedPipeBinding());
             }
-
+#endif
             return bindings;
         }
 
@@ -35,10 +37,12 @@ private Binding GetNetTcpBinding()
             return new NetTcpBinding(SecurityMode.None) { Name = "tcp-nosecurity" };
         }
 
+#if !NET
         private Binding GetNetNamedPipeBinding()
         {
             return new NetNamedPipeBinding(NetNamedPipeSecurityMode.None) { Name = "namedpipe-nosecurity" };
         }
+#endif
 
         public TcpNoSecurityTestServiceHost(params Uri[] baseAddresses)
             : base(typeof(WcfService), baseAddresses)

diff --git a/...ivate.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestHostWebServiceHost.cs b/...ivate.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestHostWebServiceHost.cs
@@ -2,14 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NET
-using CoreWCF;
-#else
+#if !NET
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Activation;
 using System.ServiceModel.Web;
-#endif
 
 namespace WcfService
 {
@@ -31,3 +28,4 @@ public TestHostWebServiceHost(Type serviceType, params Uri[] baseAddresses)
         }
     }
 }
+#endif
diff --git a/...ystem.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj b/...ystem.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj
@@ -5,7 +5,7 @@
     <IsPackable>false</IsPackable>
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <Using Include="System.Runtime.Serialization" />
     <Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
@@ -32,11 +32,8 @@
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\ReliableSessionOneWayTestServiceHost.cs" />
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\ReliableSessionTestServiceHost.cs" />
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\Saml2IssuedTokenTestServiceHost.cs" />
-
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\TcpDefaultResourceTestServiceHost.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\TcpNoSecurityTestServiceHost.cs" />
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\TestHostWebServiceHost.cs" />
 
     <None Include="..\IISHostedWcfService\App_code\testhosts\Federation\AcceptAnyUsernameSecurityTokenHandler.cs" />
@@ -47,11 +44,8 @@
     <None Include="..\IISHostedWcfService\App_code\testhosts\ReliableSessionOneWayTestServiceHost.cs" />
     <None Include="..\IISHostedWcfService\App_code\testhosts\ReliableSessionTestServiceHost.cs" />
     <None Include="..\IISHostedWcfService\App_code\testhosts\Saml2IssuedTokenTestServiceHost.cs" />
-
     <None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
     <None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\TcpDefaultResourceTestServiceHost.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\TcpNoSecurityTestServiceHost.cs" />
     <None Include="..\IISHostedWcfService\App_code\testhosts\TestHostWebServiceHost.cs" />
   </ItemGroup>
   <ItemGroup>