Names -> Keywords

Replacing full type names with keywords when appropriate

Files affected: service.cs, service.cs, program.cs, order.cs, source.cs, services.cs, services.cs, snippets.cs.

See dotnet#6920

Author: WhiteBlackGoose

samples/snippets/csharp/VS_Snippets_CFX/s_ueservicehost/cs/service.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Configuration;
 using System.ServiceModel;
 
@@ -121,7 +121,7 @@ public static void Snippet5()
             // <Snippet5>
             BasicHttpBinding binding = new BasicHttpBinding();
             Uri listenUri = new Uri("http://localhost:8000/MyListenUri");
-            String address = "http://localhost:8000/servicemodelsamples/service2";
+            string address = "http://localhost:8000/servicemodelsamples/service2";
             serviceHost.AddServiceEndpoint(typeof(ICalculator), binding, address, listenUri);
             // </Snippet5>
         }

samples/snippets/csharp/VS_Snippets_CFX/s_uespnendpointidentity/cs/service.cs

@@ -1,4 +1,4 @@
-namespace ServerInitiatedNego
+namespace ServerInitiatedNego
 {
     using System;
     using System.Collections.Generic;
@@ -41,7 +41,7 @@ static EndpointIdentity CreateIdentity()
                 sid.IsWellKnown(WellKnownSidType.LocalServiceSid))
             {
                 identity = EndpointIdentity.CreateSpnIdentity(
-                    String.Format(CultureInfo.InvariantCulture, "host/{0}", GetMachineName()));
+                    string.Format(CultureInfo.InvariantCulture, "host/{0}", GetMachineName()));
             }
             else
             {
@@ -80,7 +80,7 @@ static EndpointIdentity CreateSpnIdentity()
 
             SpnEndpointIdentity identity = null;
 
-            identity = new SpnEndpointIdentity(String.Format(CultureInfo.InvariantCulture, "host/{0}", GetMachineName()));
+            identity = new SpnEndpointIdentity(string.Format(CultureInfo.InvariantCulture, "host/{0}", GetMachineName()));
 
             return identity;
         }

samples/snippets/csharp/VS_Snippets_CFX/s_uewsdualhttpsecurity/cs/program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Xml;
@@ -29,7 +29,7 @@ static void WSDualHttpMain()
                 new WSDualHttpBinding(WSDualHttpSecurityMode.Message);
             // </Snippet3>
 
-            /*            String clientBaseAddress = "http://localhost:8080/Discovery/" + Guid.NewGuid().ToString();
+            /*            string clientBaseAddress = "http://localhost:8080/Discovery/" + Guid.NewGuid().ToString();
                         Uri clientBaseAddressUri = new Uri(clientBaseAddress);
                         WSDualHttpBinding bindingClientBaseAddress =
                             new WSDualHttpBinding(clientBaseAddressUri);

samples/snippets/csharp/VS_Snippets_CFX/s_wcftomsmq/cs/order.cs

@@ -1,4 +1,4 @@
-
+
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.
 
 using System;
@@ -17,7 +17,7 @@ public class PurchaseOrderLineItem
 
         public override string ToString()
         {
-            String displayString = "Order LineItem: " + quantity + " of " + productId + " @unit price: $" + unitCost + "\n";
+            string displayString = "Order LineItem: " + quantity + " of " + productId + " @unit price: $" + unitCost + "\n";
             return displayString;
         }
 

samples/snippets/csharp/VS_Snippets_CFX/samlattribute/cs/source.cs

@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 //-----------------------------------------------------------------------------
 using System;
@@ -91,7 +91,7 @@ private static void EnsurePurchaseLimitSufficient(string bookName)
         {
             if (!CheckIfPurchaseLimitMet(bookName))
             {
-                throw new FaultException(String.Format("Purchase limit not sufficient to purchase '{0}'", bookName));
+                throw new FaultException(string.Format("Purchase limit not sufficient to purchase '{0}'", bookName));
             }
         }
 
@@ -310,7 +310,7 @@ protected static void EnsureRequestSecurityTokenAction(Message message)
                 throw new ArgumentNullException("message");
 
             if (message.Headers.Action != Constants.Trust.Actions.Issue)
-                throw new InvalidOperationException(String.Format("Bad or Unsupported Action: {0}", message.Headers.Action));
+                throw new InvalidOperationException(string.Format("Bad or Unsupported Action: {0}", message.Headers.Action));
         }
 
         /// <summary>
@@ -474,7 +474,7 @@ public abstract class RequestSecurityTokenBase : BodyWriter
         /// Default constructor.
         /// </summary>
         protected RequestSecurityTokenBase()
-            : this(String.Empty, String.Empty, 0, null)
+            : this(string.Empty, string.Empty, 0, null)
         {
         }
 
@@ -555,7 +555,7 @@ public class RequestSecurityToken : RequestSecurityTokenBase
         /// </summary>
         public RequestSecurityToken()
             :
-            this(String.Empty, String.Empty, 0, null, null)
+            this(string.Empty, string.Empty, 0, null, null)
         {
         }
 
@@ -694,10 +694,10 @@ private static RequestSecurityToken ProcessRequestSecurityTokenElement(XmlReader
             int initialDepth = xr.Depth;
 
             // Extract the @Context attribute value.
-            string context = xr.GetAttribute(Constants.Trust.Attributes.Context, String.Empty);
+            string context = xr.GetAttribute(Constants.Trust.Attributes.Context, string.Empty);
 
             // Set up some default values.
-            string tokenType = String.Empty;
+            string tokenType = string.Empty;
             int keySize = 0;
             EndpointAddress appliesTo = null;
             SecurityToken entropy = null;
@@ -958,7 +958,7 @@ public class RequestSecurityTokenResponse : RequestSecurityTokenBase
         /// Default constructor.
         /// </summary>
         public RequestSecurityTokenResponse()
-            : this(String.Empty, String.Empty, 0, null, null, null, false)
+            : this(string.Empty, string.Empty, 0, null, null, null, false)
         {
         }
 
@@ -1204,7 +1204,7 @@ static X509Certificate2 LookupCertificate(StoreName storeName, StoreLocation sto
                                                                            subjectDistinguishedName, false);
                 if (certs.Count != 1)
                 {
-                    throw new Exception(String.Format("FedUtil: Certificate {0} not found or more than one certificate found", subjectDistinguishedName));
+                    throw new Exception(string.Format("FedUtil: Certificate {0} not found or more than one certificate found", subjectDistinguishedName));
                 }
                 return (X509Certificate2)certs[0];
             }
@@ -1351,7 +1351,7 @@ public static void LoadAppSettings()
 /*		
             BookDB = ConfigurationManager.AppSettings["bookDB"];
             CheckIfLoaded(BookDB);
-            BookDB = String.Format("{0}\\{1}", System.Web.Hosting.HostingEnvironment.ApplicationPhysicalPath, BookDB);
+            BookDB = string.Format("{0}\\{1}", System.Web.Hosting.HostingEnvironment.ApplicationPhysicalPath, BookDB);
 
             CertDistinguishedName = ConfigurationManager.AppSettings["certDistinguishedName"];
             CheckIfLoaded(CertDistinguishedName);
@@ -1370,7 +1370,7 @@ public static void LoadAppSettings()
         /// </summary>
         private static void CheckIfLoaded(string s)
         {
-            if (String.IsNullOrEmpty(s))
+            if (string.IsNullOrEmpty(s))
             {
                 throw new ConfigurationErrorsException("Required Configuration Element(s) missing at BookStoreSTS. Please check the STS configuration file.");
             }

samples/snippets/csharp/VS_Snippets_CFX/sba.transactions/cs/services.cs

@@ -1,4 +1,4 @@
-// <snippet2>
+// <snippet2>
 using System;
 using System.ServiceModel;
 using System.Transactions;
@@ -61,7 +61,7 @@ public string TxWork(string message)
       TransactionInformation info = Transaction.Current.TransactionInformation;
       Console.WriteLine("The distributed tx ID: {0}.", info.DistributedIdentifier);
       Console.WriteLine("The tx status: {0}.", info.Status);
-      return String.Format("Hello. This was object {0}.",myID.ToString()) ;
+      return string.Format("Hello. This was object {0}.",myID.ToString()) ;
     }
 
     public void Dispose()

samples/snippets/csharp/VS_Snippets_CFX/sba.transactiontimeout/cs/services.cs

@@ -1,4 +1,4 @@
-// <snippet2>
+// <snippet2>
 using System;
 using System.ServiceModel;
 using System.Transactions;
@@ -63,7 +63,7 @@ public string TxWork(string message)
       TransactionInformation info = Transaction.Current.TransactionInformation;
       Console.WriteLine("The distributed tx ID: {0}.", info.DistributedIdentifier);
       Console.WriteLine("The tx status: {0}.", info.Status);
-      return String.Format("Hello. This was object {0}.",myID.ToString()) ;
+      return string.Format("Hello. This was object {0}.",myID.ToString()) ;
     }
 
     public void Dispose()

samples/snippets/csharp/VS_Snippets_CFX/sendactivity/cs/snippets.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Workflow.Activities;
 using System.Workflow.ComponentModel;
 using System.Collections.Generic;
@@ -100,7 +100,7 @@ void Container6()
         {
             //SendActivity.ReturnValuePropertyName
             //<snippet6>
-            String retValName = SendActivity.ReturnValuePropertyName;
+            string retValName = SendActivity.ReturnValuePropertyName;
             //</snippet6>
         }
         void Container7()
@@ -165,19 +165,19 @@ void Container12()
             SendActivity sendActivity1 = new SendActivity();
             ChannelToken channelToken1 = new ChannelToken();
             sendActivity1.ChannelToken = channelToken1;
-            Dictionary<String, String> Context = (Dictionary<String, String>)SendActivity.GetContext(sendActivity1, channelToken1, contractType);
+            Dictionary<string, string> Context = (Dictionary<string, string>)SendActivity.GetContext(sendActivity1, channelToken1, contractType);
             //</snippet12>
         }
 
         void Container15()
         {
-            //SendActivity.GetContext(Activity, String, String, Type)
+            //SendActivity.GetContext(Activity, string, string, Type)
             Type contractType = typeof(string);
-            String endpointName = "";
-            String ownerActivityName = "";
+            string endpointName = "";
+            string ownerActivityName = "";
             //<snippet15>
             SendActivity sendActivity1 = new SendActivity();
-            Dictionary<String, String> Context = (Dictionary<String, String>)SendActivity.GetContext(sendActivity1, endpointName, ownerActivityName, contractType);
+            Dictionary<string, string> Context = (Dictionary<string, string>)SendActivity.GetContext(sendActivity1, endpointName, ownerActivityName, contractType);
             //</snippet15>
         }
         void Container16()
@@ -190,7 +190,7 @@ void Container16()
         }
         void Container17()
         {
-            //SendActivity.SendActivity(String)
+            //SendActivity.SendActivity(string)
             //<snippet17>
             SendActivity RequestQuoteFromShipper3;
             RequestQuoteFromShipper3 = new System.Workflow.Activities.SendActivity("RequestQuoteFromShipper3");