From cdddb056b5248478b59bcdee4bb1e298011dc744 Mon Sep 17 00:00:00 2001 From: cja Date: Thu, 2 Jul 2020 12:09:57 +0200 Subject: [PATCH 1/5] 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 From e24d1b47a7946abbad9a14a47300b01cbc6ce51e Mon Sep 17 00:00:00 2001 From: cja Date: Thu, 2 Jul 2020 13:16:36 +0200 Subject: [PATCH 2/5] Create PHPStorm.gitignore For PHPStorm and WebStorm, with additional "SuiteCloud IDE for WebStorm" plugin details --- Global/PHPStorm.gitignore | 98 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 Global/PHPStorm.gitignore diff --git a/Global/PHPStorm.gitignore b/Global/PHPStorm.gitignore new file mode 100644 index 00000000..042545ad --- /dev/null +++ b/Global/PHPStorm.gitignore @@ -0,0 +1,98 @@ +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +**/.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.xml +**/.idea/**/dataSources.local.xml +**/.idea/**/sqlDataSources.xml +**/.idea/**/dynamic.xml +**/.idea/**/uiDesigner.xml +**/.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# 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 + +# SuiteCloud IDE for WebStorm +**/.idea/suiteapp/metadata/* +**/.idea/netsuite.pkey +**/.idea/netsuite.sign +**/.idea/netsuite.xml +SuiteScript\.settings\.jsdtscope From 76c2aed97c1cee237a6363e8d74a9de4bc8f9c37 Mon Sep 17 00:00:00 2001 From: cja Date: Thu, 2 Jul 2020 13:38:27 +0200 Subject: [PATCH 3/5] Update PHPStorm.gitignore using www.toptal.com/developers/gitignore Update PHPStorm.gitignore based on latest https://www.toptal.com/developers/gitignore/api/phpstorm --- Global/PHPStorm.gitignore | 45 ++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/Global/PHPStorm.gitignore b/Global/PHPStorm.gitignore index 042545ad..3660e4f9 100644 --- a/Global/PHPStorm.gitignore +++ b/Global/PHPStorm.gitignore @@ -1,4 +1,7 @@ -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Based on https://www.toptal.com/developers/gitignore/api/phpstorm + +### PhpStorm ### +# Covers JetBrains IDEs: PhpStorm and WebStorm # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff @@ -72,25 +75,37 @@ fabric.properties # Android studio 3.1+ serialized cache file .idea/caches/build_file_checksums.ser +### PhpStorm Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# **/.idea/**/*.iml +# **/.idea/**/modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +.idea/**/sonarlint/ + +# SonarQube Plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# End of https://www.toptal.com/developers/gitignore/api/phpstorm + # 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 - -# SuiteCloud IDE for WebStorm +# SuiteCloud IDE for WebStorm plugin **/.idea/suiteapp/metadata/* **/.idea/netsuite.pkey **/.idea/netsuite.sign From 53e5df736c4c456c8d4859e33c1b11e47d9ff532 Mon Sep 17 00:00:00 2001 From: cja Date: Thu, 2 Jul 2020 14:08:37 +0200 Subject: [PATCH 4/5] Create Rider.gitignore JetBrains.gitignore is inadequate --- Global/Rider.gitignore | 254 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 254 insertions(+) create mode 100644 Global/Rider.gitignore diff --git a/Global/Rider.gitignore b/Global/Rider.gitignore new file mode 100644 index 00000000..369ae418 --- /dev/null +++ b/Global/Rider.gitignore @@ -0,0 +1,254 @@ +############################################################ +## Visual Studio 2012 +############################################################ +syntax: glob + +.hg/** +.hgtags + +## User-specific files + +*.suo +*.user +*.sln.docstates + +## Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +## MSTest test Results + +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +## Visual C++ cache files + +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +## Visual Studio profiler + +*.psess +*.vsp +*.vspx + +## Guidance Automation Toolkit + +*.gpState + +## ReSharper Ignores + +_ReSharper*/ +*.[Rr]e[Ss]harper + +## TeamCity Ignores +_TeamCity* + +## DotCover Ignores + +*.dotCover + +## NCrunch Ignores + +*.ncrunch* +.*crunch*.local.xml + +## Installshield output folder +[Ee]xpress/ + +## DocProject Ignores + +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +## Click-Once Ignores + +publish/ + +## Publish Web Output + +*.Publish.xml +*.pubxml + +## Windows Azure Build Ignores + +csx +*.build.csdef + +## Windows Store Ignores + +AppPackages/ + +## RIA/Silverlight projects + +Generated_Code/ + +## SQL Server Ignores + +App_Data/*.mdf +App_Data/*.ldf + +## Backup & Report Files when converting a solution +## Not required, we have mercurial! + +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +## NuGet +packages/ + +## Miscellaneous Ignores + +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +## Windows Ignores + +$RECYCLE.BIN/ +Thumbs.db +ehthumbs.db +Desktop.ini + +.vs/ + +# Covers JetBrains IDEs: Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +**/.idea/**/workspace.xml +**/.idea/**/tasks.xml +**/.idea/shelf/* +**/.idea/dictionaries +**/.idea/httpRequests/ +**/.idea/**/usage.statistics.xml + +# Generated files +.idea/**/contentModel.xml +# from https://github.com/github/gitignore/pull/3401#discussion_r422064257 +.idea/**/projectSettingsUpdater.xml + +# Sensitive or high-churn files +**/.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 +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# 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 From 6f39148129e7d8f9969a884363c557a22c8fbdd0 Mon Sep 17 00:00:00 2001 From: cja Date: Thu, 2 Jul 2020 16:28:30 +0200 Subject: [PATCH 5/5] projectSettingsUpdater.xml can be nested --- Global/Rider.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global/Rider.gitignore b/Global/Rider.gitignore index 369ae418..33326c41 100644 --- a/Global/Rider.gitignore +++ b/Global/Rider.gitignore @@ -173,7 +173,7 @@ Desktop.ini # Generated files .idea/**/contentModel.xml # from https://github.com/github/gitignore/pull/3401#discussion_r422064257 -.idea/**/projectSettingsUpdater.xml +**/.idea/**/projectSettingsUpdater.xml # Sensitive or high-churn files **/.idea/**/dataSources/