diff --git a/samples/snippets/cpp/VS_Snippets_CLR/rfc28981/CPP/rfc28981.cpp b/samples/snippets/cpp/VS_Snippets_CLR/rfc28981/CPP/rfc28981.cpp index 8586bb8bec7..0604e7df4cd 100644 --- a/samples/snippets/cpp/VS_Snippets_CLR/rfc28981/CPP/rfc28981.cpp +++ b/samples/snippets/cpp/VS_Snippets_CLR/rfc28981/CPP/rfc28981.cpp @@ -46,7 +46,7 @@ int main() // // Encrypt the data. - TripleDES^ encAlg = TripleDES::Create(); + Aes^ encAlg = Aes::Create(); encAlg->Key = k1->GetBytes( 16 ); MemoryStream^ encryptionStream = gcnew MemoryStream; CryptoStream^ encrypt = gcnew CryptoStream( encryptionStream,encAlg->CreateEncryptor(),CryptoStreamMode::Write ); @@ -60,7 +60,7 @@ int main() k1->Reset(); // Try to decrypt, thus showing it can be round-tripped. - TripleDES^ decAlg = TripleDES::Create(); + Aes^ decAlg = Aes::Create(); decAlg->Key = k2->GetBytes( 16 ); decAlg->IV = encAlg->IV; MemoryStream^ decryptionStreamBacking = gcnew MemoryStream; diff --git a/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/CPP/sample.cpp b/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/CPP/sample.cpp index c58a2e98489..c598df28ecc 100644 --- a/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/CPP/sample.cpp +++ b/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/CPP/sample.cpp @@ -31,13 +31,13 @@ int main() //Import key parameters into RSA. RSA->ImportParameters( RSAKeyInfo ); - //Create a new instance of the RijndaelManaged class. - RijndaelManaged^ RM = gcnew RijndaelManaged; + //Create a new instance of the Aes class. + Aes^ aes = gcnew Aes; //Encrypt the symmetric key and IV. - EncryptedSymmetricKey = RSA->Encrypt( RM->Key, false ); - EncryptedSymmetricIV = RSA->Encrypt( RM->IV, false ); - Console::WriteLine( "RijndaelManaged Key and IV have been encrypted with RSACryptoServiceProvider." ); + EncryptedSymmetricKey = RSA->Encrypt( aes->Key, false ); + EncryptedSymmetricIV = RSA->Encrypt( aes->IV, false ); + Console::WriteLine( "Aes Key and IV have been encrypted with RSACryptoServiceProvider." ); } catch ( CryptographicException^ e ) { diff --git a/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/CPP/xmldsigdetachedkeyedhashalg.cpp b/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/CPP/xmldsigdetachedkeyedhashalg.cpp index 3f53ebe4ad4..90bf2760bce 100644 --- a/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/CPP/xmldsigdetachedkeyedhashalg.cpp +++ b/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/CPP/xmldsigdetachedkeyedhashalg.cpp @@ -83,7 +83,7 @@ int main() String^ XmlFileName = "xmlsig.xml"; // Generate a signing key. - HMACSHA1^ Key = gcnew HMACSHA1; + HMACSHA256^ Key = gcnew HMACSHA256; Console::WriteLine( "Signing: {0}", resourceToSign ); // Sign the detached resourceand save the signature in an XML file. diff --git a/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/CPP/xmldsigenvkeyedhashalg.cpp b/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/CPP/xmldsigenvkeyedhashalg.cpp index 067536a31bc..b30507963d1 100644 --- a/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/CPP/xmldsigenvkeyedhashalg.cpp +++ b/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/CPP/xmldsigenvkeyedhashalg.cpp @@ -123,7 +123,7 @@ int main() { // Generate a signing key. - HMACSHA1^ Key = gcnew HMACSHA1; + HMACSHA256^ Key = gcnew HMACSHA256; // Create an XML file to sign. CreateSomeXml( "Example.xml" ); diff --git a/samples/snippets/csharp/VS_Snippets_CLR/rfc28981/CS/rfc28981.cs b/samples/snippets/csharp/VS_Snippets_CLR/rfc28981/CS/rfc28981.cs index 4e75ceb4981..8f4220b95d2 100644 --- a/samples/snippets/csharp/VS_Snippets_CLR/rfc28981/CS/rfc28981.cs +++ b/samples/snippets/csharp/VS_Snippets_CLR/rfc28981/CS/rfc28981.cs @@ -48,7 +48,7 @@ public static void Main(string[] passwordargs) Rfc2898DeriveBytes k2 = new Rfc2898DeriveBytes(pwd1, salt1); // // Encrypt the data. - TripleDES encAlg = TripleDES.Create(); + Aes encAlg = Aes.Create(); encAlg.Key = k1.GetBytes(16); MemoryStream encryptionStream = new MemoryStream(); CryptoStream encrypt = new CryptoStream(encryptionStream, @@ -64,7 +64,7 @@ public static void Main(string[] passwordargs) k1.Reset(); // Try to decrypt, thus showing it can be round-tripped. - TripleDES decAlg = TripleDES.Create(); + Aes decAlg = Aes.Create(); decAlg.Key = k2.GetBytes(16); decAlg.IV = encAlg.IV; MemoryStream decryptionStreamBacking = new MemoryStream(); diff --git a/samples/snippets/csharp/VS_Snippets_CLR/x509certificate2/cs/program.cs b/samples/snippets/csharp/VS_Snippets_CLR/x509certificate2/cs/program.cs index 0a7621eda9b..1e0da74d9ac 100644 --- a/samples/snippets/csharp/VS_Snippets_CLR/x509certificate2/cs/program.cs +++ b/samples/snippets/csharp/VS_Snippets_CLR/x509certificate2/cs/program.cs @@ -82,17 +82,16 @@ private static X509Certificate2 GetCertificateFromStore(string certName) // Encrypt a file using a public key. private static void EncryptFile(string inFile, RSACryptoServiceProvider rsaPublicKey) { - using (AesManaged aesManaged = new AesManaged()) + using (Aes aes = new Aes()) { - // Create instance of AesManaged for + // Create instance of Aes for // symetric encryption of the data. - aesManaged.KeySize = 256; - aesManaged.BlockSize = 128; - aesManaged.Mode = CipherMode.CBC; - using (ICryptoTransform transform = aesManaged.CreateEncryptor()) + aes.KeySize = 256; + aes.Mode = CipherMode.CBC; + using (ICryptoTransform transform = aes.CreateEncryptor()) { RSAPKCS1KeyExchangeFormatter keyFormatter = new RSAPKCS1KeyExchangeFormatter(rsaPublicKey); - byte[] keyEncrypted = keyFormatter.CreateKeyExchange(aesManaged.Key, aesManaged.GetType()); + byte[] keyEncrypted = keyFormatter.CreateKeyExchange(aes.Key, aes.GetType()); // Create byte arrays to contain // the length values of the key and IV. @@ -101,7 +100,7 @@ private static void EncryptFile(string inFile, RSACryptoServiceProvider rsaPubli int lKey = keyEncrypted.Length; LenK = BitConverter.GetBytes(lKey); - int lIV = aesManaged.IV.Length; + int lIV = aes.IV.Length; LenIV = BitConverter.GetBytes(lIV); // Write the following to the FileStream @@ -123,7 +122,7 @@ private static void EncryptFile(string inFile, RSACryptoServiceProvider rsaPubli outFs.Write(LenK, 0, 4); outFs.Write(LenIV, 0, 4); outFs.Write(keyEncrypted, 0, lKey); - outFs.Write(aesManaged.IV, 0, lIV); + outFs.Write(aes.IV, 0, lIV); // Now write the cipher text using // a CryptoStream for encrypting. @@ -137,7 +136,7 @@ private static void EncryptFile(string inFile, RSACryptoServiceProvider rsaPubli int offset = 0; // blockSizeBytes can be any arbitrary size. - int blockSizeBytes = aesManaged.BlockSize / 8; + int blockSizeBytes = aes.BlockSize / 8; byte[] data = new byte[blockSizeBytes]; int bytesRead = 0; @@ -169,13 +168,12 @@ private static void EncryptFile(string inFile, RSACryptoServiceProvider rsaPubli private static void DecryptFile(string inFile, RSACryptoServiceProvider rsaPrivateKey) { - // Create instance of AesManaged for + // Create instance of Aes for // symetric decryption of the data. - using (AesManaged aesManaged = new AesManaged()) + using (Aes aes = new Aes()) { - aesManaged.KeySize = 256; - aesManaged.BlockSize = 128; - aesManaged.Mode = CipherMode.CBC; + aes.KeySize = 256; + aes.Mode = CipherMode.CBC; // Create byte arrays to get the length of // the encrypted key and IV. @@ -202,14 +200,14 @@ private static void DecryptFile(string inFile, RSACryptoServiceProvider rsaPriva int lenK = BitConverter.ToInt32(LenK, 0); int lenIV = BitConverter.ToInt32(LenIV, 0); - // Determine the start postition of - // the ciphter text (startC) + // Determine the start position of + // the cipher text (startC) // and its length(lenC). int startC = lenK + lenIV + 8; int lenC = (int)inFs.Length - startC; // Create the byte arrays for - // the encrypted AesManaged key, + // the encrypted Aes key, // the IV, and the cipher text. byte[] KeyEncrypted = new byte[lenK]; byte[] IV = new byte[lenIV]; @@ -224,11 +222,11 @@ private static void DecryptFile(string inFile, RSACryptoServiceProvider rsaPriva Directory.CreateDirectory(decrFolder); // // Use RSACryptoServiceProvider - // to decrypt the AesManaged key. + // to decrypt the Aes key. byte[] KeyDecrypted = rsaPrivateKey.Decrypt(KeyEncrypted, false); // Decrypt the key. - using (ICryptoTransform transform = aesManaged.CreateDecryptor(KeyDecrypted, IV)) + using (ICryptoTransform transform = aes.CreateDecryptor(KeyDecrypted, IV)) { // @@ -242,7 +240,7 @@ private static void DecryptFile(string inFile, RSACryptoServiceProvider rsaPriva int count = 0; int offset = 0; - int blockSizeBytes = aesManaged.BlockSize / 8; + int blockSizeBytes = aes.BlockSize / 8; byte[] data = new byte[blockSizeBytes]; // By decrypting a chunk a time, diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/CS/sample.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/CS/sample.cs index 49c81a663f6..75e3d2a4fa7 100644 --- a/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/CS/sample.cs +++ b/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/CS/sample.cs @@ -37,14 +37,14 @@ static void Main() //Import key parameters into RSA. RSA.ImportParameters(RSAKeyInfo); - //Create a new instance of the RijndaelManaged class. - RijndaelManaged RM = new RijndaelManaged(); + //Create a new instance of the Aes class. + Aes aes = new Aes(); //Encrypt the symmetric key and IV. - EncryptedSymmetricKey = RSA.Encrypt(RM.Key, false); - EncryptedSymmetricIV = RSA.Encrypt(RM.IV, false); + EncryptedSymmetricKey = RSA.Encrypt(aes.Key, false); + EncryptedSymmetricIV = RSA.Encrypt(aes.IV, false); - Console.WriteLine("RijndaelManaged Key and IV have been encrypted with RSACryptoServiceProvider."); + Console.WriteLine("Aes Key and IV have been encrypted with RSACryptoServiceProvider."); } //Catch and display a CryptographicException //to the console. diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/CS/xmldsigdetachedkeyedhashalg.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/CS/xmldsigdetachedkeyedhashalg.cs index effc3651700..cf607fc0829 100644 --- a/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/CS/xmldsigdetachedkeyedhashalg.cs +++ b/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/CS/xmldsigdetachedkeyedhashalg.cs @@ -26,7 +26,7 @@ static void Main(string[] args) string XmlFileName = "xmlsig.xml"; // Generate a signing key. - HMACSHA1 Key = new HMACSHA1(); + HMACSHA256 Key = new HMACSHA256(); Console.WriteLine("Signing: {0}", resourceToSign); diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/CS/xmldsigenvkeyedhashalg.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/CS/xmldsigenvkeyedhashalg.cs index e32e316eefa..17ddbe98de5 100644 --- a/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/CS/xmldsigenvkeyedhashalg.cs +++ b/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/CS/xmldsigenvkeyedhashalg.cs @@ -20,7 +20,7 @@ public static void Main(String[] args) { // Generate a signing key. - HMACSHA1 Key = new HMACSHA1(); + HMACSHA256 Key = new HMACSHA256(); // Create an XML file to sign. CreateSomeXml("Example.xml"); diff --git a/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipprovider.cs b/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipprovider.cs index 61ecc1171af..d8643bbeeb7 100644 --- a/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipprovider.cs +++ b/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipprovider.cs @@ -1445,7 +1445,7 @@ private string EncodePassword(string password) Convert.ToBase64String(EncryptPassword(Encoding.Unicode.GetBytes(password))); break; case MembershipPasswordFormat.Hashed: - HMACSHA1 hash = new HMACSHA1(); + HMACSHA256 hash = new HMACSHA256(); hash.Key = HexToByte(machineKey.ValidationKey); encodedPassword = Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))); diff --git a/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipproviderfindusersbyEmail.cs b/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipproviderfindusersbyEmail.cs index f4edb41eaf4..9676e9d68c4 100644 --- a/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipproviderfindusersbyEmail.cs +++ b/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipproviderfindusersbyEmail.cs @@ -1399,7 +1399,7 @@ private string EncodePassword(string password) Convert.ToBase64String(EncryptPassword(Encoding.Unicode.GetBytes(password))); break; case MembershipPasswordFormat.Hashed: - HMACSHA1 hash = new HMACSHA1(); + HMACSHA256 hash = new HMACSHA256(); hash.Key = HexToByte(machineKey.ValidationKey); encodedPassword = Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))); diff --git a/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipproviderfindusersbyname.cs b/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipproviderfindusersbyname.cs index ae4dd640617..9e9ee19a84a 100644 --- a/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipproviderfindusersbyname.cs +++ b/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipproviderfindusersbyname.cs @@ -1398,7 +1398,7 @@ private string EncodePassword(string password) Convert.ToBase64String(EncryptPassword(Encoding.Unicode.GetBytes(password))); break; case MembershipPasswordFormat.Hashed: - HMACSHA1 hash = new HMACSHA1(); + HMACSHA256 hash = new HMACSHA256(); hash.Key = HexToByte(machineKey.ValidationKey); encodedPassword = Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))); diff --git a/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipprovidergetallusers.cs b/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipprovidergetallusers.cs index 96be2df7f04..09547ad9417 100644 --- a/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipprovidergetallusers.cs +++ b/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/CS/imembershipprovidergetallusers.cs @@ -1402,7 +1402,7 @@ private string EncodePassword(string password) Convert.ToBase64String(EncryptPassword(Encoding.Unicode.GetBytes(password))); break; case MembershipPasswordFormat.Hashed: - HMACSHA1 hash = new HMACSHA1(); + HMACSHA256 hash = new HMACSHA256(); hash.Key = HexToByte(machineKey.ValidationKey); encodedPassword = Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))); diff --git a/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.MembershipUser.Constructor/CS/newuser.cs b/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.MembershipUser.Constructor/CS/newuser.cs index bb86f1d4d6b..bbcf448011d 100644 --- a/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.MembershipUser.Constructor/CS/newuser.cs +++ b/samples/snippets/csharp/VS_Snippets_WebNet/System.Web.Security.MembershipUser.Constructor/CS/newuser.cs @@ -1444,7 +1444,7 @@ private string EncodePassword(string password) Convert.ToBase64String(EncryptPassword(Encoding.Unicode.GetBytes(password))); break; case MembershipPasswordFormat.Hashed: - HMACSHA1 hash = new HMACSHA1(); + HMACSHA256 hash = new HMACSHA256(); hash.Key = HexToByte(machineKey.ValidationKey); encodedPassword = Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))); diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb b/samples/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb index 36de6eff1f1..ce30d44920e 100644 --- a/samples/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb +++ b/samples/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb @@ -38,7 +38,7 @@ Public Class rfc2898test Dim k2 As New Rfc2898DeriveBytes(pwd1, salt1) ' ' Encrypt the data. - Dim encAlg As TripleDES = TripleDES.Create() + Dim encAlg As Aes = Aes.Create() encAlg.Key = k1.GetBytes(16) Dim encryptionStream As New MemoryStream() Dim encrypt As New CryptoStream(encryptionStream, encAlg.CreateEncryptor(), CryptoStreamMode.Write) @@ -51,7 +51,7 @@ Public Class rfc2898test k1.Reset() ' Try to decrypt, thus showing it can be round-tripped. - Dim decAlg As TripleDES = TripleDES.Create() + Dim decAlg As Aes = Aes.Create() decAlg.Key = k2.GetBytes(16) decAlg.IV = encAlg.IV Dim decryptionStreamBacking As New MemoryStream() diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR/x509certificate2/vb/program.vb b/samples/snippets/visualbasic/VS_Snippets_CLR/x509certificate2/vb/program.vb index 484cef74462..72d56bfa595 100644 --- a/samples/snippets/visualbasic/VS_Snippets_CLR/x509certificate2/vb/program.vb +++ b/samples/snippets/visualbasic/VS_Snippets_CLR/x509certificate2/vb/program.vb @@ -77,17 +77,16 @@ Class Program ' ' Encrypt a file using a public key. Private Shared Sub EncryptFile(ByVal inFile As String, ByVal rsaPublicKey As RSACryptoServiceProvider) - Dim aesManaged As New AesManaged() + Dim aes As New Aes() Try - ' Create instance of AesManaged for + ' Create instance of Aes for ' symetric encryption of the data. - aesManaged.KeySize = 256 - aesManaged.BlockSize = 128 - aesManaged.Mode = CipherMode.CBC - Dim transform As ICryptoTransform = aesManaged.CreateEncryptor() + aes.KeySize = 256 + aes.Mode = CipherMode.CBC + Dim transform As ICryptoTransform = aes.CreateEncryptor() Try Dim keyFormatter As New RSAPKCS1KeyExchangeFormatter(rsaPublicKey) - Dim keyEncrypted As Byte() = keyFormatter.CreateKeyExchange(aesManaged.Key, aesManaged.GetType()) + Dim keyEncrypted As Byte() = keyFormatter.CreateKeyExchange(aes.Key, aes.GetType()) ' Create byte arrays to contain ' the length values of the key and IV. @@ -96,7 +95,7 @@ Class Program Dim lKey As Integer = keyEncrypted.Length LenK = BitConverter.GetBytes(lKey) - Dim lIV As Integer = aesManaged.IV.Length + Dim lIV As Integer = aesM.IV.Length LenIV = BitConverter.GetBytes(lIV) ' Write the following to the FileStream @@ -117,7 +116,7 @@ Class Program outFs.Write(LenK, 0, 4) outFs.Write(LenIV, 0, 4) outFs.Write(keyEncrypted, 0, lKey) - outFs.Write(aesManaged.IV, 0, lIV) + outFs.Write(aes.IV, 0, lIV) ' Now write the cipher text using ' a CryptoStream for encrypting. @@ -131,7 +130,7 @@ Class Program Dim offset As Integer = 0 ' blockSizeBytes can be any arbitrary size. - Dim blockSizeBytes As Integer = aesManaged.BlockSize / 8 + Dim blockSizeBytes As Integer = aes.BlockSize / 8 Dim data(blockSizeBytes) As Byte Dim bytesRead As Integer = 0 @@ -160,7 +159,7 @@ Class Program transform.Dispose() End Try Finally - aesManaged.Dispose() + aes.Dispose() End Try End Sub @@ -171,13 +170,12 @@ Class Program ' Decrypt a file using a private key. Private Shared Sub DecryptFile(ByVal inFile As String, ByVal rsaPrivateKey As RSACryptoServiceProvider) - ' Create instance of AesManaged for + ' Create instance of Aes for ' symetric decryption of the data. - Dim aesManaged As New AesManaged() + Dim aes As New Aes() Try - aesManaged.KeySize = 256 - aesManaged.BlockSize = 128 - aesManaged.Mode = CipherMode.CBC + aes.KeySize = 256 + aes.Mode = CipherMode.CBC ' Create byte arrays to get the length of ' the encrypted key and IV. @@ -211,7 +209,7 @@ Class Program Dim lenC As Integer = (CType(inFs.Length, Integer) - startC) ' Create the byte arrays for - ' the encrypted Rijndael key, + ' the encrypted AES key, ' the IV, and the cipher text. Dim KeyEncrypted() As Byte = New Byte(lengthK - 1) {} Dim IV() As Byte = New Byte(lengthIV - 1) {} @@ -226,11 +224,11 @@ Class Program Directory.CreateDirectory(decrFolder) ' ' Use RSACryptoServiceProvider - ' to decrypt the Rijndael key. + ' to decrypt the AES key. Dim KeyDecrypted As Byte() = rsaPrivateKey.Decrypt(KeyEncrypted, False) ' Decrypt the key. - Dim transform As ICryptoTransform = aesManaged.CreateDecryptor(KeyDecrypted, IV) + Dim transform As ICryptoTransform = aes.CreateDecryptor(KeyDecrypted, IV) ' ' Decrypt the cipher text from ' from the FileSteam of the encrypted @@ -246,7 +244,7 @@ Class Program Dim count As Integer = 0 Dim offset As Integer = 0 - Dim blockSizeBytes As Integer = aesManaged.BlockSize / 8 + Dim blockSizeBytes As Integer = aes.BlockSize / 8 Dim data(blockSizeBytes) As Byte ' By decrypting a chunk a time, @@ -280,7 +278,7 @@ Class Program End Try Finally - aesManaged.Dispose() + aes.Dispose() End Try diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/VB/sample.vb b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/VB/sample.vb index 9919e784f1b..62b22ef77c7 100644 --- a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/VB/sample.vb +++ b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.RSACryptoServiceProvider.Encrypt/VB/sample.vb @@ -27,14 +27,14 @@ Class RSACSPSample 'Import key parameters into RSA. RSA.ImportParameters(RSAKeyInfo) - 'Create a new instance of the RijndaelManaged class. - Dim RM As New RijndaelManaged() + 'Create a new instance of the Aes class. + Dim aes As New Aes() 'Encrypt the symmetric key and IV. - EncryptedSymmetricKey = RSA.Encrypt(RM.Key, False) - EncryptedSymmetricIV = RSA.Encrypt(RM.IV, False) + EncryptedSymmetricKey = RSA.Encrypt(aes.Key, False) + EncryptedSymmetricIV = RSA.Encrypt(aes.IV, False) - Console.WriteLine("RijndaelManaged Key and IV have been encrypted with RSACryptoServiceProvider.") + Console.WriteLine("Aes Key and IV have been encrypted with RSACryptoServiceProvider.") 'Catch and display a CryptographicException 'to the console. diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/VB/xmldsigdetachedkeyedhashalg.vb b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/VB/xmldsigdetachedkeyedhashalg.vb index 01c594a82f5..bebedd1b471 100644 --- a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/VB/xmldsigdetachedkeyedhashalg.vb +++ b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Detached/VB/xmldsigdetachedkeyedhashalg.vb @@ -23,7 +23,7 @@ Class XMLDSIGDetached Dim XmlFileName As String = "xmlsig.xml" ' Generate a signing key. - Dim Key As New HMACSHA1() + Dim Key As New HMACSHA256() Console.WriteLine("Signing: {0}", resourceToSign) diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/VB/xmldsigenvkeyedhashalg.vb b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/VB/xmldsigenvkeyedhashalg.vb index 3d56b6fd3b1..b0a4ef839a4 100644 --- a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/VB/xmldsigenvkeyedhashalg.vb +++ b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Cryptography.XML.SignedXml.ComputeSig-Check-KeyedHash-Envelope/VB/xmldsigenvkeyedhashalg.vb @@ -19,7 +19,7 @@ Public Class SignVerifyEnvelope Try ' Generate a signing key. - Dim Key As New HMACSHA1() + Dim Key As New HMACSHA256() ' Create an XML file to sign. CreateSomeXml("Example.xml") diff --git a/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipprovider.vb b/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipprovider.vb index 693f0100925..e3040eb70cf 100644 --- a/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipprovider.vb +++ b/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipprovider.vb @@ -1368,7 +1368,7 @@ End Function encodedPassword = _ Convert.ToBase64String(EncryptPassword(Encoding.Unicode.GetBytes(password))) Case MembershipPasswordFormat.Hashed - Dim hash As HMACSHA1 = New HMACSHA1() + Dim hash As HMACSHA256 = New HMACSHA256() hash.Key = HexToByte(machineKey.ValidationKey) encodedPassword = _ Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))) diff --git a/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipproviderfindusersbyEmail.vb b/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipproviderfindusersbyEmail.vb index 9bc11e9c64d..e22b8224ad9 100644 --- a/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipproviderfindusersbyEmail.vb +++ b/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipproviderfindusersbyEmail.vb @@ -1329,7 +1329,7 @@ End Function encodedPassword = _ Convert.ToBase64String(EncryptPassword(Encoding.Unicode.GetBytes(password))) Case MembershipPasswordFormat.Hashed - Dim hash As HMACSHA1 = New HMACSHA1() + Dim hash As HMACSHA256 = New HMACSHA256() hash.Key = HexToByte(machineKey.ValidationKey) encodedPassword = _ Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))) diff --git a/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipproviderfindusersbyname.vb b/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipproviderfindusersbyname.vb index 00ee3289f2d..dfcd4cba475 100644 --- a/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipproviderfindusersbyname.vb +++ b/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipproviderfindusersbyname.vb @@ -1329,7 +1329,7 @@ End Function encodedPassword = _ Convert.ToBase64String(EncryptPassword(Encoding.Unicode.GetBytes(password))) Case MembershipPasswordFormat.Hashed - Dim hash As HMACSHA1 = New HMACSHA1() + Dim hash As HMACSHA256 = New HMACSHA256() hash.Key = HexToByte(machineKey.ValidationKey) encodedPassword = _ Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))) diff --git a/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipprovidergetallusers.vb b/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipprovidergetallusers.vb index e2a877104cf..e14edcee2c9 100644 --- a/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipprovidergetallusers.vb +++ b/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.IMembershipProvider/VB/imembershipprovidergetallusers.vb @@ -1331,7 +1331,7 @@ End Function encodedPassword = _ Convert.ToBase64String(EncryptPassword(Encoding.Unicode.GetBytes(password))) Case MembershipPasswordFormat.Hashed - Dim hash As HMACSHA1 = New HMACSHA1() + Dim hash As HMACSHA256 = New HMACSHA256() hash.Key = HexToByte(machineKey.ValidationKey) encodedPassword = _ Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))) diff --git a/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.MembershipUser.Constructor/VB/newuser.vb b/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.MembershipUser.Constructor/VB/newuser.vb index 4565c875b12..3cb86204b69 100644 --- a/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.MembershipUser.Constructor/VB/newuser.vb +++ b/samples/snippets/visualbasic/VS_Snippets_WebNet/System.Web.Security.MembershipUser.Constructor/VB/newuser.vb @@ -1366,7 +1366,7 @@ Namespace Samples.AspNet.Membership encodedPassword = _ Convert.ToBase64String(EncryptPassword(Encoding.Unicode.GetBytes(password))) Case MembershipPasswordFormat.Hashed - Dim hash As HMACSHA1 = New HMACSHA1() + Dim hash As HMACSHA256 = New HMACSHA256() hash.Key = HexToByte(machineKey.ValidationKey) encodedPassword = _ Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password))) diff --git a/xml/Microsoft.Extensions.Logging.Console/ConsoleLoggerOptions.xml b/xml/Microsoft.Extensions.Logging.Console/ConsoleLoggerOptions.xml index 6e858c42338..1c85ba3cc0e 100644 --- a/xml/Microsoft.Extensions.Logging.Console/ConsoleLoggerOptions.xml +++ b/xml/Microsoft.Extensions.Logging.Console/ConsoleLoggerOptions.xml @@ -131,7 +131,7 @@ Microsoft.Extensions.Logging.LogLevel - Gets or sets value indicating the minimum level of messaged that would get written to Console.Error. + Gets or sets value indicating the minimum level of messages that would get written to Console.Error. To be added. To be added. diff --git a/xml/System.ComponentModel.Composition.Hosting/CompositionContainer.xml b/xml/System.ComponentModel.Composition.Hosting/CompositionContainer.xml index 0e882323fab..b5a79cffc97 100644 --- a/xml/System.ComponentModel.Composition.Hosting/CompositionContainer.xml +++ b/xml/System.ComponentModel.Composition.Hosting/CompositionContainer.xml @@ -55,7 +55,7 @@ ]]> - Attributed Programming Model Overview + Attributed Programming Model Overview @@ -328,7 +328,7 @@ ]]> - Attributed Programming Model Overview + Attributed Programming Model Overview diff --git a/xml/System.ComponentModel.Composition/ExportAttribute.xml b/xml/System.ComponentModel.Composition/ExportAttribute.xml index dfbfc2904b7..a53b352f0d3 100644 --- a/xml/System.ComponentModel.Composition/ExportAttribute.xml +++ b/xml/System.ComponentModel.Composition/ExportAttribute.xml @@ -42,7 +42,7 @@ ]]> - Attributed Programming Model Overview + Attributed Programming Model Overview diff --git a/xml/System.ComponentModel.Composition/ImportAttribute.xml b/xml/System.ComponentModel.Composition/ImportAttribute.xml index 716e311d75d..4a61b07cdd3 100644 --- a/xml/System.ComponentModel.Composition/ImportAttribute.xml +++ b/xml/System.ComponentModel.Composition/ImportAttribute.xml @@ -40,7 +40,7 @@ ]]> - Attributed Programming Model Overview + Attributed Programming Model Overview diff --git a/xml/System.ComponentModel.DataAnnotations.Schema/ForeignKeyAttribute.xml b/xml/System.ComponentModel.DataAnnotations.Schema/ForeignKeyAttribute.xml index 1a6c244c618..38147cc786f 100644 --- a/xml/System.ComponentModel.DataAnnotations.Schema/ForeignKeyAttribute.xml +++ b/xml/System.ComponentModel.DataAnnotations.Schema/ForeignKeyAttribute.xml @@ -77,7 +77,7 @@ The annotation may be placed on the foreign key property and specify the associa ## Remarks -If you add the `ForeignKey` attribute to a foreign key property, `name` should specify the name of the associated navigation property. If you add the `ForeignKey` attribute to a navigation property, `name` should specify the name of one or more associated foreign keys. If a navigation property has multiple foreign keys, use commas to separate the list of foreign key names. For more information, see [Code First Data Annotations](https://msdn.microsoft.com/library/jj591583(v=vs.113).aspx). +If you add the `ForeignKey` attribute to a foreign key property, `name` should specify the name of the associated navigation property. If you add the `ForeignKey` attribute to a navigation property, `name` should specify the name of one or more associated foreign keys. If a navigation property has multiple foreign keys, use commas to separate the list of foreign key names. For more information, see [Code First Data Annotations](/ef/ef6/modeling/code-first/data-annotations). ]]> @@ -116,7 +116,7 @@ If you add the `ForeignKey` attribute to a foreign key property, `name` should s ## Remarks -If the `ForeignKey` attribute is applied to a foreign key property, the `Name` property specifies the name of the associated navigation property. If the `ForeignKey` attribute is applied to a navigation property, the `Name` property specifies the name of one or more associated foreign keys. If a navigation property has multiple foreign keys, commas separate the list of foreign key names. For more information, see [Code First Data Annotations](https://msdn.microsoft.com/library/jj591583(v=vs.113).aspx). +If the `ForeignKey` attribute is applied to a foreign key property, the `Name` property specifies the name of the associated navigation property. If the `ForeignKey` attribute is applied to a navigation property, the `Name` property specifies the name of one or more associated foreign keys. If a navigation property has multiple foreign keys, commas separate the list of foreign key names. For more information, see [Code First Data Annotations](/ef/ef6/modeling/code-first/data-annotations). ]]> diff --git a/xml/System.ComponentModel.Design/DesignSurface.xml b/xml/System.ComponentModel.Design/DesignSurface.xml index 390c6152808..8837ab728b4 100644 --- a/xml/System.ComponentModel.Design/DesignSurface.xml +++ b/xml/System.ComponentModel.Design/DesignSurface.xml @@ -796,7 +796,7 @@ if the **Design-time Error List** is loading; otherwise, . To be added. - Design-Time Errors in the Windows Forms Designer + Design-Time Errors in the Windows Forms Designer diff --git a/xml/System.ComponentModel/ProgressChangedEventArgs.xml b/xml/System.ComponentModel/ProgressChangedEventArgs.xml index 1607ba7c45e..56168fb8107 100644 --- a/xml/System.ComponentModel/ProgressChangedEventArgs.xml +++ b/xml/System.ComponentModel/ProgressChangedEventArgs.xml @@ -47,10 +47,10 @@ ]]> - How to: Implement a Component that Supports the Event-based Asynchronous Pattern + How to: Implement a Component that Supports the Event-based Asynchronous Pattern How to: Run an Operation in the Background - How to: Implement a Form That Uses a Background Operation - How to: Use Components that Support the Event-based Asynchronous Pattern + How to: Implement a Form That Uses a Background Operation + How to: Use Components that Support the Event-based Asynchronous Pattern @@ -95,10 +95,10 @@ Initializes a new instance of the class. To be added. - How to: Implement a Component that Supports the Event-based Asynchronous Pattern + How to: Implement a Component that Supports the Event-based Asynchronous Pattern How to: Run an Operation in the Background - How to: Implement a Form That Uses a Background Operation - How to: Use Components that Support the Event-based Asynchronous Pattern + How to: Implement a Form That Uses a Background Operation + How to: Use Components that Support the Event-based Asynchronous Pattern @@ -158,10 +158,10 @@ ]]> - How to: Implement a Component that Supports the Event-based Asynchronous Pattern + How to: Implement a Component that Supports the Event-based Asynchronous Pattern How to: Run an Operation in the Background - How to: Implement a Form That Uses a Background Operation - How to: Use Components that Support the Event-based Asynchronous Pattern + How to: Implement a Form That Uses a Background Operation + How to: Use Components that Support the Event-based Asynchronous Pattern @@ -216,10 +216,10 @@ ]]> - How to: Implement a Component that Supports the Event-based Asynchronous Pattern + How to: Implement a Component that Supports the Event-based Asynchronous Pattern How to: Run an Operation in the Background - How to: Implement a Form That Uses a Background Operation - How to: Use Components that Support the Event-based Asynchronous Pattern + How to: Implement a Form That Uses a Background Operation + How to: Use Components that Support the Event-based Asynchronous Pattern diff --git a/xml/System.ComponentModel/TypeConverter.xml b/xml/System.ComponentModel/TypeConverter.xml index 238556404e4..f748abc27d1 100644 --- a/xml/System.ComponentModel/TypeConverter.xml +++ b/xml/System.ComponentModel/TypeConverter.xml @@ -109,10 +109,10 @@ - Type Converters for XAML Overview - XAML-Related CLR Attributes For Custom Types and Libraries - Defining Custom Types for Use with .NET Framework XAML Services - NET XAML Services Conceptual Documentation + Type Converters for XAML Overview + XAML-Related CLR Attributes For Custom Types and Libraries + Defining Custom Types for Use with .NET Framework XAML Services + NET XAML Services Conceptual Documentation @@ -508,7 +508,7 @@ For implementation patterns for type converters that are used to support XAML and custom types, see [Type Converters for XAML Overview](/dotnet/framework/xaml-services/type-converters-for-xaml-overview). - Type Converters for XAML Overview + Type Converters for XAML Overview @@ -942,7 +942,7 @@ For implementation patterns for type converters that are used to support XAML and custom types, see [Type Converters for XAML Overview](/dotnet/framework/xaml-services/type-converters-for-xaml-overview). - Type Converters for XAML Overview + Type Converters for XAML Overview diff --git a/xml/System.ComponentModel/TypeConverterAttribute.xml b/xml/System.ComponentModel/TypeConverterAttribute.xml index 231002b921c..a352608b98b 100644 --- a/xml/System.ComponentModel/TypeConverterAttribute.xml +++ b/xml/System.ComponentModel/TypeConverterAttribute.xml @@ -80,9 +80,9 @@ ]]> - XAML-Related CLR Attributes For Custom Types and Libraries - Defining Custom Types for Use with .NET Framework XAML Services - NET XAML Services Conceptual Documentation + XAML-Related CLR Attributes For Custom Types and Libraries + Defining Custom Types for Use with .NET Framework XAML Services + XAML Services diff --git a/xml/System.ComponentModel/TypeDescriptor.xml b/xml/System.ComponentModel/TypeDescriptor.xml index 03bc148eb8d..1660450dea8 100644 --- a/xml/System.ComponentModel/TypeDescriptor.xml +++ b/xml/System.ComponentModel/TypeDescriptor.xml @@ -66,7 +66,7 @@ Type Descriptor Overview - Reflection + Reflection diff --git a/xml/System.ComponentModel/Win32Exception.xml b/xml/System.ComponentModel/Win32Exception.xml index 5aa6c076851..003bce835c7 100644 --- a/xml/System.ComponentModel/Win32Exception.xml +++ b/xml/System.ComponentModel/Win32Exception.xml @@ -58,7 +58,7 @@ to access the numeric representation of the error code associated with this exception. For more information about the error codes, see "Win32 Error Codes" in the Platform SDK documentation at [https://msdn.microsoft.com](https://msdn.microsoft.com/). + Win32 error codes are translated from their numeric representations into a system message when they are displayed. Use to access the numeric representation of the error code associated with this exception. For more information about the error codes, see [Win32 Error Codes](https://docs.microsoft.com/openspecs/windows_protocols/ms-erref/18d8fbe8-a967-4f1c-ae50-99ca8e491d2d). diff --git a/xml/System.Configuration/ApplicationSettingsBase.xml b/xml/System.Configuration/ApplicationSettingsBase.xml index 4a36cbc8d5b..f8dba877b81 100644 --- a/xml/System.Configuration/ApplicationSettingsBase.xml +++ b/xml/System.Configuration/ApplicationSettingsBase.xml @@ -88,7 +88,7 @@ - Application Settings for Windows Forms + Application Settings for Windows Forms @@ -1039,7 +1039,7 @@ - How to: Validate Application Settings + How to: Validate Application Settings diff --git a/xml/System.Configuration/ClientSettingsSection.xml b/xml/System.Configuration/ClientSettingsSection.xml index 09a5d9268c8..bd9c6ab45ca 100644 --- a/xml/System.Configuration/ClientSettingsSection.xml +++ b/xml/System.Configuration/ClientSettingsSection.xml @@ -40,7 +40,7 @@ - Application Settings for Windows Forms + Application Settings for Windows Forms diff --git a/xml/System.Configuration/DefaultSettingValueAttribute.xml b/xml/System.Configuration/DefaultSettingValueAttribute.xml index 856b6e21e2f..8386a8be459 100644 --- a/xml/System.Configuration/DefaultSettingValueAttribute.xml +++ b/xml/System.Configuration/DefaultSettingValueAttribute.xml @@ -60,7 +60,7 @@ - Application Settings for Windows Forms + Application Settings for Windows Forms diff --git a/xml/System.Configuration/IPersistComponentSettings.xml b/xml/System.Configuration/IPersistComponentSettings.xml index 19808c91616..c3182f87604 100644 --- a/xml/System.Configuration/IPersistComponentSettings.xml +++ b/xml/System.Configuration/IPersistComponentSettings.xml @@ -30,7 +30,7 @@ ]]> - Application Settings for Custom Controls + Application Settings for Custom Controls @@ -279,7 +279,7 @@ - Application Settings for Custom Controls + Application Settings for Custom Controls diff --git a/xml/System.Configuration/ISettingsProviderService.xml b/xml/System.Configuration/ISettingsProviderService.xml index ba5613c5d01..ae51a3f7de8 100644 --- a/xml/System.Configuration/ISettingsProviderService.xml +++ b/xml/System.Configuration/ISettingsProviderService.xml @@ -36,7 +36,7 @@ - Application Settings for Custom Controls + Application Settings for Custom Controls diff --git a/xml/System.Configuration/SettingsManageabilityAttribute.xml b/xml/System.Configuration/SettingsManageabilityAttribute.xml index 9b47fd7f86e..e4e36d07321 100644 --- a/xml/System.Configuration/SettingsManageabilityAttribute.xml +++ b/xml/System.Configuration/SettingsManageabilityAttribute.xml @@ -41,7 +41,7 @@ - Application Settings for Windows Forms + Application Settings for Windows Forms diff --git a/xml/System.Configuration/SettingsPropertyValue.xml b/xml/System.Configuration/SettingsPropertyValue.xml index a18158d9831..3ce191db7a5 100644 --- a/xml/System.Configuration/SettingsPropertyValue.xml +++ b/xml/System.Configuration/SettingsPropertyValue.xml @@ -118,7 +118,7 @@ ]]> - How to: Deserialize an Object + How to: Deserialize an Object diff --git a/xml/System.Data/EnumerableRowCollection.xml b/xml/System.Data/EnumerableRowCollection.xml index 061fb0b05de..2bf97fff0ed 100644 --- a/xml/System.Data/EnumerableRowCollection.xml +++ b/xml/System.Data/EnumerableRowCollection.xml @@ -49,7 +49,7 @@ - LINQ to DataSet + LINQ to DataSet diff --git a/xml/System.Data/EnumerableRowCollection`1.xml b/xml/System.Data/EnumerableRowCollection`1.xml index 4d3dd3310af..dc88b887b5e 100644 --- a/xml/System.Data/EnumerableRowCollection`1.xml +++ b/xml/System.Data/EnumerableRowCollection`1.xml @@ -57,7 +57,7 @@ - LINQ to DataSet + LINQ to DataSet diff --git a/xml/System.Data/OrderedEnumerableRowCollection`1.xml b/xml/System.Data/OrderedEnumerableRowCollection`1.xml index 68123bf6ba5..2ebff96b38c 100644 --- a/xml/System.Data/OrderedEnumerableRowCollection`1.xml +++ b/xml/System.Data/OrderedEnumerableRowCollection`1.xml @@ -52,7 +52,7 @@ - LINQ to DataSet + LINQ to DataSet diff --git a/xml/System.Globalization/RegionInfo.xml b/xml/System.Globalization/RegionInfo.xml index e4006b1bede..08bccfbfcb6 100644 --- a/xml/System.Globalization/RegionInfo.xml +++ b/xml/System.Globalization/RegionInfo.xml @@ -1038,9 +1038,9 @@ ## Examples The following code example displays the properties of the class. - [!code-cpp[System.Globalization.RegionInfo_Properties#1](~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Globalization.RegionInfo_Properties/CPP/regioninfo_properties.cpp#1)] - [!code-csharp[System.Globalization.RegionInfo_Properties#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Globalization.RegionInfo_Properties/CS/regioninfo_properties.cs#1)] - [!code-vb[System.Globalization.RegionInfo_Properties#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Globalization.RegionInfo_Properties/VB/regioninfo_properties.vb#1)] + :::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Globalization.RegionInfo_Properties/CPP/regioninfo_properties.cpp" id="Snippet1"::: + :::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Globalization.RegionInfo_Properties/CS/regioninfo_properties.cs" interactive="try-dotnet" id="Snippet1"::: + :::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Globalization.RegionInfo_Properties/VB/regioninfo_properties.vb" id="Snippet1"::: ]]> diff --git a/xml/System.Globalization/StringInfo.xml b/xml/System.Globalization/StringInfo.xml index 2173943dc6f..4d184a26e25 100644 --- a/xml/System.Globalization/StringInfo.xml +++ b/xml/System.Globalization/StringInfo.xml @@ -81,16 +81,16 @@ The following example illustrates both ways of working with the text elements in Each string is parsed once by the method and then by the method. Both methods correctly parse the text elements in the two strings and display the results of the parsing operation. -[!code-csharp[System.Globalization.StringInfo.Class#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.globalization.stringinfo.class/cs/indexing1.cs#1)] -[!code-vb[System.Globalization.StringInfo.Class#1](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.globalization.stringinfo.class/vb/indexing1.vb#1)] +:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.globalization.stringinfo.class/cs/indexing1.cs" interactive="try-dotnet" id="Snippet1"::: +:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.globalization.stringinfo.class/vb/indexing1.vb" id="Snippet1"::: ## Examples This example uses the and methods of the class to manipulate a string that contains surrogate and combining characters. -[!code-cpp[stringinfo#1](~/samples/snippets/cpp/VS_Snippets_CLR/StringInfo/cpp/StringInfo.cpp#1)] -[!code-csharp[stringinfo#1](~/samples/snippets/csharp/VS_Snippets_CLR/StringInfo/CS/StringInfo.cs#1)] -[!code-vb[stringinfo#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/StringInfo/vb/stringinfo.vb#1)] +:::code language="cpp" source="~/samples/snippets/cpp/VS_Snippets_CLR/StringInfo/cpp/StringInfo.cpp" id="Snippet1"::: +:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR/StringInfo/CS/StringInfo.cs" interactive="try-dotnet" id="Snippet1"::: +:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR/StringInfo/vb/stringinfo.vb" id="Snippet1"::: ]]> diff --git a/xml/System.Linq/ParallelEnumerable.xml b/xml/System.Linq/ParallelEnumerable.xml index 635eb7c0d36..9bdce6b41f3 100644 --- a/xml/System.Linq/ParallelEnumerable.xml +++ b/xml/System.Linq/ParallelEnumerable.xml @@ -10639,7 +10639,7 @@ is used multiple times in the query. Parallel LINQ (PLINQ) - How to: Cancel a PLINQ Query + How to: Cancel a PLINQ Query Cancellation @@ -10799,8 +10799,8 @@ is used multiple times in the query. Parallel LINQ (PLINQ) - Merge Options in PLINQ - How to: Specify Merge Options in PLINQ + Merge Options in PLINQ + How to: Specify Merge Options in PLINQ diff --git a/xml/System.Linq/ParallelExecutionMode.xml b/xml/System.Linq/ParallelExecutionMode.xml index c298fa8ea1c..78b187b3e51 100644 --- a/xml/System.Linq/ParallelExecutionMode.xml +++ b/xml/System.Linq/ParallelExecutionMode.xml @@ -33,8 +33,8 @@ The query execution mode is a hint that specifies how the system should handle performance trade-offs when parallelizing queries. To be added. Parallel LINQ (PLINQ) - How to: Specify the Execution Mode in PLINQ - Understanding Speedup in PLINQ + How to: Specify the Execution Mode in PLINQ + Understanding Speedup in PLINQ diff --git a/xml/System.Linq/ParallelMergeOptions.xml b/xml/System.Linq/ParallelMergeOptions.xml index 95dcdc9e42d..d07a6fc1161 100644 --- a/xml/System.Linq/ParallelMergeOptions.xml +++ b/xml/System.Linq/ParallelMergeOptions.xml @@ -44,8 +44,8 @@ ]]> Parallel LINQ (PLINQ) - Merge Options in PLINQ - How to: Specify Merge Options in PLINQ + Merge Options in PLINQ + How to: Specify Merge Options in PLINQ diff --git a/xml/System.Linq/Queryable.xml b/xml/System.Linq/Queryable.xml index 66ae5beb415..1180d9de4f5 100644 --- a/xml/System.Linq/Queryable.xml +++ b/xml/System.Linq/Queryable.xml @@ -50,7 +50,7 @@ Language-Integrated Query (LINQ) Standard Query Operators Overview Expression Trees - LINQ to SQL + LINQ to SQL diff --git a/xml/System.Net.Http/SocketsHttpHandler.xml b/xml/System.Net.Http/SocketsHttpHandler.xml index 3eff7e1460b..e2b0fea19ee 100644 --- a/xml/System.Net.Http/SocketsHttpHandler.xml +++ b/xml/System.Net.Http/SocketsHttpHandler.xml @@ -70,7 +70,7 @@ If this change is undesirable, you can configure your application to use the old - To be added. + Creates an instance of a class. To be added. @@ -92,9 +92,25 @@ If this change is undesirable, you can configure your application to use the old System.Boolean - To be added. - To be added. - To be added. + Gets or sets a value that indicates whether the handler should follow redirection responses. + + if the handler should follow redirection responses; otherwise . The default value is . + + + to `true` if you want the handler to automatically follow HTTP redirection headers to the new location of the resource. The maximum number of redirections to follow is set by the property. + + If is set to `false`, all HTTP responses with an HTTP status code from 300 to 399 are returned to the application. + + The Authorization header is cleared on auto-redirects and the handler automatically tries to re-authenticate to the redirected location. In practice, this means that an application can't put custom authentication information into the Authorization header if it is possible to encounter redirection. Instead, the application must implement and register a custom authentication module. + +> [!NOTE] +> The handler never follows a redirection from HTTPS to HTTP even if is set to `true`. + + ]]> + @@ -138,8 +154,8 @@ If this change is undesirable, you can configure your application to use the old System.TimeSpan - To be added. - To be added. + Gets or sets the timespan to wait before the connection establishing times out. + The timespan to wait before the connection establishing times out. The default value is . To be added. @@ -184,8 +200,8 @@ If this change is undesirable, you can configure your application to use the old System.Net.ICredentials - To be added. - To be added. + Gets or sets authentication information used by this handler. + The authentication credentials associated with the handler. The default value is . To be added. @@ -262,9 +278,15 @@ The default proxy is used only when System.TimeSpan - To be added. - To be added. - To be added. + Gets or sets the time-out value for server HTTP 100 Continue response. + The timespan to wait for the HTTP 100 Continue. The default value is 1 second. + + define the timeout for the `100 Continue` server response. + + ]]> @@ -413,9 +435,18 @@ For example, if the value is 64, then 65,536 bytes are allowed for the maximum r System.TimeSpan - To be added. - To be added. - To be added. + Gets or sets how long a connection can be the pool to be considered reusable. + The maximum time for a connection to be in the pool. The default value for this property is . + . + + ]]> + + The value specified is less than or is equal to . @@ -506,9 +537,15 @@ For example, if the value is 64, then 65,536 bytes are allowed for the maximum r System.TimeSpan - To be added. - To be added. - To be added. + Gets or sets the timespan to wait for data to be drained from responses. + The timespan to wait for data to be drained from responses. + + + @@ -581,8 +618,8 @@ For example, if the value is 64, then 65,536 bytes are allowed for the maximum r System.Boolean - To be added. - To be added. + Gets or sets a value that indicates whether the handler should use cookies. + A value that indicates whether the handler should use cookies. To be added. @@ -604,8 +641,8 @@ For example, if the value is 64, then 65,536 bytes are allowed for the maximum r System.Boolean - To be added. - To be added. + Gets or sets a value that indicates whether the handler should use a proxy. + A value that indicates whether the handler should use a proxy. To be added. diff --git a/xml/System.Security.Cryptography.Xml/SignedXml.xml b/xml/System.Security.Cryptography.Xml/SignedXml.xml index 5ed2675e353..f6a9b51d555 100644 --- a/xml/System.Security.Cryptography.Xml/SignedXml.xml +++ b/xml/System.Security.Cryptography.Xml/SignedXml.xml @@ -921,7 +921,7 @@ The main parts of this structure are: ]]> The parameter is . - The object specified by the parameter is not an instance of . + The object specified by the parameter is not an instance of or or or . -or- diff --git a/xml/System.ServiceModel.Activation.Configuration/SecurityIdentifierElement.xml b/xml/System.ServiceModel.Activation.Configuration/SecurityIdentifierElement.xml index 5001693ffb5..35c5fa3b64d 100644 --- a/xml/System.ServiceModel.Activation.Configuration/SecurityIdentifierElement.xml +++ b/xml/System.ServiceModel.Activation.Configuration/SecurityIdentifierElement.xml @@ -24,8 +24,8 @@ ]]> - <net.pipe> - <net.tcp> + <net.pipe> + <net.tcp> diff --git a/xml/System.ServiceModel.Channels/CommunicationObject.xml b/xml/System.ServiceModel.Channels/CommunicationObject.xml index c27c9a14521..f9e7030120e 100644 --- a/xml/System.ServiceModel.Channels/CommunicationObject.xml +++ b/xml/System.ServiceModel.Channels/CommunicationObject.xml @@ -1616,7 +1616,7 @@ The communication object is in a state and cannot be modified. The default interval of time that was allotted for the operation was exceeded before the operation was completed. - Message Security with a Windows Client + Message Security with a Windows Client diff --git a/xml/System.ServiceModel.Channels/DeliveryFailure.xml b/xml/System.ServiceModel.Channels/DeliveryFailure.xml index 7f76b1104a4..6765d4bf6a6 100644 --- a/xml/System.ServiceModel.Channels/DeliveryFailure.xml +++ b/xml/System.ServiceModel.Channels/DeliveryFailure.xml @@ -31,8 +31,8 @@ ]]> - Using Queues - How To: Exchange Messages with WCF Endpoints and MSMQ applications + Using Queues + How To: Exchange Messages with WCF Endpoints and MSMQ applications diff --git a/xml/System.ServiceModel.Channels/SecurityBindingElement.xml b/xml/System.ServiceModel.Channels/SecurityBindingElement.xml index 4af81cc1168..4e7f39773b9 100644 --- a/xml/System.ServiceModel.Channels/SecurityBindingElement.xml +++ b/xml/System.ServiceModel.Channels/SecurityBindingElement.xml @@ -63,8 +63,8 @@ ]]> - SecurityBindingElement Authentication Modes - How To: Create a Custom Binding Using the SecurityBindingElement + SecurityBindingElement Authentication Modes + How To: Create a Custom Binding Using the SecurityBindingElement diff --git a/xml/System.ServiceModel.Channels/StreamSecurityUpgradeAcceptor.xml b/xml/System.ServiceModel.Channels/StreamSecurityUpgradeAcceptor.xml index 3dd80e8a6aa..78857e03889 100644 --- a/xml/System.ServiceModel.Channels/StreamSecurityUpgradeAcceptor.xml +++ b/xml/System.ServiceModel.Channels/StreamSecurityUpgradeAcceptor.xml @@ -26,7 +26,7 @@ ]]> - Custom Stream Upgrades + Custom Stream Upgrades diff --git a/xml/System.ServiceModel.Channels/StreamSecurityUpgradeInitiator.xml b/xml/System.ServiceModel.Channels/StreamSecurityUpgradeInitiator.xml index 53d578d8c98..685ecb74826 100644 --- a/xml/System.ServiceModel.Channels/StreamSecurityUpgradeInitiator.xml +++ b/xml/System.ServiceModel.Channels/StreamSecurityUpgradeInitiator.xml @@ -26,7 +26,7 @@ ]]> - Custom Stream Upgrades + Custom Stream Upgrades diff --git a/xml/System.ServiceModel.Channels/StreamSecurityUpgradeProvider.xml b/xml/System.ServiceModel.Channels/StreamSecurityUpgradeProvider.xml index 312dd1f91d6..273b0368ab6 100644 --- a/xml/System.ServiceModel.Channels/StreamSecurityUpgradeProvider.xml +++ b/xml/System.ServiceModel.Channels/StreamSecurityUpgradeProvider.xml @@ -36,7 +36,7 @@ ]]> - Custom Stream Upgrades + Custom Stream Upgrades diff --git a/xml/System.ServiceModel.Channels/StreamUpgradeAcceptor.xml b/xml/System.ServiceModel.Channels/StreamUpgradeAcceptor.xml index 606ad5804d8..e911a20ff83 100644 --- a/xml/System.ServiceModel.Channels/StreamUpgradeAcceptor.xml +++ b/xml/System.ServiceModel.Channels/StreamUpgradeAcceptor.xml @@ -28,7 +28,7 @@ ]]> - Custom Stream Upgrades + Custom Stream Upgrades diff --git a/xml/System.ServiceModel.Channels/StreamUpgradeBindingElement.xml b/xml/System.ServiceModel.Channels/StreamUpgradeBindingElement.xml index a4f379cd5de..d4ee79b7d31 100644 --- a/xml/System.ServiceModel.Channels/StreamUpgradeBindingElement.xml +++ b/xml/System.ServiceModel.Channels/StreamUpgradeBindingElement.xml @@ -30,7 +30,7 @@ ]]> - Custom Stream Upgrades + Custom Stream Upgrades diff --git a/xml/System.ServiceModel.Channels/StreamUpgradeInitiator.xml b/xml/System.ServiceModel.Channels/StreamUpgradeInitiator.xml index 5c7781328e5..e9f1bb31f1b 100644 --- a/xml/System.ServiceModel.Channels/StreamUpgradeInitiator.xml +++ b/xml/System.ServiceModel.Channels/StreamUpgradeInitiator.xml @@ -26,7 +26,7 @@ ]]> - Custom Stream Upgrades + Custom Stream Upgrades diff --git a/xml/System.ServiceModel.Channels/StreamUpgradeProvider.xml b/xml/System.ServiceModel.Channels/StreamUpgradeProvider.xml index 6a63092ad43..53f7f95fc4e 100644 --- a/xml/System.ServiceModel.Channels/StreamUpgradeProvider.xml +++ b/xml/System.ServiceModel.Channels/StreamUpgradeProvider.xml @@ -36,7 +36,7 @@ ]]> - Custom Stream Upgrades + Custom Stream Upgrades diff --git a/xml/System.ServiceModel.Configuration/AuthorizationPolicyTypeElementCollection.xml b/xml/System.ServiceModel.Configuration/AuthorizationPolicyTypeElementCollection.xml index b213c0dcf23..8c15ec64310 100644 --- a/xml/System.ServiceModel.Configuration/AuthorizationPolicyTypeElementCollection.xml +++ b/xml/System.ServiceModel.Configuration/AuthorizationPolicyTypeElementCollection.xml @@ -25,7 +25,7 @@ Contains a collection of instances. This class cannot be inherited. To be added. - AuthorizationPolicy in Configuration + <authorizationPolicies> diff --git a/xml/System.ServiceModel.Configuration/BaseAddressElement.xml b/xml/System.ServiceModel.Configuration/BaseAddressElement.xml index f0eb1cde5e9..9a9a6415a2e 100644 --- a/xml/System.ServiceModel.Configuration/BaseAddressElement.xml +++ b/xml/System.ServiceModel.Configuration/BaseAddressElement.xml @@ -18,7 +18,7 @@ Represents a configuration element that specifies the base addresses used by the service host. This class cannot be inherited. To be added. - BaseAddresses in Configuration + <BaseAddresses> diff --git a/xml/System.ServiceModel.Configuration/BaseAddressElementCollection.xml b/xml/System.ServiceModel.Configuration/BaseAddressElementCollection.xml index dfee9dd5bfd..ca9e57ddbc1 100644 --- a/xml/System.ServiceModel.Configuration/BaseAddressElementCollection.xml +++ b/xml/System.ServiceModel.Configuration/BaseAddressElementCollection.xml @@ -25,7 +25,7 @@ Represents a collection of objects. To be added. - BaseAddresses in Config + <BaseAddresses> diff --git a/xml/System.ServiceModel.Configuration/BasicHttpBindingCollectionElement.xml b/xml/System.ServiceModel.Configuration/BasicHttpBindingCollectionElement.xml index 8a9cf695498..076b4fbf49b 100644 --- a/xml/System.ServiceModel.Configuration/BasicHttpBindingCollectionElement.xml +++ b/xml/System.ServiceModel.Configuration/BasicHttpBindingCollectionElement.xml @@ -22,7 +22,7 @@ Represents a configuration section that holds a collection of instances. To be added. - BasicHttpBinding in Configuration + <basicHttpBinding> diff --git a/xml/System.ServiceModel.Configuration/BasicHttpBindingElement.xml b/xml/System.ServiceModel.Configuration/BasicHttpBindingElement.xml index 694a13d4fa7..43fa27680d3 100644 --- a/xml/System.ServiceModel.Configuration/BasicHttpBindingElement.xml +++ b/xml/System.ServiceModel.Configuration/BasicHttpBindingElement.xml @@ -24,7 +24,7 @@ Represents an XML element that specifies a binding used to communicate with WS-I Basic Profile 1.1-conformant Web Services like ASMX-based services or to accept messages from ASMX-based clients. To be added. - BasicHttpBinding in Configuration + <basicHttpBinding> diff --git a/xml/System.ServiceModel.Configuration/BasicHttpMessageSecurityElement.xml b/xml/System.ServiceModel.Configuration/BasicHttpMessageSecurityElement.xml index 620e8ad426f..61d4d1c6745 100644 --- a/xml/System.ServiceModel.Configuration/BasicHttpMessageSecurityElement.xml +++ b/xml/System.ServiceModel.Configuration/BasicHttpMessageSecurityElement.xml @@ -24,7 +24,7 @@ An XML element that configures HTTP message security. To be added. - BasicHttpMessageSecurity in configuration + <message> of <basicHttpBinding> diff --git a/xml/System.ServiceModel.Configuration/BehaviorsSection.xml b/xml/System.ServiceModel.Configuration/BehaviorsSection.xml index afa2fb73b3e..b71977ee545 100644 --- a/xml/System.ServiceModel.Configuration/BehaviorsSection.xml +++ b/xml/System.ServiceModel.Configuration/BehaviorsSection.xml @@ -24,7 +24,7 @@ ]]> - Behaviors in Configuration + <behaviors> diff --git a/xml/System.ServiceModel.Configuration/BindingCollectionElement.xml b/xml/System.ServiceModel.Configuration/BindingCollectionElement.xml index bbddba35c6b..70e6793d57f 100644 --- a/xml/System.ServiceModel.Configuration/BindingCollectionElement.xml +++ b/xml/System.ServiceModel.Configuration/BindingCollectionElement.xml @@ -17,7 +17,7 @@ Represents a configuration section that contains a collection of binding elements, each of which describes an aspect of how an endpoint communicates with other endpoints, that is built, consistently, into a channel factory on the client and a channel listener on the service. To be added. - Bindings in Configuration + <bindings> diff --git a/xml/System.ServiceModel.Configuration/BindingsSection.xml b/xml/System.ServiceModel.Configuration/BindingsSection.xml index 0bbbe6563ae..8ff60e80b79 100644 --- a/xml/System.ServiceModel.Configuration/BindingsSection.xml +++ b/xml/System.ServiceModel.Configuration/BindingsSection.xml @@ -40,7 +40,7 @@ Initializes a new instance of the class. To be added. - Bindings in Configuration + <bindings> diff --git a/xml/System.ServiceModel.Configuration/CallbackTimeoutsElement.xml b/xml/System.ServiceModel.Configuration/CallbackTimeoutsElement.xml index 66f6d7cf063..8148fa55a3a 100644 --- a/xml/System.ServiceModel.Configuration/CallbackTimeoutsElement.xml +++ b/xml/System.ServiceModel.Configuration/CallbackTimeoutsElement.xml @@ -17,7 +17,7 @@ Represents a configuration element that specifies timeout for a client callback. This class cannot be inherited. To be added. - CallbackTimeouts in Configuration + <callbackTimeouts> diff --git a/xml/System.ServiceModel.Configuration/NamedPipeTransportElement.xml b/xml/System.ServiceModel.Configuration/NamedPipeTransportElement.xml index bd2a45b71b6..2399b640f3f 100644 --- a/xml/System.ServiceModel.Configuration/NamedPipeTransportElement.xml +++ b/xml/System.ServiceModel.Configuration/NamedPipeTransportElement.xml @@ -18,7 +18,7 @@ Represents a configuration element that specifies a channel to transfer messages using named pipes when it is included in a custom binding. This class cannot be inherited. To be added. - namedPipeTransport element + <namedPipeTransport> diff --git a/xml/System.ServiceModel.Configuration/NetMsmqBindingElement.xml b/xml/System.ServiceModel.Configuration/NetMsmqBindingElement.xml index 3df71beb27a..a75e80eaa9f 100644 --- a/xml/System.ServiceModel.Configuration/NetMsmqBindingElement.xml +++ b/xml/System.ServiceModel.Configuration/NetMsmqBindingElement.xml @@ -27,7 +27,7 @@ ]]> - netMsmqBinding Element + <netMsmqBinding> diff --git a/xml/System.ServiceModel.Configuration/NetNamedPipeBindingCollectionElement.xml b/xml/System.ServiceModel.Configuration/NetNamedPipeBindingCollectionElement.xml index dc96c9b7c57..bb1615467cc 100644 --- a/xml/System.ServiceModel.Configuration/NetNamedPipeBindingCollectionElement.xml +++ b/xml/System.ServiceModel.Configuration/NetNamedPipeBindingCollectionElement.xml @@ -21,7 +21,7 @@ Represents a configuration section that contains a collection of instances. To be added. - netNamedPipeBinding Element + <netNamedPipeBinding> diff --git a/xml/System.ServiceModel.Configuration/NetNamedPipeBindingElement.xml b/xml/System.ServiceModel.Configuration/NetNamedPipeBindingElement.xml index d0e18de25db..54600a2b6d3 100644 --- a/xml/System.ServiceModel.Configuration/NetNamedPipeBindingElement.xml +++ b/xml/System.ServiceModel.Configuration/NetNamedPipeBindingElement.xml @@ -25,7 +25,7 @@ ]]> - netNamedPipeBinding Element + <netNamedPipeBinding> diff --git a/xml/System.ServiceModel.Configuration/NetTcpBindingCollectionElement.xml b/xml/System.ServiceModel.Configuration/NetTcpBindingCollectionElement.xml index c8f2c665150..f87cb5f9231 100644 --- a/xml/System.ServiceModel.Configuration/NetTcpBindingCollectionElement.xml +++ b/xml/System.ServiceModel.Configuration/NetTcpBindingCollectionElement.xml @@ -22,7 +22,7 @@ Represents a configuration element that contains a collection of instances. To be added. - netTcpBinding Element + <netTcpBinding> diff --git a/xml/System.ServiceModel.Configuration/PolicyImporterElement.xml b/xml/System.ServiceModel.Configuration/PolicyImporterElement.xml index 8587209f3ed..623b6f4c8f2 100644 --- a/xml/System.ServiceModel.Configuration/PolicyImporterElement.xml +++ b/xml/System.ServiceModel.Configuration/PolicyImporterElement.xml @@ -24,7 +24,7 @@ ]]> - <policyImporter> + <policyImporter> diff --git a/xml/System.ServiceModel.Configuration/PolicyImporterElementCollection.xml b/xml/System.ServiceModel.Configuration/PolicyImporterElementCollection.xml index 05bc4647832..543e686c1d7 100644 --- a/xml/System.ServiceModel.Configuration/PolicyImporterElementCollection.xml +++ b/xml/System.ServiceModel.Configuration/PolicyImporterElementCollection.xml @@ -25,7 +25,7 @@ Represents a collection of instances. This class cannot be inherited. To be added. - <policyImporters> + <policyImporters> diff --git a/xml/System.ServiceModel.Configuration/PrivacyNoticeElement.xml b/xml/System.ServiceModel.Configuration/PrivacyNoticeElement.xml index 9af802f7d75..d79ff3272a1 100644 --- a/xml/System.ServiceModel.Configuration/PrivacyNoticeElement.xml +++ b/xml/System.ServiceModel.Configuration/PrivacyNoticeElement.xml @@ -18,7 +18,7 @@ Represents a configuration element that specifies a privacy notice used in binding. To be added. - <privacyNoticeAt> + <privacyNoticeAt> diff --git a/xml/System.ServiceModel.Configuration/ReliableSessionElement.xml b/xml/System.ServiceModel.Configuration/ReliableSessionElement.xml index 4e5e58b339e..5e8e1ea8c11 100644 --- a/xml/System.ServiceModel.Configuration/ReliableSessionElement.xml +++ b/xml/System.ServiceModel.Configuration/ReliableSessionElement.xml @@ -25,7 +25,7 @@ ]]> - reliableSession element + <reliableSession> diff --git a/xml/System.ServiceModel.Configuration/SecurityElement.xml b/xml/System.ServiceModel.Configuration/SecurityElement.xml index 1d1b1532f5a..dfdb7ea0299 100644 --- a/xml/System.ServiceModel.Configuration/SecurityElement.xml +++ b/xml/System.ServiceModel.Configuration/SecurityElement.xml @@ -17,7 +17,7 @@ Represents a configuration element that specifies the security options for a custom binding. This class cannot be inherited. To be added. - customBinding Element + <customBinding> diff --git a/xml/System.ServiceModel/ServiceSecurityContext.xml b/xml/System.ServiceModel/ServiceSecurityContext.xml index d2468563b6d..9f6e2dd08de 100644 --- a/xml/System.ServiceModel/ServiceSecurityContext.xml +++ b/xml/System.ServiceModel/ServiceSecurityContext.xml @@ -62,10 +62,10 @@ - How To: Examine the Security Context - Authorization Policy Sample - Securing Services - Claims and Authorization + How To: Examine the Security Context + Authorization Policy + Securing Services + Managing Claims and Authorization with the Identity Model @@ -327,7 +327,7 @@ - How To: Examine the Security Context + How To: Examine the Security Context diff --git a/xml/System.ServiceModel/WS2007HttpBinding.xml b/xml/System.ServiceModel/WS2007HttpBinding.xml index e4d691b596f..1012d84b8aa 100644 --- a/xml/System.ServiceModel/WS2007HttpBinding.xml +++ b/xml/System.ServiceModel/WS2007HttpBinding.xml @@ -31,10 +31,10 @@ ]]> - Security Protocols - Reliable Messaging Protocol version 1.1 - Transaction Protocols - Web Services Protocols Interoperability Guide + Security Protocols + Reliable Messaging Protocol version 1.1 + Transaction Protocols + Web Services Protocols Interoperability Guide diff --git a/xml/System.ServiceModel/XmlSerializerFormatAttribute.xml b/xml/System.ServiceModel/XmlSerializerFormatAttribute.xml index 32b2c27b83c..544baf9064c 100644 --- a/xml/System.ServiceModel/XmlSerializerFormatAttribute.xml +++ b/xml/System.ServiceModel/XmlSerializerFormatAttribute.xml @@ -73,7 +73,7 @@ - Using the XmlSerializer + Using the XmlSerializer Class diff --git a/xml/System.Web.UI.WebControls/AdRotator.xml b/xml/System.Web.UI.WebControls/AdRotator.xml index 27256389988..4eb513c60fa 100644 --- a/xml/System.Web.UI.WebControls/AdRotator.xml +++ b/xml/System.Web.UI.WebControls/AdRotator.xml @@ -498,8 +498,8 @@ ~/Images/ad1.gif - https://msdn.microsoft.com/vbasic/ - Visual Basic Developer Site + https://docs.microsoft.com/dotnet/visual-basic/ + Visual Basic documentation 140 100