Skip to content

Commit 23521d6

Browse files
committed
Merge branch 'master' into publish-32337
2 parents e9b9b67 + 9c3abbd commit 23521d6

File tree

1,764 files changed

+10250
-10250
lines changed

Some content is hidden

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

1,764 files changed

+10250
-10250
lines changed

samples/snippets/cpp/VS_Snippets_Remoting/ChannelServices_GetChannel/CPP/ChannelServices_GetChannel_Share.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
This program implments the remote method which will be called by the
3-
client.
3+
client.
44
*/
55
using System;
6-
namespace RemotingSamples
6+
namespace RemotingSamples
77
{
88
public class HelloServer : MarshalByRefObject
99
{

samples/snippets/cpp/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/CPP/ChannelServices_SyncDispatchMessage_share.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*
2-
The class 'PrintServer' is derived from 'MarshalByRefObject' to
3-
make it remotable.
2+
The class 'PrintServer' is derived from 'MarshalByRefObject' to
3+
make it remotable.
44
*/
55
using System;
66
using System.Runtime.Remoting;
77
public class PrintServer : MarshalByRefObject
88
{
99
public int MyPrintMethod(String myString, double fValue, int iValue)
1010
{
11-
Console.WriteLine("PrintServer.MyPrintMethod {0} {1} {2}",
11+
Console.WriteLine("PrintServer.MyPrintMethod {0} {1} {2}",
1212
myString, fValue, iValue);
1313
return iValue;
1414
}

samples/snippets/cpp/VS_Snippets_Remoting/IChannelSender/CPP/IChannelSender_Share.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ define the methods to execute from the client. */
44

55
using System;
66

7-
public class MyHelloServer : MarshalByRefObject
7+
public class MyHelloServer : MarshalByRefObject
88
{
9-
public MyHelloServer()
9+
public MyHelloServer()
1010
{
1111
Console.WriteLine("HelloServer activated");
1212
}
1313

14-
public String myHelloMethod(String myString)
14+
public String myHelloMethod(String myString)
1515
{
1616
Console.WriteLine("Hello.HelloMethod : {0}", myString);
1717
return "Hi there " + myString;

samples/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType1_Client/CPP/RemotingConfiguration_IsRemotelyActivatedClientType1_Shared.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using System;
22

3-
public class MyServerImpl :MarshalByRefObject
3+
public class MyServerImpl :MarshalByRefObject
44
{
55
public MyServerImpl()
66
{
77
Console.WriteLine("Server Activated...");
88
}
99

10-
public String MyMethod(String name)
10+
public String MyMethod(String name)
1111
{
1212
return "The client requests to "+name;
1313
}

samples/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType2_Client/CPP/RemotingConfiguration_IsRemotelyActivatedClientType2_Shared.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
public class MyServerImpl :MarshalByRefObject
3+
public class MyServerImpl :MarshalByRefObject
44
{
55
int i;
66
public MyServerImpl()
@@ -9,7 +9,7 @@ public MyServerImpl()
99
Console.WriteLine("Server Activated...");
1010
}
1111

12-
public String MyMethod(String name)
12+
public String MyMethod(String name)
1313
{
1414
i=i+1;
1515
return "The client requests to "+name +i+" time";

samples/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType1_Client/CPP/RemotingConfiguration_IsWellKnownClientType1_Shared.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
public class MyServerImpl :MarshalByRefObject
44
{
5-
public MyServerImpl()
5+
public MyServerImpl()
66
{
77
Console.WriteLine("Server Activated");
88
}
99

10-
public String MyMethod(String name)
10+
public String MyMethod(String name)
1111
{
1212
return "The string from client is " + name;
1313
}

samples/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType2_Client/CPP/RemotingConfiguration_IsWellKnownClientType2_Shared.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
public class MyServerImpl :MarshalByRefObject
55
{
6-
public MyServerImpl()
6+
public MyServerImpl()
77
{
88
Console.WriteLine("Server Activated");
99
}
1010

11-
public String MyMethod(String name)
11+
public String MyMethod(String name)
1212
{
1313
Console.WriteLine(name);
1414
return "The string from server : " + name;

samples/snippets/csharp/System.DateTime/Calendar.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private static void CalculateWeeks()
106106
// Date : 18/8/1395
107107
// Day of Week: Sunday
108108
// Week of year: 34
109-
//
109+
//
110110
// Using the Gregorian calendar
111111
// Date : 18/08/0852
112112
// Day of Week: Sunday

samples/snippets/csharp/System.DateTime/Parsing.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static void Snippets()
1515
private static void ParseStandardFormats()
1616
{
1717
// <Snippet1>
18-
System.Threading.Thread.CurrentThread.CurrentCulture =
18+
System.Threading.Thread.CurrentThread.CurrentCulture =
1919
System.Globalization.CultureInfo.CreateSpecificCulture("en-GB");
2020

2121
var date1 = new DateTime(2013, 6, 1, 12, 32, 30);
@@ -73,7 +73,7 @@ private static void ParseISO8601()
7373
{
7474
// <Snippet3>
7575
var iso8601String = "20080501T08:30:52Z";
76-
DateTime dateISO8602 = DateTime.ParseExact(iso8601String, "yyyyMMddTHH:mm:ssZ",
76+
DateTime dateISO8602 = DateTime.ParseExact(iso8601String, "yyyyMMddTHH:mm:ssZ",
7777
System.Globalization.CultureInfo.InvariantCulture);
7878
Console.WriteLine($"{iso8601String} --> {dateISO8602:g}");
7979
// </Snippet3>

samples/snippets/csharp/System.DateTime/StringFormat.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private static void ShowCultureSpecificFullDateAndTime()
4646
var date1 = new DateTime(2008, 3, 1, 7, 0, 0);
4747
Console.WriteLine(date1.ToString("F", new System.Globalization.CultureInfo("fr-FR")));
4848
// Displays samedi 1 mars 2008 07:00:00
49-
// </Snippet4>
49+
// </Snippet4>
5050
}
5151

5252
private static void ShowIso8601Format()
@@ -55,7 +55,7 @@ private static void ShowIso8601Format()
5555
var date1 = new DateTime(2008, 3, 1, 7, 0, 0);
5656
Console.WriteLine(date1.ToString("yyyyMMddTHH:mm:ssZ"));
5757
// Displays 20080301T07:00:00Z
58-
// </Snippet5>
58+
// </Snippet5>
5959
}
6060
}
6161
}

0 commit comments

Comments
 (0)