make compatible with .NET Framework

Author: hickford

src/shared/Atlassian.Bitbucket/BitbucketHostProvider.cs

@@ -473,5 +473,7 @@ public void Dispose()
             _restApiRegistry.Dispose();
             _bitbucketAuth.Dispose();
         }
+
+        public Task<bool> ValidateCredentialAsync(Uri remoteUri, ICredential credential) => Task.FromResult(credential.PasswordExpiry == null || credential.PasswordExpiry >= DateTimeOffset.UtcNow);
     }
 }

src/shared/Core/Credential.cs

@@ -23,13 +23,13 @@ public interface ICredential
         /// The expiry date of the password. This is Git's password_expiry_utc
         /// attribute. https://git-scm.com/docs/git-credential#Documentation/git-credential.txt-codepasswordexpiryutccode
         /// </summary>
-        DateTimeOffset? PasswordExpiry { get => null; }
+        DateTimeOffset? PasswordExpiry { get; }
 
         /// <summary>
         /// An OAuth refresh token. This is Git's oauth_refresh_token
         /// attribute. https://git-scm.com/docs/git-credential#Documentation/git-credential.txt-codeoauthrefreshtokencode
         /// </summary>
-        string OAuthRefreshToken { get => null; }
+        string OAuthRefreshToken { get; }
     }
 
     /// <summary>
@@ -63,12 +63,12 @@ public GitCredential(OAuth2TokenResult tokenResult, string userName)
             }
         }
 
-        public string Account { get; init; }
+        public string Account { get; set; }
 
-        public string Password { get; init; }
+        public string Password { get; set; }
 
-        public DateTimeOffset? PasswordExpiry { get; init; }
+        public DateTimeOffset? PasswordExpiry { get; set; }
 
-        public string OAuthRefreshToken { get; init; }
+        public string OAuthRefreshToken { get; set; }
     }
 }

src/shared/Core/FileCredential.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace GitCredentialManager
 {
     public class FileCredential : ICredential
@@ -17,5 +19,9 @@ public FileCredential(string fullPath, string service, string account, string pa
         public string Account { get; }
 
         public string Password { get; }
+
+        public DateTimeOffset? PasswordExpiry => null;
+
+        public string OAuthRefreshToken => null;
     }
 }

src/shared/Core/HostProvider.cs

@@ -59,8 +59,8 @@ public interface IHostProvider : IDisposable
         /// <param name="input">Input arguments of a Git credential query.</param>
         Task EraseCredentialAsync(InputArguments input);
 
-        Task<bool> ValidateCredentialAsync(Uri remoteUri, ICredential credential)
-        => Task.FromResult(credential.PasswordExpiry == null || credential.PasswordExpiry >= DateTimeOffset.UtcNow);
+        Task<bool> ValidateCredentialAsync(Uri remoteUri, ICredential credential);
+//        => Task.FromResult(credential.PasswordExpiry == null || credential.PasswordExpiry >= DateTimeOffset.UtcNow);
     }
 
     /// <summary>

src/shared/Core/ICredentialStore.cs

@@ -32,8 +32,7 @@ public interface ICredentialStore
 //        [Obsolete("Prefer AddOrUpdate(string, ICredential)")]
         void AddOrUpdate(string service, string account, string secret);
 
-        void AddOrUpdate(string service, ICredential credential)
-        => AddOrUpdate(service, credential.Account, credential.Password);
+        void AddOrUpdate(string service, ICredential credential);
 
         /// <summary>
         /// Delete credential from the store that matches the given query.
@@ -44,10 +43,9 @@ void AddOrUpdate(string service, ICredential credential)
 //        [Obsolete("Prefer Remove(string, ICredential)")]
         bool Remove(string service, string account);
 
-        bool Remove(string service, ICredential credential)
-        => Remove(service, credential.Account);
+        bool Remove(string service, ICredential credential);
 
-        bool CanStorePasswordExpiry => false;
-        bool CanStoreOAuthRefreshToken => false;
+        bool CanStorePasswordExpiry { get; }
+        bool CanStoreOAuthRefreshToken { get; }
     }
 }

src/shared/Core/InputArguments.cs

@@ -39,7 +39,7 @@ public InputArguments(IDictionary<string, IList<string>> dict)
         /// Return a copy of input, with additional OAuth refresh token.
         /// </summary>
         public InputArguments(InputArguments input, string oauthRefreshToken) {
-            _dict = new Dictionary<string, IList<string>>(input._dict)
+            _dict = new Dictionary<string, IList<string>>(input._dict.ToDictionary(p => p.Key, p => p.Value))
             {
                 ["oauth_refresh_token"] = new List<string>() { oauthRefreshToken }
             };

src/shared/Core/Interop/Linux/SecretServiceCollection.cs

@@ -315,7 +315,7 @@ private static unsafe ICredential CreateCredentialFromItem(SecretItem* item)
                 string oauth_refresh_token = null;
                 DateTimeOffset? password_expiry_utc = null;
                 for(int i = 1; i < lines.Length; i++) {
-                    var parts = lines[i].Split('=', 2);
+                    var parts = lines[i].Split(['='], 2);
                     if (parts.Length != 2)
                         continue;
                     if (parts[0] == "oauth_refresh_token")
@@ -395,6 +395,8 @@ private static SecretSchema GetSchema()
             return schema;
         }
 
+        public bool Remove(string service, ICredential credential) => Remove(service, credential.Account);
+
         public bool CanStorePasswordExpiry => true;
         public bool CanStoreOAuthRefreshToken => true;
     }

src/shared/Core/Interop/Linux/SecretServiceCredential.cs

@@ -18,8 +18,8 @@ internal SecretServiceCredential(string service, string account, string password
 
         public string Password { get; }
 
-        public string OAuthRefreshToken { get; init; }
+        public string OAuthRefreshToken { get; set; }
 
-        public DateTimeOffset? PasswordExpiry { get; init; }
+        public DateTimeOffset? PasswordExpiry { get; set; }
     }
 }

src/shared/Core/Interop/MacOS/MacOSKeychain.cs

@@ -14,6 +14,10 @@ public class MacOSKeychain : ICredentialStore
     {
         private readonly string _namespace;
 
+        public bool CanStorePasswordExpiry => false;
+
+        public bool CanStoreOAuthRefreshToken => false;
+
         #region Constructors
 
         /// <summary>
@@ -348,5 +352,8 @@ private string CreateServiceName(string service)
             sb.Append(service);
             return sb.ToString();
         }
+
+        public void AddOrUpdate(string service, ICredential credential) => AddOrUpdate(service, credential.Account, credential.Password);
+        public bool Remove(string service, ICredential credential) => Remove(service, credential.Account);
     }
 }

src/shared/Core/Interop/MacOS/MacOSKeychainCredential.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Diagnostics;
 
 namespace GitCredentialManager.Interop.MacOS
@@ -21,6 +22,10 @@ internal MacOSKeychainCredential(string service, string account, string password
 
         public string Password { get; }
 
+        public DateTimeOffset? PasswordExpiry => null;
+
+        public string OAuthRefreshToken => null;
+
         private string DebuggerDisplay => $"{Label} [Service: {Service}, Account: {Account}]";
     }
 }