From c933748077b456a77b01ded49f7b3379cc2a7014 Mon Sep 17 00:00:00 2001 From: tenzap Date: Mon, 19 Dec 2022 19:40:04 +0100 Subject: [PATCH] Fix gitignore with Resource.designer.cs/Resource.Designer.cs Default value for is Resource.designer.cs https://learn.microsoft.com/en-us/xamarin/android/deploy-test/building-apps/build-properties#androidresgenfile Two projects were using Resources\Resource.Designer.cs All other projects use Resources\Resource.designer.cs Difference is one has uppercase D, the other lowercase d .gitignore already has a rule for 'Resource.designer.cs' in it. The two projects that were with Resource.Designer.cs needed either a specific line in gitignore or weren't actually ignored. Selected fix here is to rename the file with a lowercase 'd' instead of uppercase. This permits to remove one line from .gitignore and keep the other file really ignored --- .gitignore | 1 - src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj | 2 +- src/TwofishCipher/TwofishCipher.csproj | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5e9f50d4..57fd4e7e 100644 --- a/.gitignore +++ b/.gitignore @@ -109,7 +109,6 @@ Thumbs.db /src/java/JavaFileStorageTest/gen/group/pals/android/lib/ui/filechooser/R.java /src/java/JavaFileStorageTest/gen/keepass2android/javafilestorage/R.java -/src/TwofishCipher/Resources/Resource.Designer.cs /src/BindingLibrary1 /src/PluginTOTP diff --git a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj index c043ec10..370922bc 100644 --- a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj +++ b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj @@ -10,7 +10,7 @@ keepass2android Kp2aBusinessLogic 512 - Resources\Resource.Designer.cs + Resources\Resource.designer.cs Off v11.0 false diff --git a/src/TwofishCipher/TwofishCipher.csproj b/src/TwofishCipher/TwofishCipher.csproj index e980118d..9bfaafbb 100644 --- a/src/TwofishCipher/TwofishCipher.csproj +++ b/src/TwofishCipher/TwofishCipher.csproj @@ -10,7 +10,7 @@ TwofishCipher TwofishCipher 512 - Resources\Resource.Designer.cs + Resources\Resource.designer.cs Off false v8.0 @@ -54,7 +54,7 @@ - + @@ -81,4 +81,4 @@ --> - \ No newline at end of file +