Fix/update left overs

dotnet · Sep 8, 2020 · b172655 · b172655
1 parent 497c597
commit b172655
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.cs b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.cs
@@ -17,7 +17,8 @@ public OleDbCommand(string? cmdText, System.Data.OleDb.OleDbConnection? connecti
         [System.ComponentModel.DefaultValueAttribute("")]
         [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.ADO.Design.OleDbCommandTextEditor, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
         [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
-        public override string? CommandText { get { throw null; } set { } }
+        [System.Diagnostics.CodeAnalysis.AllowNullAttribute]
+        public override string CommandText { get { throw null; } set { } }
         public override int CommandTimeout { get { throw null; } set { } }
         [System.ComponentModel.DefaultValueAttribute(System.Data.CommandType.Text)]
         [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]

diff --git a/src/libraries/System.Data.OleDb/src/OleDbTransaction.cs b/src/libraries/System.Data.OleDb/src/OleDbTransaction.cs
@@ -137,15 +137,15 @@ internal OleDbTransaction(OleDbConnection connection, OleDbTransaction? transact
             _isolationLevel = isolevel;
         }
 
-        public new OleDbConnection Connection
+        public new OleDbConnection? Connection
         {
             get
             {
                 return _parentConnection;
             }
         }
 
-        protected override DbConnection DbConnection
+        protected override DbConnection? DbConnection
         {
             get
             {

diff --git a/...es/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSourceActivity.cs b/...es/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSourceActivity.cs
@@ -4,8 +4,6 @@
 // Changes to this file must follow the https://aka.ms/api-review process.
 // ------------------------------------------------------------------------------
 
-using System.Diagnostics.CodeAnalysis;
-
 namespace System.Diagnostics
 {
     public partial class Activity : IDisposable

diff --git a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.PackUriScheme.cs b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.PackUriScheme.cs
@@ -8,11 +8,11 @@ namespace System.IO.Packaging
 {
     public static partial class PackUriHelper
     {
-        public static int ComparePackUri(System.Uri firstPackUri, System.Uri secondPackUri) { throw null; }
+        public static int ComparePackUri(System.Uri? firstPackUri, System.Uri? secondPackUri) { throw null; }
         public static System.Uri Create(System.Uri packageUri) { throw null; }
-        public static System.Uri Create(System.Uri packageUri, System.Uri partUri) { throw null; }
-        public static System.Uri Create(System.Uri packageUri, System.Uri partUri, string fragment) { throw null; }
+        public static System.Uri Create(System.Uri packageUri, System.Uri? partUri) { throw null; }
+        public static System.Uri Create(System.Uri packageUri, System.Uri? partUri, string? fragment) { throw null; }
         public static System.Uri GetPackageUri(System.Uri packUri) { throw null; }
-        public static System.Uri GetPartUri(System.Uri packUri) { throw null; }
+        public static System.Uri? GetPartUri(System.Uri packUri) { throw null; }
     }
 }
diff --git a/...ies/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.netcoreapp.cs b/...ies/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.netcoreapp.cs
@@ -96,14 +96,14 @@ public Pkcs12SafeContents() { }
         public System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag AddNestedContents(System.Security.Cryptography.Pkcs.Pkcs12SafeContents safeContents) { throw null; }
         public void AddSafeBag(System.Security.Cryptography.Pkcs.Pkcs12SafeBag safeBag) { }
         public System.Security.Cryptography.Pkcs.Pkcs12SecretBag AddSecret(System.Security.Cryptography.Oid secretType, System.ReadOnlyMemory<byte> secretValue) { throw null; }
-        public System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag AddShroudedKey(System.Security.Cryptography.AsymmetricAlgorithm key, byte[] passwordBytes, System.Security.Cryptography.PbeParameters pbeParameters) { throw null; }
+        public System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag AddShroudedKey(System.Security.Cryptography.AsymmetricAlgorithm key, byte[]? passwordBytes, System.Security.Cryptography.PbeParameters pbeParameters) { throw null; }
         public System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag AddShroudedKey(System.Security.Cryptography.AsymmetricAlgorithm key, System.ReadOnlySpan<byte> passwordBytes, System.Security.Cryptography.PbeParameters pbeParameters) { throw null; }
         public System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag AddShroudedKey(System.Security.Cryptography.AsymmetricAlgorithm key, System.ReadOnlySpan<char> password, System.Security.Cryptography.PbeParameters pbeParameters) { throw null; }
-        public System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag AddShroudedKey(System.Security.Cryptography.AsymmetricAlgorithm key, string password, System.Security.Cryptography.PbeParameters pbeParameters) { throw null; }
-        public void Decrypt(byte[] passwordBytes) { }
+        public System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag AddShroudedKey(System.Security.Cryptography.AsymmetricAlgorithm key, string? password, System.Security.Cryptography.PbeParameters pbeParameters) { throw null; }
+        public void Decrypt(byte[]? passwordBytes) { }
         public void Decrypt(System.ReadOnlySpan<byte> passwordBytes) { }
         public void Decrypt(System.ReadOnlySpan<char> password) { }
-        public void Decrypt(string password) { }
+        public void Decrypt(string? password) { }
         public System.Collections.Generic.IEnumerable<System.Security.Cryptography.Pkcs.Pkcs12SafeBag> GetBags() { throw null; }
     }
     public sealed partial class Pkcs12SafeContentsBag : System.Security.Cryptography.Pkcs.Pkcs12SafeBag
@@ -172,7 +172,7 @@ public sealed partial class Rfc3161TimestampToken
         internal Rfc3161TimestampToken() { }
         public System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo TokenInfo { get { throw null; } }
         public System.Security.Cryptography.Pkcs.SignedCms AsSignedCms() { throw null; }
-        public static bool TryDecode(System.ReadOnlyMemory<byte> encodedBytes, out System.Security.Cryptography.Pkcs.Rfc3161TimestampToken? token, out int bytesConsumed) { throw null; }
+        public static bool TryDecode(System.ReadOnlyMemory<byte> encodedBytes, [System.Diagnostics.CodeAnalysis.NotNullWhenAttribute(true)] out System.Security.Cryptography.Pkcs.Rfc3161TimestampToken? token, out int bytesConsumed) { throw null; }
         public bool VerifySignatureForData(System.ReadOnlySpan<byte> data, out System.Security.Cryptography.X509Certificates.X509Certificate2? signerCertificate, System.Security.Cryptography.X509Certificates.X509Certificate2Collection? extraCandidates = null) { throw null; }
         public bool VerifySignatureForHash(System.ReadOnlySpan<byte> hash, System.Security.Cryptography.HashAlgorithmName hashAlgorithm, out System.Security.Cryptography.X509Certificates.X509Certificate2? signerCertificate, System.Security.Cryptography.X509Certificates.X509Certificate2Collection? extraCandidates = null) { throw null; }
         public bool VerifySignatureForHash(System.ReadOnlySpan<byte> hash, System.Security.Cryptography.Oid hashAlgorithmId, out System.Security.Cryptography.X509Certificates.X509Certificate2? signerCertificate, System.Security.Cryptography.X509Certificates.X509Certificate2Collection? extraCandidates = null) { throw null; }
@@ -194,7 +194,7 @@ public sealed partial class Rfc3161TimestampTokenInfo
         public System.ReadOnlyMemory<byte>? GetNonce() { throw null; }
         public System.ReadOnlyMemory<byte> GetSerialNumber() { throw null; }
         public System.ReadOnlyMemory<byte>? GetTimestampAuthorityName() { throw null; }
-        public static bool TryDecode(System.ReadOnlyMemory<byte> encodedBytes, out System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo? timestampTokenInfo, out int bytesConsumed) { throw null; }
+        public static bool TryDecode(System.ReadOnlyMemory<byte> encodedBytes, [System.Diagnostics.CodeAnalysis.NotNullWhenAttribute(true)] out System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo? timestampTokenInfo, out int bytesConsumed) { throw null; }
         public bool TryEncode(System.Span<byte> destination, out int bytesWritten) { throw null; }
     }
     public sealed partial class SignedCms