From 2ba1b30ccaf13b9cbedd68c17c902f948d59bdc8 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 2 Feb 2020 14:32:10 +1100
Subject: [PATCH] Add more rule exemptions and prevent blanket using
 recommendations

---
 .editorconfig         | 7 +++++--
 .gitattributes        | 4 +++-
 shared-infrastructure | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index b0d0662bf..06e698247 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -339,6 +339,7 @@ csharp_space_between_square_brackets = false
 #   warn when using var for built-in types,
 #   warn when using var when the type is not apparent, and
 #   warn when not using var when the type is apparent
+#   warn when using simplified "using" declaration
 ###############################################################################
 [*.cs]
 csharp_prefer_braces = true:silent
@@ -367,6 +368,8 @@ csharp_style_throw_expression = true:suggestion
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
 csharp_style_unused_value_assignment_preference = discard_variable:suggestion
 
-csharp_style_var_for_built_in_types = false:warning
-csharp_style_var_elsewhere = false:warning
+csharp_style_var_for_built_in_types = false:silent
 csharp_style_var_when_type_is_apparent = true:warning
+csharp_style_var_elsewhere = false:warning
+
+csharp_prefer_simple_using_statement = false:silent
diff --git a/.gitattributes b/.gitattributes
index 2cbe4b423..24a21b60d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -71,15 +71,17 @@
 *.gif               binary
 *.jpg               binary
 *.ktx               binary
+*.otf               binary
 *.pbm               binary
 *.pdf               binary
 *.png               binary
 *.ppt               binary
 *.pptx              binary
 *.pvr               binary
-*.ttf               binary
 *.snk               binary
 *.tga               binary
+*.ttc               binary
+*.ttf               binary
 *.woff              binary
 *.woff2             binary
 *.xls               binary
diff --git a/shared-infrastructure b/shared-infrastructure
index 13b1152a9..a75469fdb 160000
--- a/shared-infrastructure
+++ b/shared-infrastructure
@@ -1 +1 @@
-Subproject commit 13b1152a9e93d1b67690e1e9325af248b7c2145d
+Subproject commit a75469fdb93fb89b39a5b0b7c01cb7432ceef98f