Skip to content

Commit 5bda86c

Browse files
authored
Merging code for 2.8.211 nuget packages. (#47)
1 parent fd17cc9 commit 5bda86c

File tree

321 files changed

+14890
-2160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

321 files changed

+14890
-2160
lines changed

properties/service_fabric_managed_common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<!-- Set Version numbers. These are used for generating Assemblies and Nuget packages. -->
4343
<PropertyGroup>
4444
<MajorVersion>2</MajorVersion>
45-
<MinorVersion>7</MinorVersion>
45+
<MinorVersion>8</MinorVersion>
4646
<BuildVersion>0</BuildVersion>
4747
<Revision>0</Revision>
4848
</PropertyGroup>

properties/service_fabric_nuproj.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<Tags>ServiceFabric Microsoft Azure Fabric</Tags>
1313
<Language>en-US</Language>
1414
<NupkgOutputDir>$(OutputRoot)\packages</NupkgOutputDir>
15-
<FabricRuntimeNuGetPackageVersionOfficial>5.7.198</FabricRuntimeNuGetPackageVersionOfficial>
16-
<FabricSdkNuGetPackageVersionOfficial>2.7.198</FabricSdkNuGetPackageVersionOfficial>
15+
<FabricRuntimeNuGetPackageVersionOfficial>6.0.211</FabricRuntimeNuGetPackageVersionOfficial>
16+
<FabricSdkNuGetPackageVersionOfficial>2.8.211</FabricSdkNuGetPackageVersionOfficial>
1717
<FabricSdkNuGetPackageVersionOSS>$(MajorVersion).$(MinorVersion).$(BuildVersion)</FabricSdkNuGetPackageVersionOSS>
1818

1919
<!-- override version for nuget package-->

src/Microsoft.ServiceFabric.Actors.Wcf/Microsoft.ServiceFabric.Actors.Wcf.csproj

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,34 @@
1414
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<Reference Include="Microsoft.ServiceFabric.Internal, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
18-
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.5.7.198\lib\net45\Microsoft.ServiceFabric.Internal.dll</HintPath>
17+
<Reference Include="Microsoft.ServiceFabric.Internal, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
18+
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.6.0.211\lib\net45\Microsoft.ServiceFabric.Internal.dll</HintPath>
1919
<Private>True</Private>
2020
</Reference>
21-
<Reference Include="Microsoft.ServiceFabric.Internal.Strings, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
22-
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.5.7.198\lib\net45\Microsoft.ServiceFabric.Internal.Strings.dll</HintPath>
21+
<Reference Include="Microsoft.ServiceFabric.Internal.Strings, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
22+
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.6.0.211\lib\net45\Microsoft.ServiceFabric.Internal.Strings.dll</HintPath>
2323
<Private>True</Private>
2424
</Reference>
25-
<Reference Include="Microsoft.ServiceFabric.Preview, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
26-
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.5.7.198\lib\net45\Microsoft.ServiceFabric.Preview.dll</HintPath>
25+
<Reference Include="Microsoft.ServiceFabric.Preview, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
26+
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.6.0.211\lib\net45\Microsoft.ServiceFabric.Preview.dll</HintPath>
2727
<Private>True</Private>
2828
</Reference>
2929
<Reference Include="System" />
3030
<Reference Include="System.Core" />
31-
<Reference Include="System.Fabric, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
32-
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.5.7.198\lib\net45\System.Fabric.dll</HintPath>
31+
<Reference Include="System.Fabric, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
32+
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.6.0.211\lib\net45\System.Fabric.dll</HintPath>
3333
<Private>True</Private>
3434
</Reference>
35-
<Reference Include="System.Fabric.Management.ServiceModel, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
36-
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.5.7.198\lib\net45\System.Fabric.Management.ServiceModel.dll</HintPath>
35+
<Reference Include="System.Fabric.Management.ServiceModel, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
36+
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.6.0.211\lib\net45\System.Fabric.Management.ServiceModel.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="System.Fabric.Management.ServiceModel.XmlSerializers, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.5.7.198\lib\net45\System.Fabric.Management.ServiceModel.XmlSerializers.dll</HintPath>
39+
<Reference Include="System.Fabric.Management.ServiceModel.XmlSerializers, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40+
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.6.0.211\lib\net45\System.Fabric.Management.ServiceModel.XmlSerializers.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="System.Fabric.Strings, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
44-
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.5.7.198\lib\net45\System.Fabric.Strings.dll</HintPath>
43+
<Reference Include="System.Fabric.Strings, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
44+
<HintPath>..\..\external\packages\Microsoft.ServiceFabric.6.0.211\lib\net45\System.Fabric.Strings.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="System.Runtime.Serialization" />
@@ -54,15 +54,17 @@
5454
<Reference Include="System.Xml" />
5555
</ItemGroup>
5656
<ItemGroup>
57+
<Compile Include="Remoting\V2\Wcf\Client\WcfActorRemotingClientFactory.cs" />
58+
<Compile Include="Remoting\V2\Wcf\Runtime\WcfActorServiceRemotingListener.cs" />
5759
<Compile Include="SR.Designer.cs">
5860
<AutoGen>True</AutoGen>
5961
<DesignTime>True</DesignTime>
6062
<DependentUpon>SR.resx</DependentUpon>
6163
</Compile>
6264
<Compile Include="_friend.cs" />
63-
<Compile Include="Remoting\Wcf\WcfActorRemotingProviderAttribute.cs" />
64-
<Compile Include="Remoting\Wcf\Runtime\WcfActorServiceRemotingListener.cs" />
65-
<Compile Include="Remoting\Wcf\Client\WcfActorRemotingClientFactory.cs" />
65+
<Compile Include="WcfActorRemotingProviderAttribute.cs" />
66+
<Compile Include="Remoting\V1\Wcf\Runtime\WcfActorServiceRemotingListener.cs" />
67+
<Compile Include="Remoting\V1\Wcf\Client\WcfActorRemotingClientFactory.cs" />
6668
</ItemGroup>
6769
<ItemGroup>
6870
<ProjectReference Include="..\Microsoft.ServiceFabric.Actors\Microsoft.ServiceFabric.Actors.csproj">

src/Microsoft.ServiceFabric.Actors.Wcf/Remoting/Wcf/Client/WcfActorRemotingClientFactory.cs renamed to src/Microsoft.ServiceFabric.Actors.Wcf/Remoting/V1/Wcf/Client/WcfActorRemotingClientFactory.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
// Copyright (c) Microsoft Corporation. All rights reserved.
33
// Licensed under the MIT License (MIT). See License.txt in the repo root for license information.
44
// ------------------------------------------------------------
5-
namespace Microsoft.ServiceFabric.Actors.Remoting.Wcf.Client
5+
namespace Microsoft.ServiceFabric.Actors.Remoting.V1.Wcf.Client
66
{
77
using System.Collections.Generic;
88
using System.ServiceModel.Channels;
9+
using Microsoft.ServiceFabric.Services.Remoting.V1;
10+
using Microsoft.ServiceFabric.Services.Remoting.V1.Client;
911
using Microsoft.ServiceFabric.Actors.Remoting.Client;
1012
using Microsoft.ServiceFabric.Services.Client;
1113
using Microsoft.ServiceFabric.Services.Communication.Client;
12-
using Microsoft.ServiceFabric.Services.Remoting;
13-
using Microsoft.ServiceFabric.Services.Remoting.Wcf.Client;
14+
using Microsoft.ServiceFabric.Services.Remoting.V1.Wcf.Client;
1415

1516
/// <summary>
16-
/// An <see cref="Microsoft.ServiceFabric.Services.Remoting.Client.IServiceRemotingClientFactory"/> that uses
17-
/// Windows Communication Foundation to create <see cref="Microsoft.ServiceFabric.Services.Remoting.Client.IServiceRemotingClient"/>
17+
/// An <see cref="IServiceRemotingClientFactory"/> that uses
18+
/// Windows Communication Foundation to create <see cref="IServiceRemotingClient"/>
1819
/// to communicate with an actor service and actors hosted by it, using actor and service interfaces that are remoted via
19-
/// <see cref="Microsoft.ServiceFabric.Actors.Remoting.Wcf.Runtime.WcfActorServiceRemotingListener"/>.
20+
/// <see cref="Microsoft.ServiceFabric.Actors.Remoting.V1.Wcf.Runtime.WcfActorServiceRemotingListener"/>.
2021
/// </summary>
2122
public class WcfActorRemotingClientFactory : WcfServiceRemotingClientFactory
2223
{

src/Microsoft.ServiceFabric.Actors.Wcf/Remoting/Wcf/Runtime/WcfActorServiceRemotingListener.cs renamed to src/Microsoft.ServiceFabric.Actors.Wcf/Remoting/V1/Wcf/Runtime/WcfActorServiceRemotingListener.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
// Copyright (c) Microsoft Corporation. All rights reserved.
33
// Licensed under the MIT License (MIT). See License.txt in the repo root for license information.
44
// ------------------------------------------------------------
5-
namespace Microsoft.ServiceFabric.Actors.Remoting.Wcf.Runtime
5+
namespace Microsoft.ServiceFabric.Actors.Remoting.V1.Wcf.Runtime
66
{
77
using System;
88
using System.Fabric;
9-
using System.Fabric.Common;
109
using System.ServiceModel;
1110
using System.ServiceModel.Channels;
1211
using Microsoft.ServiceFabric.Actors.Generator;
13-
using Microsoft.ServiceFabric.Actors.Remoting.Runtime;
14-
using Microsoft.ServiceFabric.Services.Remoting.Runtime;
15-
using Microsoft.ServiceFabric.Services.Remoting.Wcf.Runtime;
1612
using Microsoft.ServiceFabric.Actors.Runtime;
13+
using Microsoft.ServiceFabric.Actors.Remoting.V1.Runtime;
14+
using Microsoft.ServiceFabric.Services.Remoting.Runtime;
15+
using Microsoft.ServiceFabric.Services.Remoting.V1.Runtime;
16+
using Microsoft.ServiceFabric.Services.Remoting.V1.Wcf.Runtime;
1717

1818
/// <summary>
19-
/// An <see cref="Microsoft.ServiceFabric.Services.Remoting.Runtime.IServiceRemotingListener"/> that uses
19+
/// An <see cref="IServiceRemotingListener"/> that uses
2020
/// Windows Communication Foundation to provide interface remoting for actor services.
2121
/// </summary>
2222
public class WcfActorServiceRemotingListener : WcfServiceRemotingListener
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
// ------------------------------------------------------------
2+
// Copyright (c) Microsoft Corporation. All rights reserved.
3+
// Licensed under the MIT License (MIT). See License.txt in the repo root for license information.
4+
// ------------------------------------------------------------
5+
namespace Microsoft.ServiceFabric.Actors.Remoting.V2.Wcf.Client
6+
{
7+
using System.Collections.Generic;
8+
using System.ServiceModel.Channels;
9+
using Microsoft.ServiceFabric.Actors.Remoting.Client;
10+
using Microsoft.ServiceFabric.Actors.Remoting.V2.Wcf.Client;
11+
using Microsoft.ServiceFabric.Actors.Remoting.V2;
12+
using Microsoft.ServiceFabric.Services.Client;
13+
using Microsoft.ServiceFabric.Services.Communication.Client;
14+
using Microsoft.ServiceFabric.Services.Remoting.V2.Wcf.Client;
15+
using Microsoft.ServiceFabric.Services.Remoting.V2;
16+
using Microsoft.ServiceFabric.Services.Remoting.V2.Client;
17+
18+
/// <summary>
19+
/// An <see cref="IServiceRemotingClientFactory"/> that uses
20+
/// Windows Communication Foundation to create <see cref="IServiceRemotingClient"/>
21+
/// to communicate with an actor service and actors hosted by it, using actor and service interfaces that are remoted via
22+
/// <see cref="Microsoft.ServiceFabric.Actors.Remoting.V2.Wcf.Runtime.WcfActorServiceRemotingListener"/>.
23+
/// </summary>
24+
public class WcfActorRemotingClientFactory : WcfServiceRemotingClientFactory
25+
{
26+
/// <summary>
27+
/// Constructs a WCF based actor remoting factory.
28+
/// </summary>
29+
/// <param name="callbackClient">
30+
/// The callback client that receives the callbacks from the service.
31+
/// </param>
32+
public WcfActorRemotingClientFactory(
33+
IServiceRemotingCallbackMessageHandler callbackClient)
34+
: this(null, callbackClient)
35+
{
36+
}
37+
38+
/// <summary>
39+
/// Constructs a WCF based actor remoting factory.
40+
/// </summary>
41+
/// <param name="clientBinding">
42+
/// WCF binding to use for the client. If the client binding is null,
43+
/// a default client binding is created using
44+
/// <see cref="Microsoft.ServiceFabric.Services.Communication.Wcf.WcfUtility.CreateTcpClientBinding"/> method
45+
/// which creates a <see cref="System.ServiceModel.NetTcpBinding"/> with no security.
46+
/// </param>
47+
/// <param name="callbackClient">
48+
/// The callback client that receives the callbacks from the service.
49+
/// </param>
50+
/// <param name="exceptionHandlers">
51+
/// Exception handlers to handle the exceptions encountered in communicating with the service.
52+
/// </param>
53+
/// <param name="servicePartitionResolver">
54+
/// Service partition resolver to resolve the service endpoints. If not specified, a default
55+
/// service partition resolver returned by <see cref="ServicePartitionResolver.GetDefault"/> is used.
56+
/// </param>
57+
/// <param name="traceId">
58+
/// Id to use in diagnostics traces from this component.
59+
/// </param>
60+
/// <param name="serializationProvider"></param>
61+
/// <remarks>
62+
/// This factory uses <see cref="Microsoft.ServiceFabric.Services.Communication.Wcf.Client.WcfExceptionHandler"/>,
63+
/// <see cref="Microsoft.ServiceFabric.Actors.Remoting.Client.ActorRemotingExceptionHandler"/>, in addition to the
64+
/// exception handlers supplied to the constructor.
65+
/// </remarks>
66+
public WcfActorRemotingClientFactory(
67+
Binding clientBinding,
68+
IServiceRemotingCallbackMessageHandler callbackClient,
69+
IEnumerable<IExceptionHandler> exceptionHandlers = null,
70+
IServicePartitionResolver servicePartitionResolver = null,
71+
string traceId = null,
72+
IServiceRemotingMessageSerializationProvider serializationProvider=null) :
73+
base(
74+
new ActorRemotingSerializationManager(serializationProvider ?? new BasicDataContractSerializationProvider(),
75+
new BasicDataContractActorHeaderSerializer()),
76+
clientBinding,
77+
callbackClient,
78+
GetExceptionHandlers(exceptionHandlers),
79+
servicePartitionResolver,
80+
traceId)
81+
{
82+
}
83+
84+
private static IEnumerable<IExceptionHandler> GetExceptionHandlers(IEnumerable<IExceptionHandler> exceptionHandlers)
85+
{
86+
var handlers = new List<IExceptionHandler>();
87+
if (exceptionHandlers != null)
88+
{
89+
handlers.AddRange(exceptionHandlers);
90+
}
91+
handlers.Add(new ActorRemotingExceptionHandler());
92+
return handlers;
93+
}
94+
}
95+
}
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
// ------------------------------------------------------------
2+
// Copyright (c) Microsoft Corporation. All rights reserved.
3+
// Licensed under the MIT License (MIT). See License.txt in the repo root for license information.
4+
// ------------------------------------------------------------
5+
namespace Microsoft.ServiceFabric.Actors.Remoting.V2.Wcf.Runtime
6+
{
7+
using System;
8+
using System.Fabric;
9+
using System.ServiceModel;
10+
using System.ServiceModel.Channels;
11+
using Microsoft.ServiceFabric.Actors.Generator;
12+
using Microsoft.ServiceFabric.Actors.Runtime;
13+
using Microsoft.ServiceFabric.Actors.Remoting.V2;
14+
using Microsoft.ServiceFabric.Actors.Remoting.V2.Runtime;
15+
using Microsoft.ServiceFabric.Services.Remoting.Runtime;
16+
using Microsoft.ServiceFabric.Services.Remoting.V2;
17+
using Microsoft.ServiceFabric.Services.Remoting.V2.Runtime;
18+
using Microsoft.ServiceFabric.Services.Remoting.V2.Wcf.Runtime;
19+
20+
/// <summary>
21+
/// An <see cref="IServiceRemotingListener"/> that uses
22+
/// Windows Communication Foundation to provide interface remoting for actor services.
23+
/// </summary>
24+
public class WcfActorServiceRemotingListener : WcfServiceRemotingListener
25+
{
26+
/// <summary>
27+
/// Constructs a WCF based actor remoting listener.
28+
/// </summary>
29+
/// <param name="listenerBinding">WCF binding to use for the listener. If the listener binding is not specified or null,
30+
/// a default listener binding is created using <see cref="Microsoft.ServiceFabric.Services.Communication.Wcf.WcfUtility.CreateTcpListenerBinding"/> method which creates
31+
/// a <see cref="System.ServiceModel.NetTcpBinding"/> with no security.
32+
/// </param>
33+
/// <param name="actorService">The actor service.</param>
34+
public WcfActorServiceRemotingListener(
35+
ActorService actorService,
36+
Binding listenerBinding = null)
37+
: base(
38+
GetContext(actorService),
39+
new ActorServiceRemotingDispatcher(actorService, new DataContractRemotingMessageFactory()),
40+
new ActorRemotingSerializationManager(new BasicDataContractSerializationProvider(),
41+
new BasicDataContractActorHeaderSerializer()),
42+
listenerBinding,
43+
ActorNameFormat.GetFabricServiceEndpointName(actorService.ActorTypeInformation.ImplementationType))
44+
{
45+
}
46+
47+
/// <summary>
48+
/// Constructs a WCF based service remoting listener.
49+
/// </summary>
50+
/// <param name="serviceContext">The context of the service for which the remoting listener is being constructed.</param>
51+
/// <param name="serviceRemotingMessageHandler">The handler for receiving and processing remoting messages. As the messages are received
52+
/// the listener delivers the messages to the handler.
53+
/// </param>
54+
/// <param name="serializationProvider"></param>
55+
/// <param name="listenerBinding">WCF binding to use for the listener. If the listener binding is not specified or null,
56+
/// a default listener binding is created using <see cref="Microsoft.ServiceFabric.Services.Communication.Wcf.WcfUtility.CreateTcpListenerBinding"/> method.
57+
/// </param>
58+
/// <param name="address">The endpoint address to use for the WCF listener. If not specified or null, the endpoint
59+
/// address is created using the default endpoint resource named "ServiceEndpoint" defined in the service manifest.
60+
/// </param>
61+
public WcfActorServiceRemotingListener(
62+
ServiceContext serviceContext,
63+
IServiceRemotingMessageHandler serviceRemotingMessageHandler,
64+
IServiceRemotingMessageSerializationProvider serializationProvider,
65+
Binding listenerBinding = null,
66+
EndpointAddress address = null)
67+
: base(
68+
serviceContext,
69+
serviceRemotingMessageHandler,
70+
new ActorRemotingSerializationManager(serializationProvider ?? new BasicDataContractSerializationProvider(),
71+
new BasicDataContractActorHeaderSerializer()),
72+
listenerBinding,
73+
address)
74+
{
75+
}
76+
77+
private static ServiceContext GetContext(ActorService actorService)
78+
{
79+
if (actorService == null)
80+
{
81+
throw new ArgumentNullException("actorService");
82+
}
83+
84+
return actorService.Context;
85+
}
86+
}
87+
}

0 commit comments

Comments
 (0)