update service code

afifi-ins · afifi-ins · commit bae0e73654ed · 2024-09-11T11:55:44.000+03:00
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/NetHttpsBinding.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/NetHttpsBinding.cs
@@ -0,0 +1,45 @@
+﻿// Licensed to the .NET Foundation under one or more agreements.
+// 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;
+using CoreWCF.Channels;
+
+namespace WcfService
+{
+    //public enum BasicHttpsSecurityMode
+    //{
+    //    //
+    //    // Summary:
+    //    //     The Transport security mode.
+    //    Transport,
+    //    //
+    //    // Summary:
+    //    //     The TransportWithMessageCredential security mode.
+    //    TransportWithMessageCredential
+    //}
+
+    // Cast BasicHttpsSecurityMode (WCF) to BasicHttpSecurityMode (CoreWCF)
+    //internal enum BasicHttpsSecurityMode
+    //{
+    //    None,
+    //    Transport,
+    //    Message,
+    //    TransportWithMessageCredential,
+    //    TransportCredentialOnly
+    //}
+
+    internal class NetHttpsBinding : NetHttpBinding
+    {
+        public NetHttpsBinding() : base((BasicHttpSecurityMode)BasicHttpsSecurityMode.Transport)
+        {
+        }
+
+        public NetHttpsBinding(BasicHttpsSecurityMode securityMode) : base((BasicHttpSecurityMode)securityMode)
+        {
+        }
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpDefaultResourceTestServiceHost.cs b/src/System.Private.ServiceModel/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/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTestServiceHost.cs b/src/System.Private.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/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestHostWebServiceHost.cs b/src/System.Private.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/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj
@@ -5,17 +5,17 @@
     <IsPackable>false</IsPackable>
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <Using Include="System.Runtime.Serialization" />
     <Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreWCF.Http" Version="1.5.0-wsrs.1.g14d7d00798" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.5.0-wsrs.1.g14d7d00798" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.5.0-wsrs.1.g14d7d00798" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.5.0-wsrs.1.g14d7d00798" />
-    <PackageReference Include="idunno.Authentication.Basic" Version="2.3.1" />
+    <PackageReference Include="CoreWCF.Http" Version="1.6" />
+    <PackageReference Include="CoreWCF.NetTcp" Version="1.6" />
+    <PackageReference Include="CoreWCF.Primitives" Version="1.6" />
+    <PackageReference Include="CoreWCF.WebHttp" Version="1.6" />
+    <PackageReference Include="idunno.Authentication.Basic" Version="2.4.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\IISHostedWcfService\**\*.cs">
@@ -24,52 +24,29 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Compile Remove="..\IISHostedWcfService\App_code\ISessionTests.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\IVerifyWebSockets.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\SessionTestsService.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\DuplexTestServiceHosts.cs" />
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\AcceptAnyUsernameSecurityTokenHandler.cs" />
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\FederationSTSServiceHost.cs" />
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\ReturnX509SubjectNameOrRSAIssuerNameRegistry.cs" />
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\SelfHostSecurityTokenService.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsClientCertificateTestServiceHost.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\NetHttpsTestServiceHost.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\NetHttpTestServiceHost.cs" />
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\ReliableSessionDuplexTestServiceHost.cs" />
     <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\TcpDefaultResourceTestServiceHost.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\TcpNoSecurityTestServiceHost.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\TcpSessionTestServiceHost.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
     <Compile Remove="..\IISHostedWcfService\App_code\testhosts\TestHostWebServiceHost.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\WebSocketTestServiceHosts.cs" />
-    <Compile Remove="..\IISHostedWcfService\App_code\VerifyWebSockets.cs" />
-    <None Include="..\IISHostedWcfService\App_code\ISessionTests.cs" />
-    <None Include="..\IISHostedWcfService\App_code\IVerifyWebSockets.cs" />
-    <None Include="..\IISHostedWcfService\App_code\SessionTestsService.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\DuplexTestServiceHosts.cs" />
+
     <None Include="..\IISHostedWcfService\App_code\testhosts\Federation\AcceptAnyUsernameSecurityTokenHandler.cs" />
     <None Include="..\IISHostedWcfService\App_code\testhosts\Federation\FederationSTSServiceHost.cs" />
     <None Include="..\IISHostedWcfService\App_code\testhosts\Federation\ReturnX509SubjectNameOrRSAIssuerNameRegistry.cs" />
     <None Include="..\IISHostedWcfService\App_code\testhosts\Federation\SelfHostSecurityTokenService.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\HttpsClientCertificateTestServiceHost.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\NetHttpsTestServiceHost.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\NetHttpTestServiceHost.cs" />
     <None Include="..\IISHostedWcfService\App_code\testhosts\ReliableSessionDuplexTestServiceHost.cs" />
     <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\TcpDefaultResourceTestServiceHost.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\TcpNoSecurityTestServiceHost.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\TcpSessionTestServiceHost.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
     <None Include="..\IISHostedWcfService\App_code\testhosts\TestHostWebServiceHost.cs" />
-    <None Include="..\IISHostedWcfService\App_code\testhosts\WebSocketTestServiceHosts.cs" />
-    <None Include="..\IISHostedWcfService\App_code\VerifyWebSockets.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\IISHostedWcfService\Web.config">

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,13 @@ protected override IList<Binding> GetBindings()`
`22`	`22`	`{`
`23`	`23`	`var bindings = new List<Binding>();`
`24`	`24`	`bindings.Add(GetNetTcpBinding());`
	`25`	`+`
	`26`	`+#if !NET`
`25`	`27`	`if (!HostingEnvironment.IsHosted)`
`26`	`28`	`{`
`27`	`29`	`bindings.Add(GetNetNamedPipeBinding());`
`28`	`30`	`}`
`29`		`-`
	`31`	`+#endif`
`30`	`32`	`return bindings;`
`31`	`33`	`}`
`32`	`34`
`@@ -35,10 +37,12 @@ private Binding GetNetTcpBinding()`
`35`	`37`	`return new NetTcpBinding() { Name = "tcp-default" };`
`36`	`38`	`}`
`37`	`39`
	`40`	`+#if !NET`
`38`	`41`	`private Binding GetNetNamedPipeBinding()`
`39`	`42`	`{`
`40`	`43`	`return new NetNamedPipeBinding() { Name = "namedpipe-default" };`
`41`	`44`	`}`
	`45`	`+#endif`
`42`	`46`
`43`	`47`	`public TcpDefaultResourceTestServiceHost(params Uri[] baseAddresses)`
`44`	`48`	`: base(typeof(WcfService), baseAddresses)`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,11 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`		`-#if NET`
`6`		`-using CoreWCF;`
`7`		`-#else`
	`5`	`+#if !NET`
`8`	`6`	`using System;`
`9`	`7`	`using System.ServiceModel;`
`10`	`8`	`using System.ServiceModel.Activation;`
`11`	`9`	`using System.ServiceModel.Web;`
`12`		`-#endif`
`13`	`10`
`14`	`11`	`namespace WcfService`
`15`	`12`	`{`
`@@ -31,3 +28,4 @@ public TestHostWebServiceHost(Type serviceType, params Uri[] baseAddresses)`
`31`	`28`	`}`
`32`	`29`	`}`
`33`	`30`	`}`
	`31`	`+#endif`