Don't define ResourceDictionary.Source in XamlDesign config

jcansdale · jcansdale · commit 0a75a7ea7880 · 2017-04-04T16:05:20.000+01:00
The XAML designer don't work correctly if a implementation of `ResourceDictionary` defines a `Source` property.
diff --git a/GitHubVS.sln b/GitHubVS.sln
@@ -163,8 +163,8 @@ Global
 		{346384DD-2445-4A28-AF22-B45F3957BD89}.Release|Any CPU.Build.0 = Release|Any CPU
 		{346384DD-2445-4A28-AF22-B45F3957BD89}.Release|x86.ActiveCfg = Release|Any CPU
 		{346384DD-2445-4A28-AF22-B45F3957BD89}.Release|x86.Build.0 = Release|Any CPU
-		{346384DD-2445-4A28-AF22-B45F3957BD89}.XamlDesign|Any CPU.ActiveCfg = Debug|Any CPU
-		{346384DD-2445-4A28-AF22-B45F3957BD89}.XamlDesign|Any CPU.Build.0 = Debug|Any CPU
+		{346384DD-2445-4A28-AF22-B45F3957BD89}.XamlDesign|Any CPU.ActiveCfg = XamlDesign|Any CPU
+		{346384DD-2445-4A28-AF22-B45F3957BD89}.XamlDesign|Any CPU.Build.0 = XamlDesign|Any CPU
 		{346384DD-2445-4A28-AF22-B45F3957BD89}.XamlDesign|x86.ActiveCfg = Debug|Any CPU
 		{346384DD-2445-4A28-AF22-B45F3957BD89}.XamlDesign|x86.Build.0 = Debug|Any CPU
 		{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -528,8 +528,8 @@ Global
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|x86.ActiveCfg = Release|Any CPU
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|x86.Build.0 = Release|Any CPU
-		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.Build.0 = Debug|Any CPU
+		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.ActiveCfg = XamlDesign|Any CPU
+		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.Build.0 = XamlDesign|Any CPU
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|x86.ActiveCfg = Release|Any CPU
 		{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|x86.Build.0 = Release|Any CPU
 		{50E277B8-8580-487A-8F8E-5C3B9FBF0F77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/src/GitHub.UI/Helpers/LoadingResourceDictionary.cs b/src/GitHub.UI/Helpers/LoadingResourceDictionary.cs
@@ -9,6 +9,7 @@ namespace GitHub
 {
     public class LoadingResourceDictionary : ResourceDictionary
     {
+#if !XAML_DESIGNER // XAML Designer doesn't work if `Source` property has been replaced.
         static Dictionary<string, Assembly> assemblyDicts = new Dictionary<string, Assembly>();
 
         public new Uri Source
@@ -71,5 +72,6 @@ static string FindAssemblyNameFromPackUri(Uri packUri)
 
             return path.Substring(1, componentIndex - 1);
         }
+#endif
     }
 }
diff --git a/src/GitHub.UI/Helpers/SharedDictionaryManager.cs b/src/GitHub.UI/Helpers/SharedDictionaryManager.cs
@@ -6,6 +6,7 @@ namespace GitHub.UI.Helpers
 {
     public class SharedDictionaryManager : LoadingResourceDictionary
     {
+#if !XAML_DESIGNER // XAML Designer doesn't work if `Source` property has been replaced.
         static readonly Dictionary<Uri, ResourceDictionary> resourceDicts = new Dictionary<Uri, ResourceDictionary>();
 
         Uri sourceUri;
@@ -25,5 +26,6 @@ public class SharedDictionaryManager : LoadingResourceDictionary
                 resourceDicts.Add(value, this);
             }
         }
+#endif
     }
 }
diff --git a/src/GitHub.VisualStudio.UI/Helpers/SharedDictionaryManager.cs b/src/GitHub.VisualStudio.UI/Helpers/SharedDictionaryManager.cs
@@ -8,6 +8,7 @@ namespace GitHub.VisualStudio.UI.Helpers
 {
     public class SharedDictionaryManager : LoadingResourceDictionary
     {
+#if !XAML_DESIGNER // XAML Designer doesn't work if `Source` property has been replaced.
         public SharedDictionaryManager()
         {
             currentTheme = Colors.DetectTheme();
@@ -16,7 +17,6 @@ public SharedDictionaryManager()
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         string currentTheme;
 
-#if !XAML_DESIGNER
         static readonly Dictionary<Uri, ResourceDictionary> resourceDicts = new Dictionary<Uri, ResourceDictionary>();
         static string baseThemeUri = "pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/";
 
diff --git a/src/GitHub.VisualStudio/Helpers/SharedDictionaryManager.cs b/src/GitHub.VisualStudio/Helpers/SharedDictionaryManager.cs
@@ -7,6 +7,7 @@ namespace GitHub.VisualStudio.Helpers
 {
     public class SharedDictionaryManager : LoadingResourceDictionary
     {
+#if !XAML_DESIGNER // XAML Designer doesn't work if `Source` property has been replaced.
         static readonly Dictionary<Uri, ResourceDictionary> resourceDicts = new Dictionary<Uri, ResourceDictionary>();
 
         Uri sourceUri;
@@ -26,5 +27,6 @@ public class SharedDictionaryManager : LoadingResourceDictionary
                 resourceDicts.Add(value, this);
             }
         }
+#endif
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace GitHub`
`9`	`9`	`{`
`10`	`10`	`public class LoadingResourceDictionary : ResourceDictionary`
`11`	`11`	`{`
	`12`	+#if !XAML_DESIGNER // XAML Designer doesn't work if `Source` property has been replaced.
`12`	`13`	`static Dictionary<string, Assembly> assemblyDicts = new Dictionary<string, Assembly>();`
`13`	`14`
`14`	`15`	`public new Uri Source`
`@@ -71,5 +72,6 @@ static string FindAssemblyNameFromPackUri(Uri packUri)`
`71`	`72`
`72`	`73`	`return path.Substring(1, componentIndex - 1);`
`73`	`74`	`}`
	`75`	`+#endif`
`74`	`76`	`}`
`75`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace GitHub.UI.Helpers`
`6`	`6`	`{`
`7`	`7`	`public class SharedDictionaryManager : LoadingResourceDictionary`
`8`	`8`	`{`
	`9`	+#if !XAML_DESIGNER // XAML Designer doesn't work if `Source` property has been replaced.
`9`	`10`	`static readonly Dictionary<Uri, ResourceDictionary> resourceDicts = new Dictionary<Uri, ResourceDictionary>();`
`10`	`11`
`11`	`12`	`Uri sourceUri;`
`@@ -25,5 +26,6 @@ public class SharedDictionaryManager : LoadingResourceDictionary`
`25`	`26`	`resourceDicts.Add(value, this);`
`26`	`27`	`}`
`27`	`28`	`}`
	`29`	`+#endif`
`28`	`30`	`}`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace GitHub.VisualStudio.UI.Helpers`
`8`	`8`	`{`
`9`	`9`	`public class SharedDictionaryManager : LoadingResourceDictionary`
`10`	`10`	`{`
	`11`	+#if !XAML_DESIGNER // XAML Designer doesn't work if `Source` property has been replaced.
`11`	`12`	`public SharedDictionaryManager()`
`12`	`13`	`{`
`13`	`14`	`currentTheme = Colors.DetectTheme();`
`@@ -16,7 +17,6 @@ public SharedDictionaryManager()`
`16`	`17`	`[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]`
`17`	`18`	`string currentTheme;`
`18`	`19`
`19`		`-#if !XAML_DESIGNER`
`20`	`20`	`static readonly Dictionary<Uri, ResourceDictionary> resourceDicts = new Dictionary<Uri, ResourceDictionary>();`
`21`	`21`	`static string baseThemeUri = "pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/";`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ namespace GitHub.VisualStudio.Helpers`
`7`	`7`	`{`
`8`	`8`	`public class SharedDictionaryManager : LoadingResourceDictionary`
`9`	`9`	`{`
	`10`	+#if !XAML_DESIGNER // XAML Designer doesn't work if `Source` property has been replaced.
`10`	`11`	`static readonly Dictionary<Uri, ResourceDictionary> resourceDicts = new Dictionary<Uri, ResourceDictionary>();`
`11`	`12`
`12`	`13`	`Uri sourceUri;`
`@@ -26,5 +27,6 @@ public class SharedDictionaryManager : LoadingResourceDictionary`
`26`	`27`	`resourceDicts.Add(value, this);`
`27`	`28`	`}`
`28`	`29`	`}`
	`30`	`+#endif`
`29`	`31`	`}`
`30`	`32`	`}`