Skip to content

Commit 6d4fa39

Browse files
afifi-insafifi-ins
committed
update service code
1 parent 874a0d0 commit 6d4fa39

File tree

2 files changed

+57
-29
lines changed

2 files changed

+57
-29
lines changed

‎src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/NetHttpsBinding.cs

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
#if NET
6+
7+
using CoreWCF;
8+
using CoreWCF.Channels;
9+
10+
namespace WcfService
11+
{
12+
//public enum BasicHttpsSecurityMode
13+
//{
14+
// //
15+
// // Summary:
16+
// // The Transport security mode.
17+
// Transport,
18+
// //
19+
// // Summary:
20+
// // The TransportWithMessageCredential security mode.
21+
// TransportWithMessageCredential
22+
//}
23+
24+
// Cast BasicHttpsSecurityMode (WCF) to BasicHttpSecurityMode (CoreWCF)
25+
//internal enum BasicHttpsSecurityMode
26+
//{
27+
// None,
28+
// Transport,
29+
// Message,
30+
// TransportWithMessageCredential,
31+
// TransportCredentialOnly
32+
//}
33+
34+
internal class NetHttpsBinding : NetHttpBinding
35+
{
36+
public NetHttpsBinding() : base((BasicHttpSecurityMode)BasicHttpsSecurityMode.Transport)
37+
{
38+
}
39+
40+
public NetHttpsBinding(BasicHttpsSecurityMode securityMode) : base((BasicHttpSecurityMode)securityMode)
41+
{
42+
}
43+
}
44+
}
45+
#endif

‎src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="CoreWCF.Http" Version="1.5.0-wsrs.1.g14d7d00798" />
15-
<PackageReference Include="CoreWCF.NetTcp" Version="1.5.0-wsrs.1.g14d7d00798" />
16-
<PackageReference Include="CoreWCF.Primitives" Version="1.5.0-wsrs.1.g14d7d00798" />
17-
<PackageReference Include="CoreWCF.WebHttp" Version="1.5.0-wsrs.1.g14d7d00798" />
18-
<PackageReference Include="idunno.Authentication.Basic" Version="2.3.1" />
14+
<PackageReference Include="CoreWCF.Http" Version="1.6" />
15+
<PackageReference Include="CoreWCF.NetTcp" Version="1.6" />
16+
<PackageReference Include="CoreWCF.Primitives" Version="1.6" />
17+
<PackageReference Include="CoreWCF.WebHttp" Version="1.6" />
18+
<PackageReference Include="idunno.Authentication.Basic" Version="2.4.0" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<Compile Include="..\IISHostedWcfService\**\*.cs">
@@ -24,52 +24,35 @@
2424
</Compile>
2525
</ItemGroup>
2626
<ItemGroup>
27-
<Compile Remove="..\IISHostedWcfService\App_code\ISessionTests.cs" />
28-
<Compile Remove="..\IISHostedWcfService\App_code\IVerifyWebSockets.cs" />
29-
<Compile Remove="..\IISHostedWcfService\App_code\SessionTestsService.cs" />
30-
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\DuplexTestServiceHosts.cs" />
3127
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\AcceptAnyUsernameSecurityTokenHandler.cs" />
3228
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\FederationSTSServiceHost.cs" />
3329
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\ReturnX509SubjectNameOrRSAIssuerNameRegistry.cs" />
3430
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\SelfHostSecurityTokenService.cs" />
35-
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsClientCertificateTestServiceHost.cs" />
36-
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
37-
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
38-
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\NetHttpsTestServiceHost.cs" />
39-
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\NetHttpTestServiceHost.cs" />
4031
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\ReliableSessionDuplexTestServiceHost.cs" />
4132
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\ReliableSessionOneWayTestServiceHost.cs" />
4233
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\ReliableSessionTestServiceHost.cs" />
4334
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\Saml2IssuedTokenTestServiceHost.cs" />
35+
36+
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
37+
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
4438
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\TcpDefaultResourceTestServiceHost.cs" />
4539
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\TcpNoSecurityTestServiceHost.cs" />
46-
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\TcpSessionTestServiceHost.cs" />
4740
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\TestHostWebServiceHost.cs" />
48-
<Compile Remove="..\IISHostedWcfService\App_code\testhosts\WebSocketTestServiceHosts.cs" />
49-
<Compile Remove="..\IISHostedWcfService\App_code\VerifyWebSockets.cs" />
50-
<None Include="..\IISHostedWcfService\App_code\ISessionTests.cs" />
51-
<None Include="..\IISHostedWcfService\App_code\IVerifyWebSockets.cs" />
52-
<None Include="..\IISHostedWcfService\App_code\SessionTestsService.cs" />
53-
<None Include="..\IISHostedWcfService\App_code\testhosts\DuplexTestServiceHosts.cs" />
41+
5442
<None Include="..\IISHostedWcfService\App_code\testhosts\Federation\AcceptAnyUsernameSecurityTokenHandler.cs" />
5543
<None Include="..\IISHostedWcfService\App_code\testhosts\Federation\FederationSTSServiceHost.cs" />
5644
<None Include="..\IISHostedWcfService\App_code\testhosts\Federation\ReturnX509SubjectNameOrRSAIssuerNameRegistry.cs" />
5745
<None Include="..\IISHostedWcfService\App_code\testhosts\Federation\SelfHostSecurityTokenService.cs" />
58-
<None Include="..\IISHostedWcfService\App_code\testhosts\HttpsClientCertificateTestServiceHost.cs" />
59-
<None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
60-
<None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
61-
<None Include="..\IISHostedWcfService\App_code\testhosts\NetHttpsTestServiceHost.cs" />
62-
<None Include="..\IISHostedWcfService\App_code\testhosts\NetHttpTestServiceHost.cs" />
6346
<None Include="..\IISHostedWcfService\App_code\testhosts\ReliableSessionDuplexTestServiceHost.cs" />
6447
<None Include="..\IISHostedWcfService\App_code\testhosts\ReliableSessionOneWayTestServiceHost.cs" />
6548
<None Include="..\IISHostedWcfService\App_code\testhosts\ReliableSessionTestServiceHost.cs" />
6649
<None Include="..\IISHostedWcfService\App_code\testhosts\Saml2IssuedTokenTestServiceHost.cs" />
50+
51+
<None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
52+
<None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
6753
<None Include="..\IISHostedWcfService\App_code\testhosts\TcpDefaultResourceTestServiceHost.cs" />
6854
<None Include="..\IISHostedWcfService\App_code\testhosts\TcpNoSecurityTestServiceHost.cs" />
69-
<None Include="..\IISHostedWcfService\App_code\testhosts\TcpSessionTestServiceHost.cs" />
7055
<None Include="..\IISHostedWcfService\App_code\testhosts\TestHostWebServiceHost.cs" />
71-
<None Include="..\IISHostedWcfService\App_code\testhosts\WebSocketTestServiceHosts.cs" />
72-
<None Include="..\IISHostedWcfService\App_code\VerifyWebSockets.cs" />
7356
</ItemGroup>
7457
<ItemGroup>
7558
<None Include="..\IISHostedWcfService\Web.config">

0 commit comments

Comments
 (0)