diff --git a/src/Lithnet.CredentialProvider.RegistrationTool/GlobalSuppressions.cs b/src/Lithnet.CredentialProvider.RegistrationTool/GlobalSuppressions.cs new file mode 100644 index 0000000..1178f4c --- /dev/null +++ b/src/Lithnet.CredentialProvider.RegistrationTool/GlobalSuppressions.cs @@ -0,0 +1,8 @@ +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility")] diff --git a/src/Lithnet.CredentialProvider/Lithnet.CredentialProvider.csproj b/src/Lithnet.CredentialProvider/Lithnet.CredentialProvider.csproj index 2b1e876..8c35f09 100644 --- a/src/Lithnet.CredentialProvider/Lithnet.CredentialProvider.csproj +++ b/src/Lithnet.CredentialProvider/Lithnet.CredentialProvider.csproj @@ -1,6 +1,6 @@  - netstandard2.1;net472 + net6.0-windows;net7.0-windows;net461 false Library true @@ -18,7 +18,7 @@ Copyright 2023 Lithnet Pty Ltd Lithnet Windows Credential Provider 1.0.0 - beta.38 + beta.43 Lithnet true true @@ -28,10 +28,22 @@ https://github.com/lithnet/windows-credential-provider https://github.com/lithnet/windows-credential-provider D:\dev\nuget\packages + true + true + snupkg + true + + true + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/Lithnet.CredentialProvider/ModuleInit/AssemblyResolver.cs b/src/Lithnet.CredentialProvider/ModuleInit/AssemblyResolver.cs index 9a0bcec..b9c9f1c 100644 --- a/src/Lithnet.CredentialProvider/ModuleInit/AssemblyResolver.cs +++ b/src/Lithnet.CredentialProvider/ModuleInit/AssemblyResolver.cs @@ -39,20 +39,7 @@ namespace Lithnet.CredentialProvider.ModuleInit var name = new AssemblyName(args.Name); Trace.WriteLine($"Request for {args.Name}"); -#if NETFRAMEWORK - if (name.Name.StartsWith("System.", StringComparison.OrdinalIgnoreCase)) - { - string gacPath = $@"C:\Windows\Microsoft.NET\assembly\GAC_MSIL\{name.Name}\v4.0_4.0.0.0__b03f5f7f11d50a3a\{name.Name}.dll"; - - if (File.Exists(gacPath)) - { - Trace.WriteLine($"System assembly found at {gacPath}"); - return Assembly.LoadFrom(gacPath); - } - } -#endif - - string assyPath = Path.Combine(basePath, $"{name.Name}.dll"); + string assyPath = Path.Combine(basePath, $"{name.Name}.dll"); if (File.Exists(assyPath)) diff --git a/src/Lithnet.CredentialProvider/ModuleInit/ModuleInitializerAttribute.cs b/src/Lithnet.CredentialProvider/ModuleInit/ModuleInitializerAttribute.cs index f3af805..fd7f23f 100644 --- a/src/Lithnet.CredentialProvider/ModuleInit/ModuleInitializerAttribute.cs +++ b/src/Lithnet.CredentialProvider/ModuleInit/ModuleInitializerAttribute.cs @@ -1,7 +1,9 @@ -namespace System.Runtime.CompilerServices +#if !NET5_0_OR_GREATER +namespace System.Runtime.CompilerServices { [AttributeUsage(System.AttributeTargets.Method, Inherited = false)] internal sealed class ModuleInitializerAttribute : Attribute { } } +#endif \ No newline at end of file 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 6982d69..6fc135d 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.x86/Lithnet.CredentialProvider.Sample.net472.x86.csproj b/src/samples/Lithnet.CredentialProvider.Sample.net472.x86/Lithnet.CredentialProvider.Sample.net472.x86.csproj index c899343..e95ae24 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,7 @@ - + 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 a5e7303..a07fc7c 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 @@ -22,7 +22,7 @@ - + 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 dd50efe..33d5d1e 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 @@ -22,7 +22,7 @@ - +