From 6599e7fea6551a9ae4a6ac6ce9bda7da9b1a5964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Tomecki?= Date: Mon, 8 Apr 2024 10:44:26 +0200 Subject: [PATCH 1/3] Added back support for .NET versions lower than 8.0 --- .../Simple.CredentialManager.csproj | 2 +- src/Simple.CredentialManager/secrets.DBus.cs | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Simple.CredentialManager/Simple.CredentialManager.csproj b/src/Simple.CredentialManager/Simple.CredentialManager.csproj index 0ae0631..bb9b5c0 100644 --- a/src/Simple.CredentialManager/Simple.CredentialManager.csproj +++ b/src/Simple.CredentialManager/Simple.CredentialManager.csproj @@ -1,6 +1,6 @@  - net8.0 + netstandard2.0;net5.0;net6.0 Library false Simple.CredentialManager diff --git a/src/Simple.CredentialManager/secrets.DBus.cs b/src/Simple.CredentialManager/secrets.DBus.cs index 000da97..31513cd 100644 --- a/src/Simple.CredentialManager/secrets.DBus.cs +++ b/src/Simple.CredentialManager/secrets.DBus.cs @@ -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")] @@ -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")] @@ -74,7 +74,7 @@ static class ServiceExtensions public static Task GetCollectionsAsync(this IService o) => o.GetAsync("Collections"); } -#if NET5_0_OR_GREATER +#if NET6_0_OR_GREATER [SupportedOSPlatform("Linux")] #endif [DBusInterface("org.freedesktop.Secret.Collection")] @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 From 02a23d571473e6f286024a3d3291566cfa3b932c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Tomecki?= Date: Tue, 16 Apr 2024 12:24:38 -0700 Subject: [PATCH 2/3] Disabled analyzers to fix build errors. --- .../Simple.CredentialManager.csproj | 34 +++---------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/src/Simple.CredentialManager/Simple.CredentialManager.csproj b/src/Simple.CredentialManager/Simple.CredentialManager.csproj index bb9b5c0..a5b2f6c 100644 --- a/src/Simple.CredentialManager/Simple.CredentialManager.csproj +++ b/src/Simple.CredentialManager/Simple.CredentialManager.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net5.0;net6.0 + netstandard2.0;net5.0;net8.0 Library false Simple.CredentialManager @@ -10,35 +10,9 @@ Copyright © 2014 1.0.0 1.0.0 - - - true - false - bin\Debug\Simple.CredentialManager.xml - - - true - true - bin\Release\Simple.CredentialManager.xml - - - bin\x86\Debug\ - true - bin\Debug\WindowsCredentialsManagement.dll.CodeAnalysisLog.xml - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - true - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - - - bin\x86\Release\ - bin\Release\WindowsCredentialsManagement.dll.CodeAnalysisLog.xml - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - true - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true + False + False + True From 2a9cd593c86431e420212eb9c558cbdca04f0629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Tomecki?= Date: Thu, 18 Apr 2024 21:35:32 +0200 Subject: [PATCH 3/3] Changed .NET target version to 7.0 --- src/Simple.CredentialManager/Simple.CredentialManager.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Simple.CredentialManager/Simple.CredentialManager.csproj b/src/Simple.CredentialManager/Simple.CredentialManager.csproj index a5b2f6c..e285f23 100644 --- a/src/Simple.CredentialManager/Simple.CredentialManager.csproj +++ b/src/Simple.CredentialManager/Simple.CredentialManager.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net5.0;net8.0 + net7.0 Library false Simple.CredentialManager