From cdddb056b5248478b59bcdee4bb1e298011dc744 Mon Sep 17 00:00:00 2001
From: cja <github@cja.org.uk>
Date: Thu, 2 Jul 2020 12:09:57 +0200
Subject: [PATCH] Support Rider properly

As per https://github.com/JetBrains/resharper-rider-samples/blob/master/.gitignore and https://rider-support.jetbrains.com/hc/en-us/articles/207097529
---
 Global/JetBrains.gitignore | 44 +++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
index 8da0824b..0a177433 100644
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@ -2,23 +2,25 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
+**/.idea/**/workspace.xml
+**/.idea/**/tasks.xml
+**/.idea/shelf/*
+**/.idea/dictionaries
+**/.idea/httpRequests/
+**/.idea/**/usage.statistics.xml
 
 # Generated files
 .idea/**/contentModel.xml
 
 # Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
+**/.idea/**/dataSources/
+**/.idea/**/dataSources.ids
+**/.idea/**/dataSources.xml
+**/.idea/**/dataSources.local.xml
+**/.idea/**/sqlDataSources.xml
+**/.idea/**/dynamic.xml
+**/.idea/**/uiDesigner.xml
+**/.idea/**/dbnavigator.xml
 
 # Gradle
 .idea/**/gradle.xml
@@ -69,3 +71,21 @@ fabric.properties
 
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
+
+# From https://github.com/JetBrains/resharper-rider-samples/blob/master/.gitignore
+Thumbs.db
+Desktop.ini
+.DS_Store
+*.suo
+*.user
+.vs/
+[Bb]in/
+[Oo]bj/
+_UpgradeReport_Files/
+[Pp]ackages/
+
+# Rider auto-generated files from https://github.com/JetBrains/resharper-rider-samples/blob/master/.gitignore
+**/.idea/**/*.iml
+**/.idea/**/contentModel.xml
+# Rider auto-generated files from https://rider-support.jetbrains.com/hc/en-us/articles/207097529
+**/.idea/**/modules.xml