From ab8cdfc733af0647a46ae29898fc4dc3dde8f6db Mon Sep 17 00:00:00 2001
From: Jensaarai <djjensaarai@gmail.com>
Date: Thu, 24 Mar 2022 22:58:13 -0700
Subject: [PATCH 1/2] Add .editorconfig for csharp directory

Nicer experience for e.g. VS Code
---
 csharp/.editorconfig | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 csharp/.editorconfig

diff --git a/csharp/.editorconfig b/csharp/.editorconfig
new file mode 100644
index 000000000000..a59f5a597255
--- /dev/null
+++ b/csharp/.editorconfig
@@ -0,0 +1,18 @@
+# Remove the line below if you want to inherit .editorconfig settings from higher directories
+root = true
+
+# C# files
+[*.cs]
+
+#### Core EditorConfig Options ####
+
+# Indentation and spacing
+indent_size = 4
+indent_style = space
+tab_width = 4
+
+# New line preferences
+# See https://github.com/protocolbuffers/protobuf/issues/9526
+#end_of_line = lf
+insert_final_newline = false
+trim_trailing_whitespace = true
\ No newline at end of file

From cbed3e6a2c81d208af4eff45fe3d407f0494bd26 Mon Sep 17 00:00:00 2001
From: Jensaarai <djjensaarai@gmail.com>
Date: Fri, 25 Mar 2022 23:16:48 -0700
Subject: [PATCH 2/2] Add C# .editorconfig to Makefile.am

---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index 453d688023a5..d590580ec044 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ pkgconfig_DATA = protobuf.pc protobuf-lite.pc
 
 csharp_EXTRA_DIST=                                                           \
   global.json                                                                \
+  csharp/.editorconfig                                                       \
   csharp/.gitignore                                                          \
   csharp/CHANGES.txt                                                         \
   csharp/Google.Protobuf.Tools.targets                                       \