Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added back support for .NET versions lower than 8.0 #10

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 4 additions & 30 deletions src/Simple.CredentialManager/Simple.CredentialManager.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net7.0</TargetFrameworks>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyTitle>Simple.CredentialManager</AssemblyTitle>
Expand All @@ -10,35 +10,9 @@
<Copyright>Copyright © 2014</Copyright>
<AssemblyVersion>1.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RegisterForComInterop>false</RegisterForComInterop>
<DocumentationFile>bin\Debug\Simple.CredentialManager.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RunCodeAnalysis>true</RunCodeAnalysis>
<DocumentationFile>bin\Release\Simple.CredentialManager.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<OutputPath>bin\x86\Debug\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodeAnalysisLogFile>bin\Debug\WindowsCredentialsManagement.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<CodeAnalysisLogFile>bin\Release\WindowsCredentialsManagement.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
<RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
<RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Security.Permissions" Version="7.0.0" />
Expand Down
16 changes: 8 additions & 8 deletions src/Simple.CredentialManager/secrets.DBus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[assembly: InternalsVisibleTo(Tmds.DBus.Connection.DynamicAssemblyName)]
namespace secrets.DBus
{
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[SupportedOSPlatform("Linux")]
#endif
[DBusInterface("org.gnome.keyring.InternalUnsupportedGuiltRiddenInterface")]
Expand All @@ -20,7 +20,7 @@ interface IInternalUnsupportedGuiltRiddenInterface : IDBusObject
Task UnlockWithMasterPasswordAsync(ObjectPath Collection, (ObjectPath, byte[], byte[], string) Master);
}

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[SupportedOSPlatform("Linux")]
#endif
[DBusInterface("org.freedesktop.Secret.Service")]
Expand Down Expand Up @@ -74,7 +74,7 @@ static class ServiceExtensions
public static Task<ObjectPath[]> GetCollectionsAsync(this IService o) => o.GetAsync<ObjectPath[]>("Collections");
}

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[SupportedOSPlatform("Linux")]
#endif
[DBusInterface("org.freedesktop.Secret.Collection")]
Expand Down Expand Up @@ -183,7 +183,7 @@ static class CollectionExtensions
}

[DBusInterface("org.freedesktop.Secret.Item")]
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[SupportedOSPlatform("Linux")]
#endif
interface IItem : IDBusObject
Expand Down Expand Up @@ -305,7 +305,7 @@ static class ItemExtensions
}

[DBusInterface("org.freedesktop.Secret.Session")]
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[SupportedOSPlatform("Linux")]
#endif
interface ISession : IDBusObject
Expand All @@ -314,7 +314,7 @@ interface ISession : IDBusObject
}

[DBusInterface("org.freedesktop.Secret.Prompt")]
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[SupportedOSPlatform("Linux")]
#endif
interface IPrompt : IDBusObject
Expand All @@ -325,7 +325,7 @@ interface IPrompt : IDBusObject
}

[DBusInterface("org.freedesktop.impl.portal.Secret")]
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[SupportedOSPlatform("Linux")]
#endif
interface ISecret : IDBusObject
Expand Down Expand Up @@ -367,7 +367,7 @@ static class SecretExtensions
}

[DBusInterface("org.gnome.keyring.Daemon")]
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[SupportedOSPlatform("Linux")]
#endif
interface IDaemon : IDBusObject
Expand Down