Merge master into shana/kill-duplicated-code

Conflicts:
	src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml.cs
	src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml.cs
	src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml.cs
	src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml.cs
	src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml.cs

Author: shana

src/GitHub.Exports/Helpers/NotificationAwareObject.cs

@@ -1,8 +1,9 @@
 using System.ComponentModel;
+using GitHub.VisualStudio.Helpers;
 
 namespace GitHub.Primitives
 {
-    public abstract class NotificationAwareObject : INotifyPropertyChanged
+    public abstract class NotificationAwareObject : INotifyPropertyChanged, INotifyPropertySource
     {
         public event PropertyChangedEventHandler PropertyChanged;
 

src/GitHub.UI/GitHub.UI.csproj

@@ -64,6 +64,11 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Controls\Octicons\OcticonPaths.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>OcticonPaths.resx</DependentUpon>
+    </Compile>
     <None Include="..\..\script\Key.snk" Condition="$(Buildtype) == 'Internal'">
       <Link>Key.snk</Link>
     </None>
@@ -85,7 +90,6 @@
     </Compile>
     <Compile Include="Controls\Octicons\OcticonImage.cs" />
     <Compile Include="Controls\Octicons\OcticonPath.cs" />
-    <Compile Include="Controls\Octicons\OcticonPaths.Designer.cs" />
     <Compile Include="Controls\TrimmedTextBlock.cs" />
     <Compile Include="Helpers\AccessKeysManagerScoping.cs" />
     <Compile Include="Controls\Buttons\OcticonButton.cs" />
@@ -187,6 +191,8 @@
   <ItemGroup>
     <EmbeddedResource Include="Controls\Octicons\OcticonPaths.resx">
       <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>OcticonPaths.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

src/GitHub.VisualStudio/Base/TeamExplorerItemBase.cs

@@ -11,7 +11,7 @@
 
 namespace GitHub.VisualStudio.Base
 {
-    public class TeamExplorerItemBase : TeamExplorerGitRepoInfo, INotifyPropertySource
+    public class TeamExplorerItemBase : TeamExplorerGitRepoInfo
     {
         readonly ISimpleApiClientFactory apiFactory;
         protected ITeamExplorerServiceHolder holder;

src/GitHub.VisualStudio/Base/TeamExplorerNavigationItemBase.cs

@@ -8,13 +8,12 @@
 using GitHub.VisualStudio.Helpers;
 using Microsoft.TeamFoundation.Controls;
 using Microsoft.VisualStudio.PlatformUI;
-using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
 using NullGuard;
 using GitHub.Models;
 
 namespace GitHub.VisualStudio.Base
 {
-    public class TeamExplorerNavigationItemBase : TeamExplorerItemBase, ITeamExplorerNavigationItem2, INotifyPropertySource
+    public class TeamExplorerNavigationItemBase : TeamExplorerItemBase, ITeamExplorerNavigationItem2
     {
         readonly Octicon octicon;
 

src/GitHub.VisualStudio/Base/TeamExplorerSectionBase.cs

@@ -12,7 +12,7 @@
 
 namespace GitHub.VisualStudio.Base
 {
-    public class TeamExplorerSectionBase : TeamExplorerItemBase, ITeamExplorerSection, INotifyPropertySource
+    public class TeamExplorerSectionBase : TeamExplorerItemBase, ITeamExplorerSection
     {
         protected IConnectionManager connectionManager;
 

src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml.cs

@@ -20,6 +20,7 @@ public class GenericLoginControl : SimpleViewUserControl<ILoginControlViewModel,
     /// Interaction logic for LoginControl.xaml
     /// </summary>
     [ExportView(ViewType=UIViewType.Login)]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
     public partial class LoginControl : GenericLoginControl
     {
         public LoginControl()

src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml.cs

@@ -26,6 +26,7 @@ public class GenericRepositoryCloneControl : SimpleViewUserControl<IRepositoryCl
     /// Interaction logic for CloneRepoControl.xaml
     /// </summary>
     [ExportView(ViewType=UIViewType.Clone)]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
     public partial class RepositoryCloneControl : GenericRepositoryCloneControl
     {
         public RepositoryCloneControl()

src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml.cs

@@ -22,6 +22,7 @@ public class GenericRepositoryCreationControl : SimpleViewUserControl<IRepositor
     /// Interaction logic for CloneRepoControl.xaml
     /// </summary>
     [ExportView(ViewType=UIViewType.Create)]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
     public partial class RepositoryCreationControl : GenericRepositoryCreationControl
     {
         public RepositoryCreationControl()

src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml.cs

@@ -16,6 +16,7 @@ public class GenericRepositoryPublishControl : SimpleViewUserControl<IRepository
     { }
 
     [ExportView(ViewType=UIViewType.Publish)]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
     public partial class RepositoryPublishControl : GenericRepositoryPublishControl
     {
         public RepositoryPublishControl()

src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml.cs

@@ -17,6 +17,7 @@ public class GenericTwoFactorControl : SimpleViewUserControl<ITwoFactorDialogVie
     /// Interaction logic for PasswordView.xaml
     /// </summary>
     [ExportView(ViewType=UIViewType.TwoFactor)]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
     public partial class TwoFactorControl : GenericTwoFactorControl
     {
         public TwoFactorControl()