Merge branch 'master' into fixes/883-experimental-builds

Author: grokys

documentation/manifest.md

@@ -141,16 +141,6 @@
       - [ ] Right clicking on a specific file displays options to open or compare file
       - [ ] Double clicking on a file opens a diff view of the file or a single file (depends on current file option)
       - [ ] Files in file diff view match diff on .com (pick any file)
-- [ ] **Change the changed files current view**
-      - [ ] The view has been changed to the view selected
-- [ ] **Close & reopen Visual Studio**
-- [ ] **Go to any pull request details**
-      - [ ] View of changed files was the selected view before closing Visual Studio
-- [ ] **Change the default file action**
-      - [ ] Double clicking on a file in the changed file list opens a diff view if previous action setting opened the file, or a single file if the previous action setting opened the diff view (depends on current file option)
-- [ ] **Close & reopen Visual Studio**
-- [ ] **Go to any pull request details**
-      - [ ] Double clicking on a file in the changed file list uses last default action setting open file/file diff
 - [ ] **Make a change any file and save it**
 - [ ] **Go to any pull request details and mouseover**
       - [ ] "Checkout to [branch name]" is plain text (not hyperlink) and mouseover displays tool tip

src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs

@@ -113,7 +113,18 @@ public PullRequestDetailViewModel(
         public IPullRequestModel Model
         {
             get { return model; }
-            private set { this.RaiseAndSetIfChanged(ref model, value); }
+            private set
+            {
+                // PullRequestModel overrides Equals such that two PRs with the same number are
+                // considered equal. This was causing the Model not to be updated on refresh:
+                // we need to use ReferenceEquals.
+                if (!ReferenceEquals(model, value))
+                {
+                    this.RaisePropertyChanging(nameof(Model));
+                    model = value;
+                    this.RaisePropertyChanged(nameof(Model));
+                }
+            }
         }
 
         /// <summary>

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

@@ -135,24 +135,24 @@
               IsChecked="{Binding KeepPrivate}"
               IsEnabled="{Binding CanKeepPrivate}"
               Style="{StaticResource VSStyledCheckBox}"
-              AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TeamExplorerPrivateRepositoryCheckBox}" />
-        <TextBlock Background="{DynamicResource GitHubVsToolWindowBackground}"
+              AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TeamExplorerPrivateRepositoryCheckBox}" >
+            <TextBlock Background="{DynamicResource GitHubVsToolWindowBackground}"
                  Foreground="{DynamicResource GitHubVsToolWindowText}"
                  TextWrapping="Wrap">
-            <TextBlock.Resources>
-                <Style TargetType="{x:Type TextBlock}">
-                    <Style.Triggers>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" Value="0.5" />
-                        </Trigger>
-                    </Style.Triggers>
-                </Style>
-            </TextBlock.Resources>
-            <TextBlock.Inlines>
-                <Run Text="{x:Static prop:Resources.makePrivateContent}" />
-            </TextBlock.Inlines>
-        </TextBlock>
-
+                <TextBlock.Resources>
+                    <Style TargetType="{x:Type TextBlock}">
+                        <Style.Triggers>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter Property="Opacity" Value="0.5" />
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Resources>
+                <TextBlock.Inlines>
+                    <Run Text="{x:Static prop:Resources.makePrivateContent}" />
+                </TextBlock.Inlines>
+            </TextBlock>
+        </CheckBox>
 
         <Button x:Name="publishRepositoryButton"
             Margin="0,8,0,0"