Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 4a1b5da

Browse files
jcansdalejcansdale
authored
Merge branch 'master' into fixes/1537-SwitchToMainThreadAsync
2 parents aad4996 + 7f4cc25 commit 4a1b5da

39 files changed

+452
-496
lines changed

‎src/GitHub.App/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
3+
using System.Windows.Markup;
34

45
[assembly: AssemblyTitle("GitHub.App")]
56
[assembly: AssemblyDescription("Provides the view models for the GitHub for Visual Studio extension")]
67
[assembly: Guid("a8b9a236-d238-4733-b116-716872a1e8e0")]
8+
9+
[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.SampleData")]
10+
[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels")]
11+
[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.Dialog")]
12+
[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.GitHubPane")]

‎src/GitHub.Exports.Reactive/Properties/AssemblyInfo.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
3+
using System.Windows.Markup;
34

45
[assembly: AssemblyTitle("GitHub.Exports.Reactive")]
56
[assembly: AssemblyDescription("GitHub interfaces for mef exports with reactive dependencies")]
67
[assembly: Guid("e4ed0537-d1d9-44b6-9212-3096d7c3f7a1")]
8+
9+
[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels")]
10+
[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.Dialog")]
11+
[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.GitHubPane")]

‎src/GitHub.UI.Reactive/Assets/Controls/ErrorMessageDisplay.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
3+
xmlns:ghfvs="https://github.com/github/VisualStudio"
44
xmlns:uirx="clr-namespace:GitHub.UI">
55

66
<Style x:Key="ErrorMessageStyle" TargetType="{x:Type uirx:ErrorMessageDisplay}">
@@ -22,7 +22,7 @@
2222
Margin="{TemplateBinding IconMargin}"
2323
Width="16"
2424
Height="16">
25-
<ui:OcticonPath
25+
<ghfvs:OcticonPath
2626
x:Name="icon"
2727
Icon="{TemplateBinding Icon}"
2828
Height="16"

‎src/GitHub.UI.Reactive/Assets/Controls/FilteredComboBox.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
3+
xmlns:ghfvs="https://github.com/github/VisualStudio"
44
xmlns:uirx="clr-namespace:GitHub.UI">
55

66
<PathGeometry x:Key="arrow">M 0,6 3.5,11 7,6</PathGeometry>
@@ -23,7 +23,7 @@
2323
<RowDefinition/>
2424
</Grid.RowDefinitions>
2525
<Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{TemplateBinding BorderBrush}" Background="#FCFCFC" Padding="5">
26-
<ui:FilterTextBox
26+
<ghfvs:FilterTextBox
2727
x:Name="PART_FilterTextBox"
2828
PromptText="Filter"
2929
Margin="0"
@@ -40,7 +40,7 @@
4040
</Grid>
4141
</Border>
4242
</Popup>
43-
<ui:OcticonLinkToggleButton
43+
<ghfvs:OcticonLinkToggleButton
4444
x:Name="toggleButton"
4545
Focusable="False"
4646
PathChecked="{StaticResource arrow}"
@@ -57,7 +57,7 @@
5757
BorderThickness="{TemplateBinding BorderThickness}"
5858
Background="Transparent"
5959
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
60-
</ui:OcticonLinkToggleButton>
60+
</ghfvs:OcticonLinkToggleButton>
6161

6262
</Grid>
6363
<ControlTemplate.Triggers>
@@ -74,7 +74,7 @@
7474
</ControlTemplate.Triggers>
7575
</ControlTemplate>
7676

77-
<ui:IsLastItemInContainerConverter x:Key="IsLastItemInContainerConverter" />
77+
<ghfvs:IsLastItemInContainerConverter x:Key="IsLastItemInContainerConverter" />
7878

7979
<Style x:Key="GitHubComboBoxItem" TargetType="{x:Type ComboBoxItem}">
8080
<Setter Property="Foreground" Value="{DynamicResource GHTextBrush}"/>

‎src/GitHub.UI.Reactive/Assets/Controls/GitHubComboBox.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
3+
xmlns:ghfvs="https://github.com/github/VisualStudio">
44

55
<PathGeometry x:Key="arrow">M 0,6 3.5,11 7,6</PathGeometry>
66

7-
<ControlTemplate x:Key="ComboBoxTemplate" TargetType="{x:Type ui:GitHubComboBox}">
7+
<ControlTemplate x:Key="ComboBoxTemplate" TargetType="{x:Type ghfvs:GitHubComboBox}">
88
<Grid x:Name="MainGrid" SnapsToDevicePixels="true"
99
MinWidth="{Binding ActualWidth, ElementName=PART_Popup}"
1010
Background="{TemplateBinding Background}">
@@ -26,7 +26,7 @@
2626
</ScrollViewer>
2727
</Border>
2828
</Popup>
29-
<ui:OcticonLinkToggleButton
29+
<ghfvs:OcticonLinkToggleButton
3030
x:Name="toggleButton"
3131
Focusable="True"
3232
FocusVisualStyle="{DynamicResource NegativeMarginFocusVisual}"
@@ -44,7 +44,7 @@
4444
BorderThickness="{TemplateBinding BorderThickness}"
4545
Background="Transparent"
4646
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
47-
</ui:OcticonLinkToggleButton>
47+
</ghfvs:OcticonLinkToggleButton>
4848
</Grid>
4949
<ControlTemplate.Triggers>
5050
<Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
@@ -60,7 +60,7 @@
6060
</ControlTemplate.Triggers>
6161

6262
</ControlTemplate>
63-
<ui:IsLastItemInContainerConverter x:Key="IsLastItemInContainerConverter" />
63+
<ghfvs:IsLastItemInContainerConverter x:Key="IsLastItemInContainerConverter" />
6464

6565
<Style x:Key="GitHubComboBoxItem" TargetType="{x:Type ComboBoxItem}">
6666
<Setter Property="Foreground" Value="{DynamicResource GHTextBrush}"/>
@@ -87,7 +87,7 @@
8787
</Setter>
8888
</Style>
8989

90-
<Style x:Key="GitHubComboBox" TargetType="{x:Type ui:GitHubComboBox}">
90+
<Style x:Key="GitHubComboBox" TargetType="{x:Type ghfvs:GitHubComboBox}">
9191
<Setter Property="Background" Value="White"/>
9292
<Setter Property="BorderBrush" Value="{DynamicResource GHBoxDividerBrush}"/>
9393
<Setter Property="Foreground" Value="{DynamicResource GHBlueLinkButtonTextBrush}"/>

‎src/GitHub.UI.Reactive/Assets/Controls/GitHubTabControl.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:converters="clr-namespace:GitHub.UI;assembly=GitHub.UI"
3+
xmlns:ghfvs="https://github.com/github/VisualStudio"
44
xmlns:ui="clr-namespace:GitHub.UI">
55

66
<Style TargetType="{x:Type ui:GitHubTabControl}">
@@ -93,7 +93,7 @@
9393
Fill="{StaticResource GHBlueLinkButtonTextBrush}"
9494
Margin="0"
9595
Height="2"
96-
Visibility="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Converter={converters:BooleanToVisibilityConverter}}" />
96+
Visibility="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Converter={ghfvs:BooleanToVisibilityConverter}}" />
9797

9898
</Grid>
9999
<ControlTemplate.Triggers>

‎src/GitHub.UI.Reactive/Assets/Controls/Validation/UserErrorMessages.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<ResourceDictionary
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:ghfvs="https://github.com/github/VisualStudio"
45
xmlns:local="clr-namespace:GitHub.UI"
5-
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
66
xmlns:rxui="clr-namespace:ReactiveUI;assembly=ReactiveUI">
77
<Style TargetType="{x:Type local:UserErrorMessages}">
88
<Setter Property="Template">
@@ -26,7 +26,7 @@
2626
HorizontalAlignment="Right"
2727
Width="16"
2828
Height="16">
29-
<ui:OcticonPath x:Name="icon" Icon="{TemplateBinding Icon}" Height="16" Fill="{TemplateBinding Fill}" />
29+
<ghfvs:OcticonPath x:Name="icon" Icon="{TemplateBinding Icon}" Height="16" Fill="{TemplateBinding Fill}" />
3030
</Viewbox>
3131

3232
<TextBlock Grid.Column="1"

‎src/GitHub.UI.Reactive/Assets/Controls/Validation/ValidationMessage.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<ResourceDictionary
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:ghfvs="https://github.com/github/VisualStudio"
45
xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
5-
xmlns:local="clr-namespace:GitHub.UI"
6-
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
6+
xmlns:local="clr-namespace:GitHub.UI">
77

88
<Style TargetType="{x:Type local:ValidationMessage}">
99
<Setter Property="Template">
@@ -29,8 +29,8 @@
2929
Width="16"
3030
Height="16"
3131
Grid.Column="0"
32-
Visibility="{TemplateBinding ShowError, Converter={ui:BooleanToVisibilityConverter}}">
33-
<ui:OcticonPath
32+
Visibility="{TemplateBinding ShowError, Converter={ghfvs:BooleanToVisibilityConverter}}">
33+
<ghfvs:OcticonPath
3434
x:Name="icon"
3535
Icon="{TemplateBinding Icon}"
3636
Height="16"
@@ -81,7 +81,7 @@
8181
Height="16"
8282
VerticalAlignment="Center"
8383
HorizontalAlignment="Right">
84-
<ui:OcticonPath
84+
<ghfvs:OcticonPath
8585
x:Name="icon"
8686
Icon="stop"
8787
Fill="{StaticResource GitHubErrorAdornmentBrush}"

‎src/GitHub.UI.Reactive/Controls/TwoFactorInput.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7-
xmlns:automation="clr-namespace:GitHub.UI.TestAutomation;assembly=GitHub.UI"
7+
xmlns:ghfvs="https://github.com/github/VisualStudio"
88
mc:Ignorable="d"
99
Width="256"
1010
d:DesignHeight="47"
1111
d:DesignWidth="262"
12-
AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TwoFactorAuthenticatonInputCustom}">
12+
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TwoFactorAuthenticatonInputCustom}">
1313
<UserControl.Resources>
1414
<Style TargetType="{x:Type TextBox}">
1515
<Setter Property="Width" Value="36"/>
@@ -20,7 +20,7 @@
2020
<Setter Property="FontSize" Value="20px" />
2121
</Style>
2222
</UserControl.Resources>
23-
<StackPanel Orientation="Horizontal" UseLayoutRounding="True" SnapsToDevicePixels="True" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TwoFactorAuthenticationInputStackPanel}">
23+
<StackPanel Orientation="Horizontal" UseLayoutRounding="True" SnapsToDevicePixels="True" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TwoFactorAuthenticationInputStackPanel}">
2424
<TextBox x:Name="one" />
2525
<TextBox x:Name="two" />
2626
<TextBox x:Name="three" />

‎src/GitHub.UI.Reactive/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
33
using System.Windows;
4+
using System.Windows.Markup;
45

56
[assembly: AssemblyTitle("GitHub.UI.Recative")]
67
[assembly: AssemblyDescription("GitHub flavored WPF styles and controls that require Rx and RxUI")]
@@ -13,4 +14,6 @@
1314
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
1415
//(used if a resource is not found in the page,
1516
// app, or any theme specific resource dictionaries)
16-
)]
17+
)]
18+
19+
[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.UI")]

0 commit comments

Comments
 (0)