alexrg/SGU-CredentialProvider
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 25 Wiki Activity

Fixes an issue with the assembly resolver

Browse Source
This commit is contained in:
Ryan Newington
2023-02-04 17:35:44 +11:00
parent 9669ab5a04
commit e61045cc8a
11 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Lithnet.CredentialProvider/Lithnet.CredentialProvider.csproj
+1 -1
View File
@@ -18,7 +18,7 @@
<Copyright>Copyright 2023 Lithnet Pty Ltd</Copyright>
<ProductName>Lithnet Windows Credential Provider</ProductName>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix>beta.43</VersionSuffix>
<VersionSuffix>alpha1</VersionSuffix>
<Authors>Lithnet</Authors>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<AutoIncrementPackageRevision>true</AutoIncrementPackageRevision>
src/Lithnet.CredentialProvider/ModuleInit/AssemblyResolver.cs
+1 -2
View File
@@ -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");
src/samples/Lithnet.CredentialProvider.Sample.net472.x64/Lithnet.CredentialProvider.Sample.net472.x64.csproj
+1 -1
View File
@@ -15,7 +15,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lithnet.CredentialProvider" Version="1.0.0-beta.43" />
<PackageReference Include="Lithnet.CredentialProvider" Version="1.0.*-beta1*" />
<PackageReference Include="NLog" Version="5.1.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
</ItemGroup>
src/samples/Lithnet.CredentialProvider.Sample.net472.x64/TestCredentialProviderNet472x64.cs
+2 -2
View File
@@ -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);
}
src/samples/Lithnet.CredentialProvider.Sample.net472.x64/TestCredentialProviderTile.cs
+1 -1
View File
@@ -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;
src/samples/Lithnet.CredentialProvider.Sample.net472.x86/Lithnet.CredentialProvider.Sample.net472.x86.csproj
+2 -1
View File
@@ -21,7 +21,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lithnet.CredentialProvider" Version="1.0.0-beta.43" />
<PackageReference Include="Lithnet.CredentialProvider" Version="1.0.*-beta1*" />
<PackageReference Include="NLog" Version="5.1.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
</ItemGroup>
src/samples/Lithnet.CredentialProvider.Sample.net472.x86/TestCredentialProviderNet472x86.cs
+2 -2
View File
@@ -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);
}
src/samples/Lithnet.CredentialProvider.Sample.net6.0.x64/Lithnet.CredentialProvider.Sample.net6.0.x64.csproj
+4 -3
View File
@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<None Remove="Resources\TileIcon.png" />
<None Remove="Resources\TileIcon.png" />
</ItemGroup>
<ItemGroup>
@@ -18,11 +18,12 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\TileIcon.png" />
<EmbeddedResource Include="Resources\TileIcon.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lithnet.CredentialProvider" Version="1.0.0-beta.43" />
<PackageReference Include="Lithnet.CredentialProvider" Version="1.0.*-beta1*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="NLog" Version="5.1.1" />
src/samples/Lithnet.CredentialProvider.Sample.net6.0.x64/TestCredentialProviderNet60x64.cs
+2 -2
View File
@@ -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);
}
src/samples/Lithnet.CredentialProvider.Sample.net6.0.x86/Lithnet.CredentialProvider.Sample.net6.0.x86.csproj
+4 -3
View File
@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<None Remove="Resources\TileIcon.png" />
<None Remove="Resources\TileIcon.png" />
</ItemGroup>
<ItemGroup>
@@ -18,11 +18,12 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\TileIcon.png" />
<EmbeddedResource Include="Resources\TileIcon.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Lithnet.CredentialProvider" Version="1.0.0-beta.43" />
<PackageReference Include="Lithnet.CredentialProvider" Version="1.0.*-beta1*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="NLog" Version="5.1.1" />
src/samples/Lithnet.CredentialProvider.Sample.net6.0.x86/TestCredentialProviderNet60x86.cs
+2 -2
View File
@@ -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);
}