diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2017-09-20 11:05:22 +0300 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2017-09-20 11:05:22 +0300 |
commit | 22574dd8058b546c01565e91e500102798bbe8d6 (patch) | |
tree | 5b6fe5d8de11e29e0d7eca77ebedbc690195910a /main/src/addins/CSharpBinding/CSharpBinding.addin.xml | |
parent | df42c3ef2ddb3c9cbe5c97295d73a3d24c36cd45 (diff) | |
parent | 8a9ab676c2836a00ec48b108c817b8d7a52af00f (diff) |
Merge branch 'master' into master-roslyncompletion
Diffstat (limited to 'main/src/addins/CSharpBinding/CSharpBinding.addin.xml')
-rw-r--r-- | main/src/addins/CSharpBinding/CSharpBinding.addin.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml index 82fb3403f8..b3044ad8b1 100644 --- a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml +++ b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml @@ -210,7 +210,12 @@ </Extension> <Extension path = "/MonoDevelop/ProjectModel/PolicySets/Mono" > + <Policies resource="MonoDevelopCSharpPolicy.xml" /> + </Extension> + + <Extension path = "/MonoDevelop/ProjectModel/PolicySets/MonoDefault" > <Policies resource="MonoCSharpPolicy.xml" /> + <Policies resource="MonoTextStylePolicy.xml" /> </Extension> <Extension path = "/MonoDevelop/ProjectModel/PolicySets" > @@ -218,9 +223,7 @@ <Policies resource="KRCSharpPolicy.xml" /> <Policies resource="InvariantTextStylePolicy.xml" /> </PolicySet> - </Extension> - <Extension path = "/MonoDevelop/ProjectModel/PolicySets" > <PolicySet id="1TBS" _name="SharpDevelop style (1TBS)" allowDiffSerialize="false"> <Policies resource="KRCSharpPolicy.xml" /> <Policies resource="InvariantTextStylePolicy.xml" /> |