Merge branch 'master' into fixes/1385-checked-isloggedin

Author: grokys

src/GitHub.App/Factories/ViewViewModelFactory.cs

@@ -20,14 +20,12 @@ public class ViewViewModelFactory : IViewViewModelFactory
 
         [ImportingConstructor]
         public ViewViewModelFactory(
-            IGitHubServiceProvider serviceProvider,
-            ICompositionService cc)
+            IGitHubServiceProvider serviceProvider)
         {
             this.serviceProvider = serviceProvider;
-            cc.SatisfyImportsOnce(this);
         }
 
-        [ImportMany(AllowRecomposition = true)]
+        [ImportMany]
         IEnumerable<ExportFactory<FrameworkElement, IViewModelMetadata>> Views { get; set; }
 
         /// <inheritdoc/>
@@ -45,7 +43,7 @@ public FrameworkElement CreateView<TViewModel>() where TViewModel : IViewModel
         /// <inheritdoc/>
         public FrameworkElement CreateView(Type viewModel)
         {
-            var f = Views.FirstOrDefault(x => x.Metadata.ViewModelType.Contains(viewModel));
+            var f = Views.FirstOrDefault(x => x.Metadata.ViewModelType.Contains(viewModel.FullName));
             return f?.CreateExport().Value;
         }
     }

src/GitHub.Exports/Exports/ExportMetadata.cs

@@ -32,15 +32,17 @@ public enum LinkType
     /// </summary>
     [MetadataAttribute]
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    [SuppressMessage("Microsoft.Design", "CA1019:DefineAccessorsForAttributeArguments",
+        Justification = "Store string rather than Type as metadata")]
     public sealed class ExportViewForAttribute : ExportAttribute
     {
         public ExportViewForAttribute(Type viewModelType)
             : base(typeof(FrameworkElement))
         {
-            ViewModelType = viewModelType;
+            ViewModelType = viewModelType.FullName;
         }
 
-        public Type ViewModelType { get; }
+        public string ViewModelType { get; }
     }
 
     /// <summary>
@@ -69,7 +71,7 @@ public ExportMenuAttribute() : base(typeof(IMenuHandler))
     public interface IViewModelMetadata
     {
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        Type[] ViewModelType { get; }
+        string[] ViewModelType { get; }
     }
 
     /// <summary>

src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml

@@ -10,6 +10,7 @@
              xmlns:uc="clr-namespace:GitHub.UI.Controls;assembly=GitHub.UI"
              xmlns:vuc="clr-namespace:GitHub.VisualStudio.UI.Controls;assembly=GitHub.VisualStudio.UI"
              xmlns:views="clr-namespace:GitHub.VisualStudio.Views"
+             Foreground="{DynamicResource GitHubVsWindowText}"
              d:DesignHeight="300"
              d:DesignWidth="300"
              mc:Ignorable="d">
@@ -82,8 +83,7 @@
                   HorizontalAlignment="Center"
                   VerticalAlignment="Center"
                   Visibility="{Binding ContentOverride, Converter={u:EqualsToVisibilityConverter Spinner}, FallbackValue=Collapsed}"/>
-      <Border Background="White"
-              HorizontalAlignment="Stretch"
+      <Border HorizontalAlignment="Stretch"
               VerticalAlignment="Stretch"
               Visibility="{Binding ContentOverride, Converter={u:EqualsToVisibilityConverter Error}, FallbackValue=Collapsed}">
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">