diff --git a/src/Lithnet.CredentialProvider/Lithnet.CredentialProvider.csproj b/src/Lithnet.CredentialProvider/Lithnet.CredentialProvider.csproj index 8c35f09..997ad0d 100644 --- a/src/Lithnet.CredentialProvider/Lithnet.CredentialProvider.csproj +++ b/src/Lithnet.CredentialProvider/Lithnet.CredentialProvider.csproj @@ -18,7 +18,7 @@ Copyright 2023 Lithnet Pty Ltd Lithnet Windows Credential Provider 1.0.0 - beta.43 + alpha1 Lithnet true true diff --git a/src/Lithnet.CredentialProvider/ModuleInit/AssemblyResolver.cs b/src/Lithnet.CredentialProvider/ModuleInit/AssemblyResolver.cs index 878ac88..1b54e39 100644 --- a/src/Lithnet.CredentialProvider/ModuleInit/AssemblyResolver.cs +++ b/src/Lithnet.CredentialProvider/ModuleInit/AssemblyResolver.cs @@ -42,11 +42,10 @@ namespace Lithnet.CredentialProvider.ModuleInit string assyPath = Path.Combine(basePath, $"{name.Name}.dll"); - if (File.Exists(assyPath)) { Trace.WriteLine($"Found at {assyPath}"); - return Assembly.Load(assyPath); + return Assembly.LoadFrom(assyPath); } Trace.WriteLine($"Assembly {args.Name} not found"); diff --git a/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/Lithnet.CredentialProvider.Sample.net472.x64.csproj b/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/Lithnet.CredentialProvider.Sample.net472.x64.csproj index 6fc135d..479b909 100644 --- a/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/Lithnet.CredentialProvider.Sample.net472.x64.csproj +++ b/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/Lithnet.CredentialProvider.Sample.net472.x64.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/TestCredentialProviderNet472x64.cs b/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/TestCredentialProviderNet472x64.cs index baf69dd..8486d7f 100644 --- a/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/TestCredentialProviderNet472x64.cs +++ b/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/TestCredentialProviderNet472x64.cs @@ -84,12 +84,12 @@ namespace Lithnet.CredentialProvider.Samples return true; } - public override CredentialProviderCredential1Tile CreateGenericTile() + public override CredentialTile CreateGenericTile() { return new TestCredentialProviderTile(this); } - public override CredentialProviderCredential1Tile CreateUserTile(CredentialProviderUser user) + public override CredentialTile2 CreateUserTile(CredentialProviderUser user) { return new TestCredentialProviderTile(this, user); } diff --git a/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/TestCredentialProviderTile.cs b/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/TestCredentialProviderTile.cs index b060d58..0720de8 100644 --- a/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/TestCredentialProviderTile.cs +++ b/src/samples/Lithnet.CredentialProvider.Sample.net472.x64/TestCredentialProviderTile.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Logging; namespace Lithnet.CredentialProvider.Samples { - public class TestCredentialProviderTile : CredentialProviderCredential2Tile + public class TestCredentialProviderTile : CredentialTile2 { private TextboxControl UsernameControl; private SecurePasswordTextboxControl PasswordControl; diff --git a/src/samples/Lithnet.CredentialProvider.Sample.net472.x86/Lithnet.CredentialProvider.Sample.net472.x86.csproj b/src/samples/Lithnet.CredentialProvider.Sample.net472.x86/Lithnet.CredentialProvider.Sample.net472.x86.csproj index e95ae24..b455ab7 100644 --- a/src/samples/Lithnet.CredentialProvider.Sample.net472.x86/Lithnet.CredentialProvider.Sample.net472.x86.csproj +++ b/src/samples/Lithnet.CredentialProvider.Sample.net472.x86/Lithnet.CredentialProvider.Sample.net472.x86.csproj @@ -21,7 +21,8 @@ - + + diff --git a/src/samples/Lithnet.CredentialProvider.Sample.net472.x86/TestCredentialProviderNet472x86.cs b/src/samples/Lithnet.CredentialProvider.Sample.net472.x86/TestCredentialProviderNet472x86.cs index a004d08..c4ce35c 100644 --- a/src/samples/Lithnet.CredentialProvider.Sample.net472.x86/TestCredentialProviderNet472x86.cs +++ b/src/samples/Lithnet.CredentialProvider.Sample.net472.x86/TestCredentialProviderNet472x86.cs @@ -85,12 +85,12 @@ namespace Lithnet.CredentialProvider.Samples return true; } - public override CredentialProviderCredential1Tile CreateGenericTile() + public override CredentialTile CreateGenericTile() { return new TestCredentialProviderTile(this); } - public override CredentialProviderCredential1Tile CreateUserTile(CredentialProviderUser user) + public override CredentialTile2 CreateUserTile(CredentialProviderUser user) { return new TestCredentialProviderTile(this, user); } diff --git a/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x64/Lithnet.CredentialProvider.Sample.net6.0.x64.csproj b/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x64/Lithnet.CredentialProvider.Sample.net6.0.x64.csproj index a07fc7c..707cdbd 100644 --- a/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x64/Lithnet.CredentialProvider.Sample.net6.0.x64.csproj +++ b/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x64/Lithnet.CredentialProvider.Sample.net6.0.x64.csproj @@ -8,7 +8,7 @@ - + @@ -18,11 +18,12 @@ - + - + + diff --git a/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x64/TestCredentialProviderNet60x64.cs b/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x64/TestCredentialProviderNet60x64.cs index 4344aaf..774b7b5 100644 --- a/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x64/TestCredentialProviderNet60x64.cs +++ b/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x64/TestCredentialProviderNet60x64.cs @@ -86,12 +86,12 @@ namespace Lithnet.CredentialProvider.Samples return true; } - public override CredentialProviderCredential1Tile CreateGenericTile() + public override CredentialTile CreateGenericTile() { return new TestCredentialProviderTile(this); } - public override CredentialProviderCredential1Tile CreateUserTile(CredentialProviderUser user) + public override CredentialTile2 CreateUserTile(CredentialProviderUser user) { return new TestCredentialProviderTile(this, user); } diff --git a/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x86/Lithnet.CredentialProvider.Sample.net6.0.x86.csproj b/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x86/Lithnet.CredentialProvider.Sample.net6.0.x86.csproj index 33d5d1e..2b4cf5a 100644 --- a/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x86/Lithnet.CredentialProvider.Sample.net6.0.x86.csproj +++ b/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x86/Lithnet.CredentialProvider.Sample.net6.0.x86.csproj @@ -8,7 +8,7 @@ - + @@ -18,11 +18,12 @@ - + - + + diff --git a/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x86/TestCredentialProviderNet60x86.cs b/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x86/TestCredentialProviderNet60x86.cs index 5ccc088..035cec6 100644 --- a/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x86/TestCredentialProviderNet60x86.cs +++ b/src/samples/Lithnet.CredentialProvider.Sample.net6.0.x86/TestCredentialProviderNet60x86.cs @@ -85,12 +85,12 @@ namespace Lithnet.CredentialProvider.Samples return true; } - public override CredentialProviderCredential1Tile CreateGenericTile() + public override CredentialTile CreateGenericTile() { return new TestCredentialProviderTile(this); } - public override CredentialProviderCredential1Tile CreateUserTile(CredentialProviderUser user) + public override CredentialTile2 CreateUserTile(CredentialProviderUser user) { return new TestCredentialProviderTile(this, user); }